Remove backward compatibility of factories.
This commit is contained in:
parent
d52f06f380
commit
80fb38de7a
54 changed files with 261 additions and 279 deletions
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
|
@ -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
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue