Remove repository trait from factories that don't need it in features
This commit is contained in:
parent
822bf2f91c
commit
8fac013d9c
8 changed files with 13 additions and 13 deletions
|
@ -35,7 +35,7 @@ class Spinach::Features::Dashboard < Spinach::FeatureSteps
|
||||||
|
|
||||||
step 'I have group with projects' do
|
step 'I have group with projects' do
|
||||||
@group = create(:group)
|
@group = create(:group)
|
||||||
@project = create(:project, :repository, namespace: @group)
|
@project = create(:empty_project, namespace: @group)
|
||||||
@event = create(:closed_issue_event, project: @project)
|
@event = create(:closed_issue_event, project: @project)
|
||||||
|
|
||||||
@project.team << [current_user, :master]
|
@project.team << [current_user, :master]
|
||||||
|
@ -54,8 +54,8 @@ class Spinach::Features::Dashboard < Spinach::FeatureSteps
|
||||||
end
|
end
|
||||||
|
|
||||||
step 'group has a projects that does not belongs to me' do
|
step 'group has a projects that does not belongs to me' do
|
||||||
@forbidden_project1 = create(:project, :repository, group: @group)
|
@forbidden_project1 = create(:empty_project, group: @group)
|
||||||
@forbidden_project2 = create(:project, :repository, group: @group)
|
@forbidden_project2 = create(:empty_project, group: @group)
|
||||||
end
|
end
|
||||||
|
|
||||||
step 'I should see 1 project at group list' do
|
step 'I should see 1 project at group list' do
|
||||||
|
|
|
@ -79,13 +79,13 @@ class Spinach::Features::DashboardIssues < Spinach::FeatureSteps
|
||||||
|
|
||||||
def project
|
def project
|
||||||
@project ||= begin
|
@project ||= begin
|
||||||
project = create(:project, :repository)
|
project = create(:empty_project)
|
||||||
project.team << [current_user, :master]
|
project.team << [current_user, :master]
|
||||||
project
|
project
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
def public_project
|
def public_project
|
||||||
@public_project ||= create(:project, :public, :repository)
|
@public_project ||= create(:empty_project, :public)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
|
@ -104,7 +104,7 @@ class Spinach::Features::GroupMilestones < Spinach::FeatureSteps
|
||||||
group = owned_group
|
group = owned_group
|
||||||
|
|
||||||
%w(gitlabhq gitlab-ci cookbook-gitlab).each do |path|
|
%w(gitlabhq gitlab-ci cookbook-gitlab).each do |path|
|
||||||
project = create(:project, :repository, path: path, group: group)
|
project = create(:empty_project, path: path, group: group)
|
||||||
milestone = create :milestone, title: "Version 7.2", project: project
|
milestone = create :milestone, title: "Version 7.2", project: project
|
||||||
|
|
||||||
create(:label, project: project, title: 'bug')
|
create(:label, project: project, title: 'bug')
|
||||||
|
|
|
@ -109,7 +109,7 @@ class Spinach::Features::Groups < Spinach::FeatureSteps
|
||||||
|
|
||||||
step 'Group "Owned" has archived project' do
|
step 'Group "Owned" has archived project' do
|
||||||
group = Group.find_by(name: 'Owned')
|
group = Group.find_by(name: 'Owned')
|
||||||
@archived_project = create(:project, :repository, namespace: group, archived: true, path: "archived-project")
|
@archived_project = create(:empty_project, :archived, namespace: group, path: "archived-project")
|
||||||
end
|
end
|
||||||
|
|
||||||
step 'I should see "archived" label' do
|
step 'I should see "archived" label' do
|
||||||
|
|
|
@ -46,11 +46,11 @@ class Spinach::Features::ProjectDeployKeys < Spinach::FeatureSteps
|
||||||
end
|
end
|
||||||
|
|
||||||
step 'other projects have deploy keys' do
|
step 'other projects have deploy keys' do
|
||||||
@second_project = create(:project, :repository, namespace: create(:group))
|
@second_project = create(:empty_project, namespace: create(:group))
|
||||||
@second_project.team << [current_user, :master]
|
@second_project.team << [current_user, :master]
|
||||||
create(:deploy_keys_project, project: @second_project)
|
create(:deploy_keys_project, project: @second_project)
|
||||||
|
|
||||||
@third_project = create(:project, :repository, namespace: create(:group))
|
@third_project = create(:empty_project, namespace: create(:group))
|
||||||
@third_project.team << [current_user, :master]
|
@third_project.team << [current_user, :master]
|
||||||
create(:deploy_keys_project, project: @third_project, deploy_key: @second_project.deploy_keys.first)
|
create(:deploy_keys_project, project: @third_project, deploy_key: @second_project.deploy_keys.first)
|
||||||
end
|
end
|
||||||
|
|
|
@ -4,11 +4,11 @@ class Spinach::Features::ProjectRedirects < Spinach::FeatureSteps
|
||||||
include SharedProject
|
include SharedProject
|
||||||
|
|
||||||
step 'public project "Community"' do
|
step 'public project "Community"' do
|
||||||
create(:project, :public, :repository, name: 'Community')
|
create(:empty_project, :public, name: 'Community')
|
||||||
end
|
end
|
||||||
|
|
||||||
step 'private project "Enterprise"' do
|
step 'private project "Enterprise"' do
|
||||||
create(:project, :repository, name: 'Enterprise')
|
create(:empty_project, :private, name: 'Enterprise')
|
||||||
end
|
end
|
||||||
|
|
||||||
step 'I visit project "Community" page' do
|
step 'I visit project "Community" page' do
|
||||||
|
|
|
@ -137,7 +137,7 @@ class Spinach::Features::ProjectTeamManagement < Spinach::FeatureSteps
|
||||||
step 'I share project with group "OpenSource"' do
|
step 'I share project with group "OpenSource"' do
|
||||||
project = Project.find_by(name: 'Shop')
|
project = Project.find_by(name: 'Shop')
|
||||||
os_group = create(:group, name: 'OpenSource')
|
os_group = create(:group, name: 'OpenSource')
|
||||||
create(:project, :repository, group: os_group)
|
create(:empty_project, group: os_group)
|
||||||
@os_user1 = create(:user)
|
@os_user1 = create(:user)
|
||||||
@os_user2 = create(:user)
|
@os_user2 = create(:user)
|
||||||
os_group.add_owner(@os_user1)
|
os_group.add_owner(@os_user1)
|
||||||
|
|
|
@ -38,6 +38,6 @@ class Spinach::Features::User < Spinach::FeatureSteps
|
||||||
end
|
end
|
||||||
|
|
||||||
def contributed_project
|
def contributed_project
|
||||||
@contributed_project ||= create(:project, :public, :repository)
|
@contributed_project ||= create(:empty_project, :public)
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in a new issue