diff options
Diffstat (limited to 'features')
-rw-r--r-- | features/steps/dashboard/dashboard.rb | 8 | ||||
-rw-r--r-- | features/steps/dashboard/dashboard_search.rb | 2 | ||||
-rw-r--r-- | features/steps/group/group.rb | 6 | ||||
-rw-r--r-- | features/steps/profile/profile.rb | 2 | ||||
-rw-r--r-- | features/steps/profile/profile_ssh_keys.rb | 2 | ||||
-rw-r--r-- | features/steps/project/project_hooks.rb | 2 | ||||
-rw-r--r-- | features/steps/project/project_issues.rb | 26 | ||||
-rw-r--r-- | features/steps/project/project_labels.rb | 2 | ||||
-rw-r--r-- | features/steps/project/project_merge_requests.rb | 18 | ||||
-rw-r--r-- | features/steps/project/project_milestones.rb | 4 | ||||
-rw-r--r-- | features/steps/project/project_team_management.rb | 6 | ||||
-rw-r--r-- | features/steps/shared/project.rb | 2 |
12 files changed, 40 insertions, 40 deletions
diff --git a/features/steps/dashboard/dashboard.rb b/features/steps/dashboard/dashboard.rb index 008c1451455..99c48738876 100644 --- a/features/steps/dashboard/dashboard.rb +++ b/features/steps/dashboard/dashboard.rb @@ -32,7 +32,7 @@ class Dashboard < Spinach::FeatureSteps end Given 'user with name "John Doe" joined project "Shop"' do - user = create :user, {name: "John Doe"} + user = create(:user, {name: "John Doe"}) project = Project.find_by_name "Shop" Event.create( project: project, @@ -65,9 +65,9 @@ class Dashboard < Spinach::FeatureSteps end And 'I have group with projects' do - @group = create :group - @project = create :project, group: @group - @event = create :closed_issue_event, project: @project + @group = create(:group) + @project = create(:project, group: @group) + @event = create(:closed_issue_event, project: @project) @project.add_access current_user, :admin end diff --git a/features/steps/dashboard/dashboard_search.rb b/features/steps/dashboard/dashboard_search.rb index 53d74bf3ab7..a34c14d0c5f 100644 --- a/features/steps/dashboard/dashboard_search.rb +++ b/features/steps/dashboard/dashboard_search.rb @@ -12,7 +12,7 @@ class DashboardSearch < Spinach::FeatureSteps end And 'I own project "Shop"' do - @project = create :project, name: "Shop" + @project = create(:project, :name => "Shop") @project.add_access(@user, :admin) end diff --git a/features/steps/group/group.rb b/features/steps/group/group.rb index 51581a1ec7b..4de260ec33e 100644 --- a/features/steps/group/group.rb +++ b/features/steps/group/group.rb @@ -9,9 +9,9 @@ class Groups < Spinach::FeatureSteps end And 'I have group with projects' do - @group = Factory :group - @project = Factory :project, group: @group - @event = Factory :closed_issue_event, project: @project + @group = create(:group) + @project = create(:project, group: @group) + @event = create(:closed_issue_event, project: @project) @project.add_access current_user, :admin end diff --git a/features/steps/profile/profile.rb b/features/steps/profile/profile.rb index efab1010481..151182f687b 100644 --- a/features/steps/profile/profile.rb +++ b/features/steps/profile/profile.rb @@ -53,7 +53,7 @@ class Profile < Spinach::FeatureSteps end Given 'I have activity' do - Factory :closed_issue_event, author: current_user + create(:closed_issue_event, author: current_user) end Then 'I should see my activity' do diff --git a/features/steps/profile/profile_ssh_keys.rb b/features/steps/profile/profile_ssh_keys.rb index 535c3862860..8ae1fa91025 100644 --- a/features/steps/profile/profile_ssh_keys.rb +++ b/features/steps/profile/profile_ssh_keys.rb @@ -43,6 +43,6 @@ class ProfileSshKeys < Spinach::FeatureSteps end And 'I have ssh key "ssh-rsa Work"' do - Factory :key, :user => @user, :title => "ssh-rsa Work", :key => "jfKLJDFKSFJSHFJssh-rsa Work" + create(:key, :user => @user, :title => "ssh-rsa Work", :key => "jfKLJDFKSFJSHFJssh-rsa Work") end end diff --git a/features/steps/project/project_hooks.rb b/features/steps/project/project_hooks.rb index 1786fe5bc05..36555fb8e8c 100644 --- a/features/steps/project/project_hooks.rb +++ b/features/steps/project/project_hooks.rb @@ -6,7 +6,7 @@ class ProjectHooks < Spinach::FeatureSteps include RSpec::Mocks::ExampleMethods Given 'project has hook' do - @hook = Factory :project_hook, project: current_project + @hook = create(:project_hook, project: current_project) end Then 'I should see project hook' do diff --git a/features/steps/project/project_issues.rb b/features/steps/project/project_issues.rb index 64af24490aa..a9a33650068 100644 --- a/features/steps/project/project_issues.rb +++ b/features/steps/project/project_issues.rb @@ -79,16 +79,16 @@ class ProjectIssues < Spinach::FeatureSteps Given 'project "Shop" has milestone "v2.2"' do project = Project.find_by_name("Shop") - milestone = Factory :milestone, :title => "v2.2", :project => project + milestone = create(:milestone, :title => "v2.2", :project => project) - 3.times { Factory :issue, :project => project, :milestone => milestone } + 3.times { create(:issue, :project => project, :milestone => milestone) } end And 'project "Shop" has milestone "v3.0"' do project = Project.find_by_name("Shop") - milestone = Factory :milestone, :title => "v3.0", :project => project + milestone = create(:milestone, :title => "v3.0", :project => project) - 3.times { Factory :issue, :project => project, :milestone => milestone } + 3.times { create(:issue, :project => project, :milestone => milestone) } end When 'I select milestone "v3.0"' do @@ -117,18 +117,18 @@ class ProjectIssues < Spinach::FeatureSteps And 'project "Shop" have "Release 0.4" open issue' do project = Project.find_by_name("Shop") - Factory.create(:issue, - :title => "Release 0.4", - :project => project, - :author => project.users.first) + create(:issue, + :title => "Release 0.4", + :project => project, + :author => project.users.first) end And 'project "Shop" have "Release 0.3" closed issue' do project = Project.find_by_name("Shop") - Factory.create(:issue, - :title => "Release 0.3", - :project => project, - :author => project.users.first, - :closed => true) + create(:issue, + :title => "Release 0.3", + :project => project, + :author => project.users.first, + :closed => true) end end diff --git a/features/steps/project/project_labels.rb b/features/steps/project/project_labels.rb index 1a347bf358f..915190f3dae 100644 --- a/features/steps/project/project_labels.rb +++ b/features/steps/project/project_labels.rb @@ -18,7 +18,7 @@ class ProjectLabels < Spinach::FeatureSteps And 'project "Shop" have issues tags: "bug", "feature"' do project = Project.find_by_name("Shop") ['bug', 'feature'].each do |label| - Factory :issue, project: project, label_list: label + create(:issue, project: project, label_list: label) end end end diff --git a/features/steps/project/project_merge_requests.rb b/features/steps/project/project_merge_requests.rb index 80e83906c72..d153ad28d2b 100644 --- a/features/steps/project/project_merge_requests.rb +++ b/features/steps/project/project_merge_requests.rb @@ -63,18 +63,18 @@ class ProjectMergeRequests < Spinach::FeatureSteps And 'project "Shop" have "Bug NS-04" open merge request' do project = Project.find_by_name("Shop") - Factory.create(:merge_request, - :title => "Bug NS-04", - :project => project, - :author => project.users.first) + create(:merge_request, + :title => "Bug NS-04", + :project => project, + :author => project.users.first) end And 'project "Shop" have "Feature NS-03" closed merge request' do project = Project.find_by_name("Shop") - Factory.create(:merge_request, - :title => "Feature NS-03", - :project => project, - :author => project.users.first, - :closed => true) + create(:merge_request, + :title => "Feature NS-03", + :project => project, + :author => project.users.first, + :closed => true) end end diff --git a/features/steps/project/project_milestones.rb b/features/steps/project/project_milestones.rb index 4d689c95d25..1c9ad6da651 100644 --- a/features/steps/project/project_milestones.rb +++ b/features/steps/project/project_milestones.rb @@ -32,9 +32,9 @@ class ProjectMilestones < Spinach::FeatureSteps And 'project "Shop" has milestone "v2.2"' do project = Project.find_by_name("Shop") - milestone = Factory :milestone, :title => "v2.2", :project => project + milestone = create(:milestone, :title => "v2.2", :project => project) - 3.times { Factory :issue, :project => project, :milestone => milestone } + 3.times { create(:issue, :project => project, :milestone => milestone) } end Given 'the milestone has open and closed issues' do diff --git a/features/steps/project/project_team_management.rb b/features/steps/project/project_team_management.rb index 5c3a9b31129..6bde0b64dfa 100644 --- a/features/steps/project/project_team_management.rb +++ b/features/steps/project/project_team_management.rb @@ -74,11 +74,11 @@ class ProjectTeamManagement < Spinach::FeatureSteps end And 'gitlab user "Mike"' do - Factory :user, :name => "Mike" + create(:user, :name => "Mike") end And 'gitlab user "Sam"' do - Factory :user, :name => "Sam" + create(:user, :name => "Sam") end And '"Sam" is "Shop" developer' do @@ -88,7 +88,7 @@ class ProjectTeamManagement < Spinach::FeatureSteps end Given 'I own project "Website"' do - @project = Factory :project, :name => "Website" + @project = create(:project, :name => "Website") @project.add_access(@user, :admin) end diff --git a/features/steps/shared/project.rb b/features/steps/shared/project.rb index ae871d63ed5..dfc8ce9d99c 100644 --- a/features/steps/shared/project.rb +++ b/features/steps/shared/project.rb @@ -9,7 +9,7 @@ module SharedProject # Create a specific project called "Shop" And 'I own project "Shop"' do - @project = Factory :project, :name => "Shop" + @project = create(:project, :name => "Shop") @project.add_access(@user, :admin) end |