Download as
Browse Code »

Commit b28ab8962beb1cc4e1bfe122e1110b770f4bc3d2

Authored by Dmitriy Zaporozhets
2 parents ed931f3a 80fb38de
Exists in master and in 4 other branches 6-8-stable, 7-0-stable, 7-0-stable-spb, spb-stable

Merge pull request #1928 from kouno/cleanup-factories 

Remove backward compatibility of factories.
Showing 54 changed files with 261 additions and 279 deletions   Show diff stats
features/steps/dashboard/dashboard.rb
  Diff comments   View file @b28ab89
... ... @@ -32,7 +32,7 @@ class Dashboard < Spinach::FeatureSteps
32 32 end
33 33  
34 34 Given 'user with name "John Doe" joined project "Shop"' do
35   - user = create :user, {name: "John Doe"}
  35 + user = create(:user, {name: "John Doe"})
36 36 project = Project.find_by_name "Shop"
37 37 Event.create(
38 38 project: project,
... ... @@ -65,9 +65,9 @@ class Dashboard < Spinach::FeatureSteps
65 65 end
66 66  
67 67 And 'I have group with projects' do
68   - @group = create :group
69   - @project = create :project, group: @group
70   - @event = create :closed_issue_event, project: @project
  68 + @group = create(:group)
  69 + @project = create(:project, group: @group)
  70 + @event = create(:closed_issue_event, project: @project)
71 71  
72 72 @project.add_access current_user, :admin
73 73 end
... ...
features/steps/dashboard/dashboard_search.rb
  Diff comments   View file @b28ab89
... ... @@ -12,7 +12,7 @@ class DashboardSearch < Spinach::FeatureSteps
12 12 end
13 13  
14 14 And 'I own project "Shop"' do
15   - @project = create :project, name: "Shop"
  15 + @project = create(:project, :name => "Shop")
16 16 @project.add_access(@user, :admin)
17 17 end
18 18  
... ...
features/steps/group/group.rb
  Diff comments   View file @b28ab89
... ... @@ -9,9 +9,9 @@ class Groups < Spinach::FeatureSteps
9 9 end
10 10  
11 11 And 'I have group with projects' do
12   - @group = Factory :group
13   - @project = Factory :project, group: @group
14   - @event = Factory :closed_issue_event, project: @project
  12 + @group = create(:group)
  13 + @project = create(:project, group: @group)
  14 + @event = create(:closed_issue_event, project: @project)
15 15  
16 16 @project.add_access current_user, :admin
17 17 end
... ...
features/steps/profile/profile.rb
  Diff comments   View file @b28ab89
... ... @@ -53,7 +53,7 @@ class Profile < Spinach::FeatureSteps
53 53 end
54 54  
55 55 Given 'I have activity' do
56   - Factory :closed_issue_event, author: current_user
  56 + create(:closed_issue_event, author: current_user)
57 57 end
58 58  
59 59 Then 'I should see my activity' do
... ...
features/steps/profile/profile_ssh_keys.rb
  Diff comments   View file @b28ab89
... ... @@ -43,6 +43,6 @@ class ProfileSshKeys < Spinach::FeatureSteps
43 43 end
44 44  
45 45 And 'I have ssh key "ssh-rsa Work"' do
46   - Factory :key, :user => @user, :title => "ssh-rsa Work", :key => "jfKLJDFKSFJSHFJssh-rsa Work"
  46 + create(:key, :user => @user, :title => "ssh-rsa Work", :key => "jfKLJDFKSFJSHFJssh-rsa Work")
47 47 end
48 48 end
... ...
features/steps/project/project_hooks.rb
  Diff comments   View file @b28ab89
... ... @@ -6,7 +6,7 @@ class ProjectHooks < Spinach::FeatureSteps
6 6 include RSpec::Mocks::ExampleMethods
7 7  
8 8 Given 'project has hook' do
9   - @hook = Factory :project_hook, project: current_project
  9 + @hook = create(:project_hook, project: current_project)
10 10 end
11 11  
12 12 Then 'I should see project hook' do
... ...
features/steps/project/project_issues.rb
  Diff comments   View file @b28ab89
... ... @@ -79,16 +79,16 @@ class ProjectIssues < Spinach::FeatureSteps
79 79  
80 80 Given 'project "Shop" has milestone "v2.2"' do
81 81 project = Project.find_by_name("Shop")
82   - milestone = Factory :milestone, :title => "v2.2", :project => project
  82 + milestone = create(:milestone, :title => "v2.2", :project => project)
83 83  
84   - 3.times { Factory :issue, :project => project, :milestone => milestone }
  84 + 3.times { create(:issue, :project => project, :milestone => milestone) }
85 85 end
86 86  
87 87 And 'project "Shop" has milestone "v3.0"' do
88 88 project = Project.find_by_name("Shop")
89   - milestone = Factory :milestone, :title => "v3.0", :project => project
  89 + milestone = create(:milestone, :title => "v3.0", :project => project)
90 90  
91   - 3.times { Factory :issue, :project => project, :milestone => milestone }
  91 + 3.times { create(:issue, :project => project, :milestone => milestone) }
92 92 end
93 93  
94 94 When 'I select milestone "v3.0"' do
... ... @@ -117,18 +117,18 @@ class ProjectIssues < Spinach::FeatureSteps
117 117  
118 118 And 'project "Shop" have "Release 0.4" open issue' do
119 119 project = Project.find_by_name("Shop")
120   - Factory.create(:issue,
121   - :title => "Release 0.4",
122   - :project => project,
123   - :author => project.users.first)
  120 + create(:issue,
  121 + :title => "Release 0.4",
  122 + :project => project,
  123 + :author => project.users.first)
124 124 end
125 125  
126 126 And 'project "Shop" have "Release 0.3" closed issue' do
127 127 project = Project.find_by_name("Shop")
128   - Factory.create(:issue,
129   - :title => "Release 0.3",
130   - :project => project,
131   - :author => project.users.first,
132   - :closed => true)
  128 + create(:issue,
  129 + :title => "Release 0.3",
  130 + :project => project,
  131 + :author => project.users.first,
  132 + :closed => true)
133 133 end
134 134 end
... ...
features/steps/project/project_labels.rb
  Diff comments   View file @b28ab89
... ... @@ -18,7 +18,7 @@ class ProjectLabels < Spinach::FeatureSteps
18 18 And 'project "Shop" have issues tags: "bug", "feature"' do
19 19 project = Project.find_by_name("Shop")
20 20 ['bug', 'feature'].each do |label|
21   - Factory :issue, project: project, label_list: label
  21 + create(:issue, project: project, label_list: label)
22 22 end
23 23 end
24 24 end
... ...
features/steps/project/project_merge_requests.rb
  Diff comments   View file @b28ab89
... ... @@ -63,18 +63,18 @@ class ProjectMergeRequests < Spinach::FeatureSteps
63 63  
64 64 And 'project "Shop" have "Bug NS-04" open merge request' do
65 65 project = Project.find_by_name("Shop")
66   - Factory.create(:merge_request,
67   - :title => "Bug NS-04",
68   - :project => project,
69   - :author => project.users.first)
  66 + create(:merge_request,
  67 + :title => "Bug NS-04",
  68 + :project => project,
  69 + :author => project.users.first)
70 70 end
71 71  
72 72 And 'project "Shop" have "Feature NS-03" closed merge request' do
73 73 project = Project.find_by_name("Shop")
74   - Factory.create(:merge_request,
75   - :title => "Feature NS-03",
76   - :project => project,
77   - :author => project.users.first,
78   - :closed => true)
  74 + create(:merge_request,
  75 + :title => "Feature NS-03",
  76 + :project => project,
  77 + :author => project.users.first,
  78 + :closed => true)
79 79 end
80 80 end
... ...
features/steps/project/project_milestones.rb
  Diff comments   View file @b28ab89
... ... @@ -32,9 +32,9 @@ class ProjectMilestones < Spinach::FeatureSteps
32 32  
33 33 And 'project "Shop" has milestone "v2.2"' do
34 34 project = Project.find_by_name("Shop")
35   - milestone = Factory :milestone, :title => "v2.2", :project => project
  35 + milestone = create(:milestone, :title => "v2.2", :project => project)
36 36  
37   - 3.times { Factory :issue, :project => project, :milestone => milestone }
  37 + 3.times { create(:issue, :project => project, :milestone => milestone) }
38 38 end
39 39  
40 40 Given 'the milestone has open and closed issues' do
... ...
features/steps/project/project_team_management.rb
  Diff comments   View file @b28ab89
... ... @@ -74,11 +74,11 @@ class ProjectTeamManagement < Spinach::FeatureSteps
74 74 end
75 75  
76 76 And 'gitlab user "Mike"' do
77   - Factory :user, :name => "Mike"
  77 + create(:user, :name => "Mike")
78 78 end
79 79  
80 80 And 'gitlab user "Sam"' do
81   - Factory :user, :name => "Sam"
  81 + create(:user, :name => "Sam")
82 82 end
83 83  
84 84 And '"Sam" is "Shop" developer' do
... ... @@ -88,7 +88,7 @@ class ProjectTeamManagement < Spinach::FeatureSteps
88 88 end
89 89  
90 90 Given 'I own project "Website"' do
91   - @project = Factory :project, :name => "Website"
  91 + @project = create(:project, :name => "Website")
92 92 @project.add_access(@user, :admin)
93 93 end
94 94  
... ...
features/steps/shared/project.rb
  Diff comments   View file @b28ab89
... ... @@ -9,7 +9,7 @@ module SharedProject
9 9  
10 10 # Create a specific project called "Shop"
11 11 And 'I own project "Shop"' do
12   - @project = Factory :project, :name => "Shop"
  12 + @project = create(:project, :name => "Shop")
13 13 @project.add_access(@user, :admin)
14 14 end
15 15  
... ...
spec/factories.rb
  Diff comments   View file @b28ab89
1   -# Backwards compatibility with the old method
2   -def Factory(type, *args)
3   - FactoryGirl.create(type, *args)
4   -end
5   -
6   -module Factory
7   - def self.create(type, *args)
8   - FactoryGirl.create(type, *args)
9   - end
10   -
11   - def self.new(type, *args)
12   - FactoryGirl.build(type, *args)
13   - end
14   - def self.attributes(type, *args)
15   - FactoryGirl.attributes_for(type, *args)
16   - end
17   -end
18   -
19 1 FactoryGirl.define do
20 2 sequence :sentence, aliases: [:title, :content] do
21 3 Faker::Lorem.sentence
... ...
spec/mailers/notify_spec.rb
  Diff comments   View file @b28ab89
... ... @@ -4,8 +4,8 @@ describe Notify do
4 4 include EmailSpec::Helpers
5 5 include EmailSpec::Matchers
6 6  
7   - let(:recipient) { Factory.create(:user, email: 'recipient@example.com') }
8   - let(:project) { Factory.create(:project) }
  7 + let(:recipient) { create(:user, email: 'recipient@example.com') }
  8 + let(:project) { create(:project) }
9 9  
10 10 shared_examples 'a multiple recipients email' do
11 11 it 'is sent to the given recipient' do
... ... @@ -15,7 +15,7 @@ describe Notify do
15 15  
16 16 describe 'for new users, the email' do
17 17 let(:example_site_path) { root_path }
18   - let(:new_user) { Factory.create(:user, email: 'newguy@example.com') }
  18 + let(:new_user) { create(:user, email: 'newguy@example.com') }
19 19  
20 20 subject { Notify.new_user_email(new_user.id, new_user.password) }
21 21  
... ... @@ -42,8 +42,8 @@ describe Notify do
42 42  
43 43 context 'for a project' do
44 44 describe 'items that are assignable, the email' do
45   - let(:assignee) { Factory.create(:user, email: 'assignee@example.com') }
46   - let(:previous_assignee) { Factory.create(:user, name: 'Previous Assignee') }
  45 + let(:assignee) { create(:user, email: 'assignee@example.com') }
  46 + let(:previous_assignee) { create(:user, name: 'Previous Assignee') }
47 47  
48 48 shared_examples 'an assignee email' do
49 49 it 'is sent to the assignee' do
... ... @@ -52,7 +52,7 @@ describe Notify do
52 52 end
53 53  
54 54 context 'for issues' do
55   - let(:issue) { Factory.create(:issue, assignee: assignee, project: project ) }
  55 + let(:issue) { create(:issue, assignee: assignee, project: project ) }
56 56  
57 57 describe 'that are new' do
58 58 subject { Notify.new_issue_email(issue.id) }
... ... @@ -93,10 +93,10 @@ describe Notify do
93 93 end
94 94  
95 95 describe 'status changed' do
96   - let(:current_user) { Factory.create :user, email: "current@email.com" }
  96 + let(:current_user) { create(:user, email: "current@email.com") }
97 97 let(:status) { 'closed' }
98 98 subject { Notify.issue_status_changed_email(recipient.id, issue.id, status, current_user) }
99   -
  99 +
100 100 it 'has the correct subject' do
101 101 should have_subject /changed issue ##{issue.id} \| #{issue.title}/i
102 102 end
... ... @@ -117,7 +117,7 @@ describe Notify do
117 117 end
118 118  
119 119 context 'for merge requests' do
120   - let(:merge_request) { Factory.create(:merge_request, assignee: assignee, project: project) }
  120 + let(:merge_request) { create(:merge_request, assignee: assignee, project: project) }
121 121  
122 122 describe 'that are new' do
123 123 subject { Notify.new_merge_request_email(merge_request.id) }
... ... @@ -169,13 +169,13 @@ describe Notify do
169 169 end
170 170  
171 171 describe 'project access changed' do
172   - let(:project) { Factory.create(:project,
173   - path: "Fuu",
174   - code: "Fuu") }
175   - let(:user) { Factory.create :user }
176   - let(:users_project) { Factory.create(:users_project,
177   - project: project,
178   - user: user) }
  172 + let(:project) { create(:project,
  173 + path: "Fuu",
  174 + code: "Fuu") }
  175 + let(:user) { create(:user) }
  176 + let(:users_project) { create(:users_project,
  177 + project: project,
  178 + user: user) }
179 179 subject { Notify.project_access_granted_email(users_project.id) }
180 180 it 'has the correct subject' do
181 181 should have_subject /access to project was granted/
... ... @@ -189,8 +189,8 @@ describe Notify do
189 189 end
190 190  
191 191 context 'items that are noteable, the email for a note' do
192   - let(:note_author) { Factory.create(:user, name: 'author_name') }
193   - let(:note) { Factory.create(:note, project: project, author: note_author) }
  192 + let(:note_author) { create(:user, name: 'author_name') }
  193 + let(:note) { create(:note, project: project, author: note_author) }
194 194  
195 195 before :each do
196 196 Note.stub(:find).with(note.id).and_return(note)
... ... @@ -251,7 +251,7 @@ describe Notify do
251 251 end
252 252  
253 253 describe 'on a merge request' do
254   - let(:merge_request) { Factory.create(:merge_request, project: project) }
  254 + let(:merge_request) { create(:merge_request, project: project) }
255 255 let(:note_on_merge_request_path) { project_merge_request_path(project, merge_request, anchor: "note_#{note.id}") }
256 256 before(:each) { note.stub(:noteable).and_return(merge_request) }
257 257  
... ... @@ -269,7 +269,7 @@ describe Notify do
269 269 end
270 270  
271 271 describe 'on an issue' do
272   - let(:issue) { Factory.create(:issue, project: project) }
  272 + let(:issue) { create(:issue, project: project) }
273 273 let(:note_on_issue_path) { project_issue_path(project, issue, anchor: "note_#{note.id}") }
274 274 before(:each) { note.stub(:noteable).and_return(issue) }
275 275  
... ...
spec/models/event_spec.rb
  Diff comments   View file @b28ab89
... ... @@ -32,7 +32,7 @@ describe Event do
32 32  
33 33 describe "Push event" do
34 34 before do
35   - project = Factory :project
  35 + project = create(:project)
36 36 @user = project.owner
37 37  
38 38 data = {
... ...
spec/models/issue_spec.rb
  Diff comments   View file @b28ab89
... ... @@ -38,11 +38,11 @@ describe Issue do
38 38 it { should include_module(Votes) }
39 39 end
40 40  
41   - subject { Factory.create(:issue) }
  41 + subject { create(:issue) }
42 42  
43 43 describe '#is_being_reassigned?' do
44 44 it 'returns true if the issue assignee has changed' do
45   - subject.assignee = Factory(:user)
  45 + subject.assignee = create(:user)
46 46 subject.is_being_reassigned?.should be_true
47 47 end
48 48 it 'returns false if the issue assignee has not changed' do
... ... @@ -56,7 +56,7 @@ describe Issue do
56 56 subject.is_being_closed?.should be_true
57 57 end
58 58 it 'returns false if the closed attribute has changed and is now false' do
59   - issue = Factory.create(:closed_issue)
  59 + issue = create(:closed_issue)
60 60 issue.closed = false
61 61 issue.is_being_closed?.should be_false
62 62 end
... ... @@ -68,7 +68,7 @@ describe Issue do
68 68  
69 69 describe '#is_being_reopened?' do
70 70 it 'returns true if the closed attribute has changed and is now false' do
71   - issue = Factory.create(:closed_issue)
  71 + issue = create(:closed_issue)
72 72 issue.closed = false
73 73 issue.is_being_reopened?.should be_true
74 74 end
... ...
spec/models/key_spec.rb
  Diff comments   View file @b28ab89
... ... @@ -53,7 +53,7 @@ describe Key do
53 53 end
54 54  
55 55 context "as a personal key" do
56   - let(:user) { Factory.create(:user) }
  56 + let(:user) { create(:user) }
57 57  
58 58 it "accepts the key once" do
59 59 build(:key, user: user).should be_valid
... ... @@ -67,7 +67,7 @@ describe Key do
67 67 end
68 68  
69 69 context "validate it is a fingerprintable key" do
70   - let(:user) { Factory.create(:user) }
  70 + let(:user) { create(:user) }
71 71  
72 72 it "accepts the fingerprintable key" do
73 73 build(:key, user: user).should be_valid
... ...
spec/models/merge_request_spec.rb
  Diff comments   View file @b28ab89
... ... @@ -38,12 +38,12 @@ describe MergeRequest do
38 38 end
39 39  
40 40 describe "#mr_and_commit_notes" do
41   - let!(:merge_request) { Factory.create(:merge_request) }
  41 + let!(:merge_request) { create(:merge_request) }
42 42  
43 43 before do
44 44 merge_request.stub(:commits) { [merge_request.project.commit] }
45   - Factory.create(:note, noteable: merge_request.commits.first)
46   - Factory.create(:note, noteable: merge_request)
  45 + create(:note, noteable: merge_request.commits.first)
  46 + create(:note, noteable: merge_request)
47 47 end
48 48  
49 49 it "should include notes for commits" do
... ... @@ -52,11 +52,11 @@ describe MergeRequest do
52 52 end
53 53 end
54 54  
55   - subject { Factory.create(:merge_request) }
  55 + subject { create(:merge_request) }
56 56  
57 57 describe '#is_being_reassigned?' do
58 58 it 'returns true if the merge_request assignee has changed' do
59   - subject.assignee = Factory(:user)
  59 + subject.assignee = create(:user)
60 60 subject.is_being_reassigned?.should be_true
61 61 end
62 62 it 'returns false if the merge request assignee has not changed' do
... ... @@ -70,7 +70,7 @@ describe MergeRequest do
70 70 subject.is_being_closed?.should be_true
71 71 end
72 72 it 'returns false if the closed attribute has changed and is now false' do
73   - merge_request = Factory.create(:closed_merge_request)
  73 + merge_request = create(:closed_merge_request)
74 74 merge_request.closed = false
75 75 merge_request.is_being_closed?.should be_false
76 76 end
... ... @@ -82,7 +82,7 @@ describe MergeRequest do
82 82  
83 83 describe '#is_being_reopened?' do
84 84 it 'returns true if the closed attribute has changed and is now false' do
85   - merge_request = Factory.create(:closed_merge_request)
  85 + merge_request = create(:closed_merge_request)
86 86 merge_request.closed = false
87 87 merge_request.is_being_reopened?.should be_true
88 88 end
... ...
spec/models/milestone_spec.rb
  Diff comments   View file @b28ab89
... ... @@ -30,8 +30,8 @@ describe Milestone do
30 30 it { should ensure_inclusion_of(:closed).in_array([true, false]) }
31 31 end
32 32  
33   - let(:milestone) { Factory :milestone }
34   - let(:issue) { Factory :issue }
  33 + let(:milestone) { create(:milestone) }
  34 + let(:issue) { create(:issue) }
35 35  
36 36 describe "#percent_complete" do
37 37 it "should not count open issues" do
... ...
spec/models/note_spec.rb
  Diff comments   View file @b28ab89
... ... @@ -40,10 +40,10 @@ describe Note do
40 40 end
41 41  
42 42 describe "Voting score" do
43   - let(:project) { Factory(:project) }
  43 + let(:project) { create(:project) }
44 44  
45 45 it "recognizes a neutral note" do
46   - note = Factory(:note, note: "This is not a +1 note")
  46 + note = create(:note, note: "This is not a +1 note")
47 47 note.should_not be_upvote
48 48 note.should_not be_downvote
49 49 end
... ... @@ -55,7 +55,7 @@ describe Note do
55 55 end
56 56  
57 57 it "recognizes a +1 note" do
58   - note = Factory(:note, note: "+1 for this")
  58 + note = create(:note, note: "+1 for this")
59 59 note.should be_upvote
60 60 end
61 61  
... ... @@ -65,7 +65,7 @@ describe Note do
65 65 end
66 66  
67 67 it "recognizes a -1 note" do
68   - note = Factory(:note, note: "-1 for this")
  68 + note = create(:note, note: "-1 for this")
69 69 note.should be_downvote
70 70 end
71 71  
... ... @@ -80,9 +80,9 @@ describe Note do
80 80  
81 81 describe "Commit notes" do
82 82 before do
83   - @note = Factory :note,
84   - noteable_id: commit.id,
85   - noteable_type: "Commit"
  83 + @note = create(:note,
  84 + noteable_id: commit.id,
  85 + noteable_type: "Commit")
86 86 end
87 87  
88 88 it "should be accessible through #noteable" do
... ... @@ -103,10 +103,10 @@ describe Note do
103 103  
104 104 describe "Pre-line commit notes" do
105 105 before do
106   - @note = Factory :note,
107   - noteable_id: commit.id,
108   - noteable_type: "Commit",
109   - line_code: "0_16_1"
  106 + @note = create(:note,
  107 + noteable_id: commit.id,
  108 + noteable_type: "Commit",
  109 + line_code: "0_16_1")
110 110 end
111 111  
112 112 it "should save a valid note" do
... ... @@ -120,9 +120,9 @@ describe Note do
120 120 end
121 121  
122 122 describe '#create_status_change_note' do
123   - let(:project) { Factory.create(:project) }
124   - let(:thing) { Factory.create(:issue, project: project) }
125   - let(:author) { Factory(:user) }
  123 + let(:project) { create(:project) }
  124 + let(:thing) { create(:issue, project: project) }
  125 + let(:author) { create(:user) }
126 126 let(:status) { 'new_status' }
127 127  
128 128 subject { Note.create_status_change_note(thing, author, status) }
... ... @@ -141,10 +141,10 @@ describe Note do
141 141 describe :authorization do
142 142 before do
143 143 @p1 = create(:project)
144   - @p2 = Factory :project
145   - @u1 = Factory :user
146   - @u2 = Factory :user
147   - @u3 = Factory :user
  144 + @p2 = create(:project)
  145 + @u1 = create(:user)
  146 + @u2 = create(:user)
  147 + @u3 = create(:user)
148 148 @abilities = Six.new
149 149 @abilities << Ability
150 150 end
... ...
spec/models/project_hooks_spec.rb
  Diff comments   View file @b28ab89
1 1 require 'spec_helper'
2 2  
3 3 describe Project, "Hooks" do
4   - let(:project) { Factory :project }
5   - before do
6   - @key = Factory :key, user: project.owner
  4 + let(:project) { create(:project) }
  5 + before do
  6 + @key = create(:key, user: project.owner)
7 7 @user = @key.user
8 8 @key_id = @key.identifier
9 9 end
10 10  
11   - describe "Post Receive Event" do
12   - it "should create push event" do
  11 + describe "Post Receive Event" do
  12 + it "should create push event" do
13 13 oldrev, newrev, ref = '00000000000000000000000000000000', 'newrev', 'refs/heads/master'
14 14 project.observe_push(oldrev, newrev, ref, @user)
15 15 event = Event.last
... ... @@ -32,8 +32,8 @@ describe Project, &quot;Hooks&quot; do
32 32  
33 33 context "with web hooks" do
34 34 before do
35   - @project_hook = Factory(:project_hook)
36   - @project_hook_2 = Factory(:project_hook)
  35 + @project_hook = create(:project_hook)
  36 + @project_hook_2 = create(:project_hook)
37 37 project.hooks << [@project_hook, @project_hook_2]
38 38 end
39 39  
... ... @@ -47,7 +47,7 @@ describe Project, &quot;Hooks&quot; do
47 47  
48 48 context "does not execute web hooks" do
49 49 before do
50   - @project_hook = Factory(:project_hook)
  50 + @project_hook = create(:project_hook)
51 51 project.hooks << [@project_hook]
52 52 end
53 53  
... ...
spec/models/project_security_spec.rb
  Diff comments   View file @b28ab89
... ... @@ -3,9 +3,9 @@ require &#39;spec_helper&#39;
3 3 describe Project do
4 4 describe :authorization do
5 5 before do
6   - @p1 = Factory :project
7   - @u1 = Factory :user
8   - @u2 = Factory :user
  6 + @p1 = create(:project)
  7 + @u1 = create(:user)
  8 + @u2 = create(:user)
9 9 @abilities = Six.new
10 10 @abilities << Ability
11 11 end
... ...
spec/models/project_spec.rb
  Diff comments   View file @b28ab89
... ... @@ -157,7 +157,7 @@ describe Project do
157 157  
158 158 describe :valid_repo? do
159 159 it "should be valid repo" do
160   - project = Factory :project
  160 + project = create(:project)
161 161 project.valid_repo?.should be_true
162 162 end
163 163  
... ... @@ -168,7 +168,7 @@ describe Project do
168 168 end
169 169  
170 170 describe "last_activity methods" do
171   - let(:project) { Factory :project }
  171 + let(:project) { create(:project) }
172 172 let(:last_event) { double(created_at: Time.now) }
173 173  
174 174 describe "last_activity" do
... ... @@ -191,7 +191,7 @@ describe Project do
191 191 end
192 192  
193 193 describe "fresh commits" do
194   - let(:project) { Factory :project }
  194 + let(:project) { create(:project) }
195 195  
196 196 it { project.fresh_commits(3).count.should == 3 }
197 197 it { project.fresh_commits.first.id.should == "bcf03b5de6c33f3869ef70d68cf06e679d1d7f9a" }
... ... @@ -199,7 +199,7 @@ describe Project do
199 199 end
200 200  
201 201 describe "commits_between" do
202   - let(:project) { Factory :project }
  202 + let(:project) { create(:project) }
203 203  
204 204 subject do
205 205 commits = project.commits_between("3a4b4fb4cde7809f033822a171b9feae19d41fff",
... ... @@ -213,7 +213,7 @@ describe Project do
213 213 end
214 214  
215 215 describe "Git methods" do
216   - let(:project) { Factory :project }
  216 + let(:project) { create(:project) }
217 217  
218 218 describe :repo do
219 219 it "should return valid repo" do
... ... @@ -270,14 +270,14 @@ describe Project do
270 270 end
271 271  
272 272 describe :update_merge_requests do
273   - let(:project) { Factory :project }
  273 + let(:project) { create(:project) }
274 274  
275 275 before do
276   - @merge_request = Factory :merge_request,
277   - project: project,
278   - merged: false,
279   - closed: false
280   - @key = Factory :key, user_id: project.owner.id
  276 + @merge_request = create(:merge_request,
  277 + project: project,
  278 + merged: false,
  279 + closed: false)
  280 + @key = create(:key, user_id: project.owner.id)
281 281 end
282 282  
283 283 it "should close merge request if last commit from source branch was pushed to target branch" do
... ...
spec/models/system_hook_spec.rb
  Diff comments   View file @b28ab89
... ... @@ -17,19 +17,19 @@ describe SystemHook do
17 17 before(:each) { ActiveRecord::Base.observers.enable(:all) }
18 18  
19 19 before(:each) do
20   - @system_hook = Factory :system_hook
  20 + @system_hook = create(:system_hook)
21 21 WebMock.stub_request(:post, @system_hook.url)
22 22 end
23 23  
24 24 it "project_create hook" do
25 25 with_resque do
26   - project = Factory :project
  26 + project = create(:project)
27 27 end
28 28 WebMock.should have_requested(:post, @system_hook.url).with(body: /project_create/).once
29 29 end
30 30  
31 31 it "project_destroy hook" do
32   - project = Factory :project
  32 + project = create(:project)
33 33 with_resque do
34 34 project.destroy
35 35 end
... ... @@ -38,13 +38,13 @@ describe SystemHook do
38 38  
39 39 it "user_create hook" do
40 40 with_resque do
41   - Factory :user
  41 + create(:user)
42 42 end
43 43 WebMock.should have_requested(:post, @system_hook.url).with(body: /user_create/).once
44 44 end
45 45  
46 46 it "user_destroy hook" do
47   - user = Factory :user
  47 + user = create(:user)
48 48 with_resque do
49 49 user.destroy
50 50 end
... ... @@ -52,8 +52,8 @@ describe SystemHook do
52 52 end
53 53  
54 54 it "project_create hook" do
55   - user = Factory :user
56   - project = Factory :project
  55 + user = create(:user)
  56 + project = create(:project)
57 57 with_resque do
58 58 project.users << user
59 59 end
... ... @@ -61,8 +61,8 @@ describe SystemHook do
61 61 end
62 62  
63 63 it "project_destroy hook" do
64   - user = Factory :user
65   - project = Factory :project
  64 + user = create(:user)
  65 + project = create(:project)
66 66 project.users << user
67 67 with_resque do
68 68 project.users_projects.clear
... ...
spec/models/user_spec.rb
  Diff comments   View file @b28ab89
... ... @@ -108,7 +108,7 @@ describe User do
108 108  
109 109 describe 'authentication token' do
110 110 it "should have authentication token" do
111   - user = Factory(:user)
  111 + user = create(:user)
112 112 user.authentication_token.should_not be_blank
113 113 end
114 114 end
... ...
spec/models/web_hook_spec.rb
  Diff comments   View file @b28ab89
... ... @@ -39,8 +39,8 @@ describe ProjectHook do
39 39  
40 40 describe "execute" do
41 41 before(:each) do
42   - @project_hook = Factory :project_hook
43   - @project = Factory :project
  42 + @project_hook = create(:project_hook)
  43 + @project = create(:project)
44 44 @project.hooks << [@project_hook]
45 45 @data = { before: 'oldrev', after: 'newrev', ref: 'ref'}
46 46  
... ...
spec/observers/activity_observer_spec.rb
  Diff comments   View file @b28ab89
1 1 require 'spec_helper'
2 2  
3 3 describe ActivityObserver do
4   - let(:project) { Factory :project }
  4 + let(:project) { create(:project) }
5 5  
6 6 def self.it_should_be_valid_event
7 7 it { @event.should_not be_nil }
8 8 it { @event.project.should == project }
9 9 end
10 10  
11   - describe "Merge Request created" do
  11 + describe "Merge Request created" do
12 12 before do
13 13 MergeRequest.observers.enable :activity_observer do
14   - @merge_request = Factory :merge_request, project: project
  14 + @merge_request = create(:merge_request, project: project)
15 15 @event = Event.last
16 16 end
17 17 end
... ... @@ -21,10 +21,10 @@ describe ActivityObserver do
21 21 it { @event.target.should == @merge_request }
22 22 end
23 23  
24   - describe "Issue created" do
  24 + describe "Issue created" do
25 25 before do
26 26 Issue.observers.enable :activity_observer do
27   - @issue = Factory :issue, project: project
  27 + @issue = create(:issue, project: project)
28 28 @event = Event.last
29 29 end
30 30 end
... ... @@ -34,10 +34,10 @@ describe ActivityObserver do
34 34 it { @event.target.should == @issue }
35 35 end
36 36  
37   - #describe "Issue commented" do
38   - #before do
39   - #@issue = Factory :issue, project: project
40   - #@note = Factory :note, noteable: @issue, project: project
  37 + #describe "Issue commented" do
  38 + #before do
  39 + #@issue = create(:issue, project: project)
  40 + #@note = create(:note, noteable: @issue, project: project)
41 41 #@event = Event.last
42 42 #end
43 43  
... ...
spec/observers/issue_observer_spec.rb
  Diff comments   View file @b28ab89
... ... @@ -16,7 +16,7 @@ describe IssueObserver do
16 16 subject.should_receive(:after_create)
17 17  
18 18 Issue.observers.enable :issue_observer do
19   - Factory.create(:issue, project: Factory.create(:project))
  19 + create(:issue, project: create(:project))
20 20 end
21 21 end
22 22  
... ... @@ -43,7 +43,7 @@ describe IssueObserver do
43 43 end
44 44  
45 45 it 'is called when an issue is changed' do
46   - changed = Factory.create(:issue, project: Factory.create(:project))
  46 + changed = create(:issue, project: create(:project))
47 47 subject.should_receive(:after_update)
48 48  
49 49 Issue.observers.enable :issue_observer do
... ...
spec/observers/merge_request_observer_spec.rb
  Diff comments   View file @b28ab89
... ... @@ -16,7 +16,7 @@ describe MergeRequestObserver do
16 16 subject.should_receive(:after_create)
17 17  
18 18 MergeRequest.observers.enable :merge_request_observer do
19   - Factory.create(:merge_request, project: Factory.create(:project))
  19 + create(:merge_request, project: create(:project))
20 20 end
21 21 end
22 22  
... ... @@ -43,7 +43,7 @@ describe MergeRequestObserver do
43 43 end
44 44  
45 45 it 'is called when a merge request is changed' do
46   - changed = Factory.create(:merge_request, project: Factory.create(:project))
  46 + changed = create(:merge_request, project: create(:project))
47 47 subject.should_receive(:after_update)
48 48  
49 49 MergeRequest.observers.enable :merge_request_observer do
... ...
spec/observers/note_observer_spec.rb
  Diff comments   View file @b28ab89
... ... @@ -13,7 +13,7 @@ describe NoteObserver do
13 13 subject.should_receive :after_create
14 14  
15 15 Note.observers.enable :note_observer do
16   - Factory.create(:note)
  16 + create(:note)
17 17 end
18 18 end
19 19  
... ...
spec/observers/user_observer_spec.rb
  Diff comments   View file @b28ab89
... ... @@ -4,7 +4,7 @@ describe UserObserver do
4 4 subject { UserObserver.instance }
5 5  
6 6 it 'calls #after_create when new users are created' do
7   - new_user = Factory.new(:user)
  7 + new_user = build(:user)
8 8 subject.should_receive(:after_create).with(new_user)
9 9  
10 10 User.observers.enable :user_observer do
... ...
spec/observers/users_project_observer_spec.rb
  Diff comments   View file @b28ab89
1 1 require 'spec_helper'
2 2  
3 3 describe UsersProjectObserver do
4   - let(:user) { Factory.create :user }
5   - let(:project) { Factory.create(:project,
6   - code: "Fuu",
7   - path: "Fuu" ) }
8   - let(:users_project) { Factory.create(:users_project,
9   - project: project,
10   - user: user )}
  4 + let(:user) { create(:user) }
  5 + let(:project) { create(:project,
  6 + code: "Fuu",
  7 + path: "Fuu" ) }
  8 + let(:users_project) { create(:users_project,
  9 + project: project,
  10 + user: user )}
11 11 subject { UsersProjectObserver.instance }
12 12  
13 13 describe "#after_commit" do
... ...
spec/requests/admin/admin_hooks_spec.rb
  Diff comments   View file @b28ab89
... ... @@ -2,12 +2,12 @@ require &#39;spec_helper&#39;
2 2  
3 3 describe "Admin::Hooks" do
4 4 before do
5   - @project = Factory :project,
6   - name: "LeGiT",
7   - code: "LGT"
  5 + @project = create(:project,
  6 + name: "LeGiT",
  7 + code: "LGT")
8 8 login_as :admin
9 9  
10   - @system_hook = Factory :system_hook
  10 + @system_hook = create(:system_hook)
11 11  
12 12 end
13 13  
... ...
spec/requests/admin/admin_projects_spec.rb
  Diff comments   View file @b28ab89
... ... @@ -2,9 +2,9 @@ require &#39;spec_helper&#39;
2 2  
3 3 describe "Admin::Projects" do
4 4 before do
5   - @project = Factory :project,
6   - name: "LeGiT",
7   - code: "LGT"
  5 + @project = create(:project,
  6 + name: "LeGiT",
  7 + code: "LGT")
8 8 login_as :admin
9 9 end
10 10  
... ... @@ -104,7 +104,7 @@ describe &quot;Admin::Projects&quot; do
104 104  
105 105 describe "Add new team member" do
106 106 before do
107   - @new_user = Factory :user
  107 + @new_user = create(:user)
108 108 visit admin_project_path(@project)
109 109 end
110 110  
... ...
spec/requests/admin/admin_users_spec.rb
  Diff comments   View file @b28ab89
... ... @@ -76,7 +76,7 @@ describe &quot;Admin::Users&quot; do
76 76  
77 77 describe "GET /admin/users/:id/edit" do
78 78 before do
79   - @simple_user = Factory :user
  79 + @simple_user = create(:user)
80 80 visit admin_users_path
81 81 click_link "edit_user_#{@simple_user.id}"
82 82 end
... ... @@ -107,13 +107,13 @@ describe &quot;Admin::Users&quot; do
107 107 end
108 108 end
109 109  
110   - describe "Add new project" do
111   - before do
112   - @new_project = Factory :project
  110 + describe "Add new project" do
  111 + before do
  112 + @new_project = create(:project)
113 113 visit admin_user_path(@user)
114 114 end
115 115  
116   - it "should create new user" do
  116 + it "should create new user" do
117 117 select @new_project.name, from: "project_ids"
118 118 expect { click_button "Add" }.to change { UsersProject.count }.by(1)
119 119 page.should have_content @new_project.name
... ...
spec/requests/api/issues_spec.rb
  Diff comments   View file @b28ab89
... ... @@ -3,9 +3,9 @@ require &#39;spec_helper&#39;
3 3 describe Gitlab::API do
4 4 include ApiHelpers
5 5  
6   - let(:user) { Factory :user }
7   - let!(:project) { Factory :project, owner: user }
8   - let!(:issue) { Factory :issue, author: user, assignee: user, project: project }
  6 + let(:user) { create(:user) }
  7 + let!(:project) { create(:project, owner: user) }
  8 + let!(:issue) { create(:issue, author: user, assignee: user, project: project) }
9 9 before { project.add_access(user, :read) }
10 10  
11 11 describe "GET /issues" do
... ...
spec/requests/api/merge_requests_spec.rb
  Diff comments   View file @b28ab89
1 1 require "spec_helper"
2 2  
3   -describe Gitlab::API do
  3 +describe Gitlab::API do
4 4 include ApiHelpers
5   -
6   - let(:user) { Factory :user }
7   - let!(:project) { Factory :project, owner: user }
8   - let!(:merge_request) { Factory :merge_request, author: user, assignee: user, project: project, title: "Test" }
  5 +
  6 + let(:user) { create(:user ) }
  7 + let!(:project) { create(:project, owner: user) }
  8 + let!(:merge_request) { create(:merge_request, author: user, assignee: user, project: project, title: "Test") }
9 9 before { project.add_access(user, :read) }
10 10  
11 11 describe "GET /projects/:id/merge_requests" do
... ... @@ -39,7 +39,7 @@ describe Gitlab::API do
39 39 post api("/projects/#{project.code}/merge_requests", user),
40 40 title: 'Test merge_request', source_branch: "stable", target_branch: "master", author: user
41 41 response.status.should == 201
42   - json_response['title'].should == 'Test merge_request'
  42 + json_response['title'].should == 'Test merge_request'
43 43 end
44 44 end
45 45  
... ... @@ -47,7 +47,7 @@ describe Gitlab::API do
47 47 it "should return merge_request" do
48 48 put api("/projects/#{project.code}/merge_request/#{merge_request.id}", user), title: "New title"
49 49 response.status.should == 200
50   - json_response['title'].should == 'New title'
  50 + json_response['title'].should == 'New title'
51 51 end
52 52 end
53 53  
... ... @@ -55,7 +55,7 @@ describe Gitlab::API do
55 55 it "should return comment" do
56 56 post api("/projects/#{project.code}/merge_request/#{merge_request.id}/comments", user), note: "My comment"
57 57 response.status.should == 201
58   - json_response['note'].should == 'My comment'
  58 + json_response['note'].should == 'My comment'
59 59 end
60 60 end
61 61  
... ...
spec/requests/api/milestones_spec.rb
  Diff comments   View file @b28ab89
... ... @@ -3,9 +3,9 @@ require &#39;spec_helper&#39;
3 3 describe Gitlab::API do
4 4 include ApiHelpers
5 5  
6   - let(:user) { Factory :user }
7   - let!(:project) { Factory :project, owner: user }
8   - let!(:milestone) { Factory :milestone, project: project }
  6 + let(:user) { create(:user) }
  7 + let!(:project) { create(:project, owner: user) }
  8 + let!(:milestone) { create(:milestone, project: project) }
9 9  
10 10 before { project.add_access(user, :read) }
11 11  
... ...
spec/requests/api/projects_spec.rb
  Diff comments   View file @b28ab89
... ... @@ -3,14 +3,14 @@ require &#39;spec_helper&#39;
3 3 describe Gitlab::API do
4 4 include ApiHelpers
5 5  
6   - let(:user) { Factory :user }
7   - let(:user2) { Factory.create(:user) }
8   - let(:user3) { Factory.create(:user) }
9   - let!(:hook) { Factory :project_hook, project: project, url: "http://example.com" }
10   - let!(:project) { Factory :project, owner: user }
11   - let!(:snippet) { Factory :snippet, author: user, project: project, title: 'example' }
12   - let!(:users_project) { Factory :users_project, user: user, project: project, project_access: UsersProject::MASTER }
13   - let!(:users_project2) { Factory :users_project, user: user3, project: project, project_access: UsersProject::DEVELOPER }
  6 + let(:user) { create(:user) }
  7 + let(:user2) { create(:user) }
  8 + let(:user3) { create(:user) }
  9 + let!(:hook) { create(:project_hook, project: project, url: "http://example.com") }
  10 + let!(:project) { create(:project, owner: user ) }
  11 + let!(:snippet) { create(:snippet, author: user, project: project, title: 'example') }
  12 + let!(:users_project) { create(:users_project, user: user, project: project, project_access: UsersProject::MASTER) }
  13 + let!(:users_project2) { create(:users_project, user: user3, project: project, project_access: UsersProject::DEVELOPER) }
14 14 before { project.add_access(user, :read) }
15 15  
16 16 describe "GET /projects" do
... ... @@ -52,7 +52,7 @@ describe Gitlab::API do
52 52 end
53 53  
54 54 it "should assign attributes to project" do
55   - project = Factory.attributes(:project, {
  55 + project = attributes_for(:project, {
56 56 path: 'path',
57 57 code: 'code',
58 58 description: Faker::Lorem.sentence,
... ...
spec/requests/api/session_spec.rb
  Diff comments   View file @b28ab89
... ... @@ -3,7 +3,7 @@ require &#39;spec_helper&#39;
3 3 describe Gitlab::API do
4 4 include ApiHelpers
5 5  
6   - let(:user) { Factory :user }
  6 + let(:user) { create(:user) }
7 7  
8 8 describe "POST /session" do
9 9 context "when valid password" do
... ...
spec/requests/api/users_spec.rb
  Diff comments   View file @b28ab89
... ... @@ -3,9 +3,9 @@ require &#39;spec_helper&#39;
3 3 describe Gitlab::API do
4 4 include ApiHelpers
5 5  
6   - let(:user) { Factory :user }
7   - let(:admin) { Factory :admin }
8   - let(:key) { Factory :key, user: user }
  6 + let(:user) { create(:user) }
  7 + let(:admin) { create(:admin) }
  8 + let(:key) { create(:key, user: user) }
9 9  
10 10 describe "GET /users" do
11 11 context "when unauthenticated" do
... ... @@ -43,12 +43,12 @@ describe Gitlab::API do
43 43  
44 44 it "should create user" do
45 45 expect {
46   - post api("/users", admin), Factory.attributes(:user, projects_limit: 3)
  46 + post api("/users", admin), attributes_for(:user, projects_limit: 3)
47 47 }.to change { User.count }.by(1)
48 48 end
49 49  
50 50 it "shouldn't available for non admin users" do
51   - post api("/users", user), Factory.attributes(:user)
  51 + post api("/users", user), attributes_for(:user)
52 52 response.status.should == 403
53 53 end
54 54 end
... ... @@ -103,7 +103,7 @@ describe Gitlab::API do
103 103 end
104 104  
105 105 it "should create ssh key" do
106   - key_attrs = Factory.attributes :key
  106 + key_attrs = attributes_for :key
107 107 expect {
108 108 post api("/user/keys", user), key_attrs
109 109 }.to change{ user.keys.count }.by(1)
... ...
spec/requests/atom/dashboard_issues_spec.rb
  Diff comments   View file @b28ab89
... ... @@ -2,11 +2,11 @@ require &#39;spec_helper&#39;
2 2  
3 3 describe "Dashboard Issues Feed" do
4 4 describe "GET /issues" do
5   - let!(:user) { Factory :user }
6   - let!(:project1) { Factory :project }
7   - let!(:project2) { Factory :project }
8   - let!(:issue1) { Factory :issue, author: user, assignee: user, project: project1 }
9   - let!(:issue2) { Factory :issue, author: user, assignee: user, project: project2 }
  5 + let!(:user) { create(:user) }
  6 + let!(:project1) { create(:project) }
  7 + let!(:project2) { create(:project) }
  8 + let!(:issue1) { create(:issue, author: user, assignee: user, project: project1) }
  9 + let!(:issue2) { create(:issue, author: user, assignee: user, project: project2) }
10 10  
11 11 describe "atom feed" do
12 12 it "should render atom feed via private token" do
... ...
spec/requests/atom/dashboard_spec.rb
  Diff comments   View file @b28ab89
... ... @@ -2,7 +2,7 @@ require &#39;spec_helper&#39;
2 2  
3 3 describe "Dashboard Feed" do
4 4 describe "GET /" do
5   - let!(:user) { Factory :user }
  5 + let!(:user) { create(:user) }
6 6  
7 7 context "projects atom feed via private token" do
8 8 it "should render projects atom feed" do
... ...
spec/requests/atom/issues_spec.rb
  Diff comments   View file @b28ab89
... ... @@ -2,9 +2,9 @@ require &#39;spec_helper&#39;
2 2  
3 3 describe "Issues Feed" do
4 4 describe "GET /issues" do
5   - let!(:user) { Factory :user }
6   - let!(:project) { Factory :project, owner: user }
7   - let!(:issue) { Factory :issue, author: user, project: project }
  5 + let!(:user) { create(:user) }
  6 + let!(:project) { create(:project, owner: user) }
  7 + let!(:issue) { create(:issue, author: user, project: project) }
8 8  
9 9 before { project.add_access(user, :read, :write) }
10 10  
... ...
spec/requests/gitlab_flavored_markdown_spec.rb
  Diff comments   View file @b28ab89
1 1 require 'spec_helper'
2 2  
3 3 describe "Gitlab Flavored Markdown" do
4   - let(:project) { Factory :project }
5   - let(:issue) { Factory :issue, project: project }
6   - let(:merge_request) { Factory :merge_request, project: project }
  4 + let(:project) { create(:project) }
  5 + let(:issue) { create(:issue, project: project) }
  6 + let(:merge_request) { create(:merge_request, project: project) }
7 7 let(:fred) do
8   - u = Factory :user, name: "fred"
  8 + u = create(:user, name: "fred")
9 9 project.users << u
10 10 u
11 11 end
... ... @@ -84,16 +84,16 @@ describe &quot;Gitlab Flavored Markdown&quot; do
84 84  
85 85 describe "for issues" do
86 86 before do
87   - @other_issue = Factory :issue,
  87 + @other_issue = create(:issue,
  88 + author: @user,
  89 + assignee: @user,
  90 + project: project)
  91 + @issue = create(:issue,
88 92 author: @user,
89 93 assignee: @user,
90   - project: project
91   - @issue = Factory :issue,
92   - author: @user,
93   - assignee: @user,
94   - project: project,
95   - title: "fix ##{@other_issue.id}",
96   - description: "ask @#{fred.name} for details"
  94 + project: project,
  95 + title: "fix ##{@other_issue.id}",
  96 + description: "ask @#{fred.name} for details")
97 97 end
98 98  
99 99 it "should render subject in issues#index" do
... ... @@ -118,9 +118,9 @@ describe &quot;Gitlab Flavored Markdown&quot; do
118 118  
119 119 describe "for merge requests" do
120 120 before do
121   - @merge_request = Factory :merge_request,
122   - project: project,
123   - title: "fix ##{issue.id}"
  121 + @merge_request = create(:merge_request,
  122 + project: project,
  123 + title: "fix ##{issue.id}")
124 124 end
125 125  
126 126 it "should render title in merge_requests#index" do
... ... @@ -139,10 +139,10 @@ describe &quot;Gitlab Flavored Markdown&quot; do
139 139  
140 140 describe "for milestones" do
141 141 before do
142   - @milestone = Factory :milestone,
143   - project: project,
144   - title: "fix ##{issue.id}",
145   - description: "ask @#{fred.name} for details"
  142 + @milestone = create(:milestone,
  143 + project: project,
  144 + title: "fix ##{issue.id}",
  145 + description: "ask @#{fred.name} for details")
146 146 end
147 147  
148 148 it "should render title in milestones#index" do
... ...
spec/requests/issues_spec.rb
  Diff comments   View file @b28ab89
1 1 require 'spec_helper'
2 2  
3 3 describe "Issues" do
4   - let(:project) { Factory :project }
  4 + let(:project) { create(:project) }
5 5  
6 6 before do
7 7 login_as :user
8   - @user2 = Factory :user
  8 + @user2 = create(:user)
9 9  
10 10 project.add_access(@user, :read, :write)
11 11 project.add_access(@user2, :read, :write)
... ... @@ -13,10 +13,10 @@ describe &quot;Issues&quot; do
13 13  
14 14 describe "Edit issue", js: true do
15 15 before do
16   - @issue = Factory :issue,
17   - author: @user,
18   - assignee: @user,
19   - project: project
  16 + @issue = create(:issue,
  17 + author: @user,
  18 + assignee: @user,
  19 + project: project)
20 20 visit project_issues_path(project)
21 21 click_link "Edit"
22 22 end
... ... @@ -46,11 +46,11 @@ describe &quot;Issues&quot; do
46 46 describe "Search issue", js: true do
47 47 before do
48 48 ['foobar', 'foobar2', 'gitlab'].each do |title|
49   - @issue = Factory :issue,
50   - author: @user,
51   - assignee: @user,
52   - project: project,
53   - title: title
  49 + @issue = create(:issue,
  50 + author: @user,
  51 + assignee: @user,
  52 + project: project,
  53 + title: title)
54 54 @issue.save
55 55 end
56 56 end
... ... @@ -93,15 +93,15 @@ describe &quot;Issues&quot; do
93 93 describe "Filter issue" do
94 94 before do
95 95 ['foobar', 'barbaz', 'gitlab'].each do |title|
96   - @issue = Factory :issue,
97   - author: @user,
98   - assignee: @user,
99   - project: project,
100   - title: title
  96 + @issue = create(:issue,
  97 + author: @user,
  98 + assignee: @user,
  99 + project: project,
  100 + title: title)
101 101 end
102 102  
103 103 @issue = Issue.first
104   - @issue.milestone = Factory(:milestone, project: project)
  104 + @issue.milestone = create(:milestone, project: project)
105 105 @issue.assignee = nil
106 106 @issue.save
107 107 end
... ...
spec/requests/projects_deploy_keys_spec.rb
  Diff comments   View file @b28ab89
1 1 require 'spec_helper'
2 2  
3 3 describe "Projects", "DeployKeys" do
4   - let(:project) { Factory :project }
  4 + let(:project) { create(:project) }
5 5  
6 6 before do
7 7 login_as :user
... ... @@ -10,7 +10,7 @@ describe &quot;Projects&quot;, &quot;DeployKeys&quot; do
10 10  
11 11 describe "GET /keys" do
12 12 before do
13   - @key = Factory :key, project: project
  13 + @key = create(:key, project: project)
14 14 visit project_deploy_keys_path(project)
15 15 end
16 16  
... ... @@ -57,7 +57,7 @@ describe &quot;Projects&quot;, &quot;DeployKeys&quot; do
57 57  
58 58 describe "Show page" do
59 59 before do
60   - @key = Factory :key, project: project
  60 + @key = create(:key, project: project)
61 61 visit project_deploy_key_path(project, @key)
62 62 end
63 63  
... ...
spec/requests/projects_spec.rb
  Diff comments   View file @b28ab89
... ... @@ -6,7 +6,7 @@ describe &quot;Projects&quot; do
6 6 describe 'GET /project/new' do
7 7 it "should work autocomplete", :js => true do
8 8 visit new_project_path
9   -
  9 +
10 10 fill_in 'project_name', with: 'Awesome'
11 11 find("#project_path").value.should == 'awesome'
12 12 find("#project_code").value.should == 'awesome'
... ... @@ -15,7 +15,7 @@ describe &quot;Projects&quot; do
15 15  
16 16 describe "GET /projects/show" do
17 17 before do
18   - @project = Factory :project, owner: @user
  18 + @project = create(:project, owner: @user)
19 19 @project.add_access(@user, :read)
20 20  
21 21 visit project_path(@project)
... ... @@ -28,7 +28,7 @@ describe &quot;Projects&quot; do
28 28  
29 29 describe "GET /projects/:id/edit" do
30 30 before do
31   - @project = Factory :project
  31 + @project = create(:project)
32 32 @project.add_access(@user, :admin, :read)
33 33  
34 34 visit edit_project_path(@project)
... ... @@ -47,7 +47,7 @@ describe &quot;Projects&quot; do
47 47  
48 48 describe "PUT /projects/:id" do
49 49 before do
50   - @project = Factory :project, owner: @user
  50 + @project = create(:project, owner: @user)
51 51 @project.add_access(@user, :admin, :read)
52 52  
53 53 visit edit_project_path(@project)
... ... @@ -69,7 +69,7 @@ describe &quot;Projects&quot; do
69 69  
70 70 describe "DELETE /projects/:id" do
71 71 before do
72   - @project = Factory :project
  72 + @project = create(:project)
73 73 @project.add_access(@user, :read, :admin)
74 74 visit edit_project_path(@project)
75 75 end
... ...
spec/requests/search_spec.rb
  Diff comments   View file @b28ab89
... ... @@ -3,14 +3,14 @@ require &#39;spec_helper&#39;
3 3 describe "Search" do
4 4 before do
5 5 login_as :user
6   - @project = Factory :project
  6 + @project = create(:project)
7 7 @project.add_access(@user, :read)
8 8 visit search_path
9 9 fill_in "search", with: @project.name[0..3]
10 10 click_button "Search"
11 11 end
12 12  
13   - it "should show project in search results" do
  13 + it "should show project in search results" do
14 14 page.should have_content @project.name
15 15 end
16 16 end
... ...
spec/requests/security/profile_access_spec.rb
  Diff comments   View file @b28ab89
... ... @@ -3,7 +3,7 @@ require &#39;spec_helper&#39;
3 3 describe "Users Security" do
4 4 describe "Project" do
5 5 before do
6   - @u1 = Factory :user
  6 + @u1 = create(:user)
7 7 end
8 8  
9 9 describe "GET /login" do
... ...
spec/requests/snippets_spec.rb
  Diff comments   View file @b28ab89
1 1 require 'spec_helper'
2 2  
3 3 describe "Snippets" do
4   - let(:project) { Factory :project }
  4 + let(:project) { create(:project) }
5 5  
6 6 before do
7 7 login_as :user
... ... @@ -10,9 +10,9 @@ describe &quot;Snippets&quot; do
10 10  
11 11 describe "GET /snippets" do
12 12 before do
13   - @snippet = Factory :snippet,
14   - author: @user,
15   - project: project
  13 + @snippet = create(:snippet,
  14 + author: @user,
  15 + project: project)
16 16  
17 17 visit project_snippets_path(project)
18 18 end
... ... @@ -68,9 +68,9 @@ describe &quot;Snippets&quot; do
68 68  
69 69 describe "Edit snippet" do
70 70 before do
71   - @snippet = Factory :snippet,
72   - author: @user,
73   - project: project
  71 + @snippet = create(:snippet,
  72 + author: @user,
  73 + project: project)
74 74 visit project_snippet_path(project, @snippet)
75 75 click_link "Edit"
76 76 end
... ...
spec/support/login_helpers.rb
  Diff comments   View file @b28ab89
... ... @@ -3,7 +3,7 @@ module LoginHelpers
3 3 #
4 4 # role - User role (e.g., :admin, :user)
5 5 def login_as(role)
6   - @user = Factory(role)
  6 + @user = create(role)
7 7 login_with(@user)
8 8 end
9 9  
... ...
spec/support/matchers.rb
  Diff comments   View file @b28ab89
... ... @@ -59,9 +59,9 @@ module UrlAccess
59 59  
60 60 def emulate_user(user)
61 61 user = case user
62   - when :user then Factory(:user)
  62 + when :user then create(:user)
63 63 when :visitor then nil
64   - when :admin then Factory(:admin)
  64 + when :admin then create(:admin)
65 65 else user
66 66 end
67 67 login_with(user) if user
... ...
spec/workers/post_receive_spec.rb
  Diff comments   View file @b28ab89
... ... @@ -9,8 +9,8 @@ describe PostReceive do
9 9 end
10 10  
11 11 context "web hook" do
12   - let(:project) { Factory.create(:project) }
13   - let(:key) { Factory.create(:key, user: project.owner) }
  12 + let(:project) { create(:project) }
  13 + let(:key) { create(:key, user: project.owner) }
14 14 let(:key_id) { key.identifier }
15 15  
16 16 it "fetches the correct project" do
... ...