Merge pull request #1928 from kouno/cleanup-factories

Remove backward compatibility of factories.

12 files changed, 68 insertions, 68 deletions

diff --git a/spec/models/event_spec.rb b/spec/models/event_spec.rb
index 77b49246c46..d68ebb8614b 100644
--- a/spec/models/event_spec.rb
+++ b/spec/models/event_spec.rb
@@ -32,7 +32,7 @@ describe Event do
 
   describe "Push event" do
     before do
-      project = Factory :project
+      project = create(:project)
       @user = project.owner
 
       data = {
diff --git a/spec/models/issue_spec.rb b/spec/models/issue_spec.rb
index 7c98b9ea58d..4e999aad661 100644
--- a/spec/models/issue_spec.rb
+++ b/spec/models/issue_spec.rb
@@ -38,11 +38,11 @@ describe Issue do
     it { should include_module(Votes) }
   end
 
-  subject { Factory.create(:issue) }
+  subject { create(:issue) }
 
   describe '#is_being_reassigned?' do
     it 'returns true if the issue assignee has changed' do
-      subject.assignee = Factory(:user)
+      subject.assignee = create(:user)
       subject.is_being_reassigned?.should be_true
     end
     it 'returns false if the issue assignee has not changed' do
@@ -56,7 +56,7 @@ describe Issue do
       subject.is_being_closed?.should be_true
     end
     it 'returns false if the closed attribute has changed and is now false' do
-      issue = Factory.create(:closed_issue)
+      issue = create(:closed_issue)
       issue.closed = false
       issue.is_being_closed?.should be_false
     end
@@ -68,7 +68,7 @@ describe Issue do
 
   describe '#is_being_reopened?' do
     it 'returns true if the closed attribute has changed and is now false' do
-      issue = Factory.create(:closed_issue)
+      issue = create(:closed_issue)
       issue.closed = false
       issue.is_being_reopened?.should be_true
     end
diff --git a/spec/models/key_spec.rb b/spec/models/key_spec.rb
index d3231af88bc..80dfff08397 100644
--- a/spec/models/key_spec.rb
+++ b/spec/models/key_spec.rb
@@ -53,7 +53,7 @@ describe Key do
     end
 
     context "as a personal key" do
-      let(:user) { Factory.create(:user) }
+      let(:user) { create(:user) }
 
       it "accepts the key once" do
         build(:key, user: user).should be_valid
@@ -67,7 +67,7 @@ describe Key do
   end
 
   context "validate it is a fingerprintable key" do
-    let(:user) { Factory.create(:user) }
+    let(:user) { create(:user) }
 
     it "accepts the fingerprintable key" do
       build(:key, user: user).should be_valid
diff --git a/spec/models/merge_request_spec.rb b/spec/models/merge_request_spec.rb
index 0faca7668dd..4bf42ef99aa 100644
--- a/spec/models/merge_request_spec.rb
+++ b/spec/models/merge_request_spec.rb
@@ -38,12 +38,12 @@ describe MergeRequest do
   end
 
   describe "#mr_and_commit_notes" do
-    let!(:merge_request) { Factory.create(:merge_request) }
+    let!(:merge_request) { create(:merge_request) }
 
     before do
       merge_request.stub(:commits) { [merge_request.project.commit] }
-      Factory.create(:note, noteable: merge_request.commits.first)
-      Factory.create(:note, noteable: merge_request)
+      create(:note, noteable: merge_request.commits.first)
+      create(:note, noteable: merge_request)
     end
 
     it "should include notes for commits" do
@@ -52,11 +52,11 @@ describe MergeRequest do
     end
   end
 
-  subject { Factory.create(:merge_request) }
+  subject { create(:merge_request) }
 
   describe '#is_being_reassigned?' do
     it 'returns true if the merge_request assignee has changed' do
-      subject.assignee = Factory(:user)
+      subject.assignee = create(:user)
       subject.is_being_reassigned?.should be_true
     end
     it 'returns false if the merge request assignee has not changed' do
@@ -70,7 +70,7 @@ describe MergeRequest do
       subject.is_being_closed?.should be_true
     end
     it 'returns false if the closed attribute has changed and is now false' do
-      merge_request = Factory.create(:closed_merge_request)
+      merge_request = create(:closed_merge_request)
       merge_request.closed = false
       merge_request.is_being_closed?.should be_false
     end
@@ -82,7 +82,7 @@ describe MergeRequest do
 
   describe '#is_being_reopened?' do
     it 'returns true if the closed attribute has changed and is now false' do
-      merge_request = Factory.create(:closed_merge_request)
+      merge_request = create(:closed_merge_request)
       merge_request.closed = false
       merge_request.is_being_reopened?.should be_true
     end
diff --git a/spec/models/milestone_spec.rb b/spec/models/milestone_spec.rb
index 1aba20c651d..0e5cf7dd665 100644
--- a/spec/models/milestone_spec.rb
+++ b/spec/models/milestone_spec.rb
@@ -30,8 +30,8 @@ describe Milestone do
     it { should ensure_inclusion_of(:closed).in_array([true, false]) }
   end
 
-  let(:milestone) { Factory :milestone }
-  let(:issue) { Factory :issue }
+  let(:milestone) { create(:milestone) }
+  let(:issue) { create(:issue) }
 
   describe "#percent_complete" do
     it "should not count open issues" do
diff --git a/spec/models/note_spec.rb b/spec/models/note_spec.rb
index 514b6202b74..d739053748f 100644
--- a/spec/models/note_spec.rb
+++ b/spec/models/note_spec.rb
@@ -40,10 +40,10 @@ describe Note do
   end
 
   describe "Voting score" do
-    let(:project) { Factory(:project) }
+    let(:project) { create(:project) }
 
     it "recognizes a neutral note" do
-      note = Factory(:note, note: "This is not a +1 note")
+      note = create(:note, note: "This is not a +1 note")
       note.should_not be_upvote
       note.should_not be_downvote
     end
@@ -55,7 +55,7 @@ describe Note do
     end
 
     it "recognizes a +1 note" do
-      note = Factory(:note, note: "+1 for this")
+      note = create(:note, note: "+1 for this")
       note.should be_upvote
     end
 
@@ -65,7 +65,7 @@ describe Note do
     end
 
     it "recognizes a -1 note" do
-      note = Factory(:note, note: "-1 for this")
+      note = create(:note, note: "-1 for this")
       note.should be_downvote
     end
 
@@ -80,9 +80,9 @@ describe Note do
 
   describe "Commit notes" do
     before do
-      @note = Factory :note,
-        noteable_id: commit.id,
-        noteable_type: "Commit"
+      @note = create(:note,
+                     noteable_id: commit.id,
+                     noteable_type: "Commit")
     end
 
     it "should be accessible through #noteable" do
@@ -103,10 +103,10 @@ describe Note do
 
   describe "Pre-line commit notes" do
     before do
-      @note = Factory :note,
-        noteable_id: commit.id,
-        noteable_type: "Commit",
-        line_code: "0_16_1"
+      @note = create(:note,
+                     noteable_id: commit.id,
+                     noteable_type: "Commit",
+                     line_code: "0_16_1")
     end
 
     it "should save a valid note" do
@@ -120,9 +120,9 @@ describe Note do
   end
 
   describe '#create_status_change_note' do
-    let(:project)  { Factory.create(:project) }
-    let(:thing)    { Factory.create(:issue, project: project) }
-    let(:author)   { Factory(:user) }
+    let(:project)  { create(:project) }
+    let(:thing)    { create(:issue, project: project) }
+    let(:author)   { create(:user) }
     let(:status)   { 'new_status' }
 
     subject { Note.create_status_change_note(thing, author, status) }
@@ -141,10 +141,10 @@ describe Note do
   describe :authorization do
     before do
       @p1 = create(:project)
-      @p2 = Factory :project
-      @u1 = Factory :user
-      @u2 = Factory :user
-      @u3 = Factory :user
+      @p2 = create(:project)
+      @u1 = create(:user)
+      @u2 = create(:user)
+      @u3 = create(:user)
       @abilities = Six.new
       @abilities << Ability
     end
diff --git a/spec/models/project_hooks_spec.rb b/spec/models/project_hooks_spec.rb
index 129e3d61030..ee441ec4ec5 100644
--- a/spec/models/project_hooks_spec.rb
+++ b/spec/models/project_hooks_spec.rb
@@ -1,15 +1,15 @@
 require 'spec_helper'
 
 describe Project, "Hooks" do
-  let(:project) { Factory :project }
-  before do 
-    @key = Factory :key, user: project.owner
+  let(:project) { create(:project) }
+  before do
+    @key = create(:key, user: project.owner)
     @user = @key.user
     @key_id = @key.identifier
   end
 
-  describe "Post Receive Event" do 
-    it "should create push event" do 
+  describe "Post Receive Event" do
+    it "should create push event" do
       oldrev, newrev, ref = '00000000000000000000000000000000', 'newrev', 'refs/heads/master'
       project.observe_push(oldrev, newrev, ref, @user)
       event = Event.last
@@ -32,8 +32,8 @@ describe Project, "Hooks" do
 
     context "with web hooks" do
       before do
-        @project_hook = Factory(:project_hook)
-        @project_hook_2 = Factory(:project_hook)
+        @project_hook = create(:project_hook)
+        @project_hook_2 = create(:project_hook)
         project.hooks << [@project_hook, @project_hook_2]
       end
 
@@ -47,7 +47,7 @@ describe Project, "Hooks" do
 
     context "does not execute web hooks" do
       before do
-        @project_hook = Factory(:project_hook)
+        @project_hook = create(:project_hook)
         project.hooks << [@project_hook]
       end
 
diff --git a/spec/models/project_security_spec.rb b/spec/models/project_security_spec.rb
index baf6d4b68ea..60f8d45c9c8 100644
--- a/spec/models/project_security_spec.rb
+++ b/spec/models/project_security_spec.rb
@@ -3,9 +3,9 @@ require 'spec_helper'
 describe Project do
   describe :authorization do
     before do
-      @p1 = Factory :project
-      @u1 = Factory :user
-      @u2 = Factory :user
+      @p1 = create(:project)
+      @u1 = create(:user)
+      @u2 = create(:user)
       @abilities = Six.new
       @abilities << Ability
     end
diff --git a/spec/models/project_spec.rb b/spec/models/project_spec.rb
index 6fe46446262..1cf4f586192 100644
--- a/spec/models/project_spec.rb
+++ b/spec/models/project_spec.rb
@@ -157,7 +157,7 @@ describe Project do
 
   describe :valid_repo? do
     it "should be valid repo" do
-      project = Factory :project
+      project = create(:project)
       project.valid_repo?.should be_true
     end
 
@@ -168,7 +168,7 @@ describe Project do
   end
 
   describe "last_activity methods" do
-    let(:project)    { Factory :project }
+    let(:project)    { create(:project) }
     let(:last_event) { double(created_at: Time.now) }
 
     describe "last_activity" do
@@ -191,7 +191,7 @@ describe Project do
   end
 
   describe "fresh commits" do
-    let(:project) { Factory :project }
+    let(:project) { create(:project) }
 
     it { project.fresh_commits(3).count.should == 3 }
     it { project.fresh_commits.first.id.should == "bcf03b5de6c33f3869ef70d68cf06e679d1d7f9a" }
@@ -199,7 +199,7 @@ describe Project do
   end
 
   describe "commits_between" do
-    let(:project) { Factory :project }
+    let(:project) { create(:project) }
 
     subject do
       commits = project.commits_between("3a4b4fb4cde7809f033822a171b9feae19d41fff",
@@ -213,7 +213,7 @@ describe Project do
   end
 
   describe "Git methods" do
-    let(:project) { Factory :project }
+    let(:project) { create(:project) }
 
     describe :repo do
       it "should return valid repo" do
@@ -270,14 +270,14 @@ describe Project do
   end
 
   describe :update_merge_requests do
-    let(:project) { Factory :project }
+    let(:project) { create(:project) }
 
     before do
-      @merge_request = Factory :merge_request,
-        project: project,
-        merged: false,
-        closed: false
-      @key = Factory :key, user_id: project.owner.id
+      @merge_request = create(:merge_request,
+                              project: project,
+                              merged: false,
+                              closed: false)
+      @key = create(:key, user_id: project.owner.id)
     end
 
     it "should close merge request if last commit from source branch was pushed to target branch" do
diff --git a/spec/models/system_hook_spec.rb b/spec/models/system_hook_spec.rb
index b5d338a8c55..5f9239119b0 100644
--- a/spec/models/system_hook_spec.rb
+++ b/spec/models/system_hook_spec.rb
@@ -17,19 +17,19 @@ describe SystemHook do
     before(:each) { ActiveRecord::Base.observers.enable(:all) }
 
     before(:each) do
-      @system_hook = Factory :system_hook
+      @system_hook = create(:system_hook)
       WebMock.stub_request(:post, @system_hook.url)
     end
 
     it "project_create hook" do
       with_resque do
-        project = Factory :project
+        project = create(:project)
       end
       WebMock.should have_requested(:post, @system_hook.url).with(body: /project_create/).once
     end
 
     it "project_destroy hook" do
-      project = Factory :project
+      project = create(:project)
       with_resque do
         project.destroy
       end
@@ -38,13 +38,13 @@ describe SystemHook do
 
     it "user_create hook" do
       with_resque do
-        Factory :user
+        create(:user)
       end
       WebMock.should have_requested(:post, @system_hook.url).with(body: /user_create/).once
     end
 
     it "user_destroy hook" do
-      user = Factory :user
+      user = create(:user)
       with_resque do
         user.destroy
       end
@@ -52,8 +52,8 @@ describe SystemHook do
     end
 
     it "project_create hook" do
-      user = Factory :user
-      project = Factory :project
+      user = create(:user)
+      project = create(:project)
       with_resque do
         project.users << user
       end
@@ -61,8 +61,8 @@ describe SystemHook do
     end
 
     it "project_destroy hook" do
-      user = Factory :user
-      project = Factory :project
+      user = create(:user)
+      project = create(:project)
       project.users << user
       with_resque do
         project.users_projects.clear
diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb
index 5f41fb05ed1..b9654d7002c 100644
--- a/spec/models/user_spec.rb
+++ b/spec/models/user_spec.rb
@@ -108,7 +108,7 @@ describe User do
 
   describe 'authentication token' do
     it "should have authentication token" do
-      user = Factory(:user)
+      user = create(:user)
       user.authentication_token.should_not be_blank
     end
   end
diff --git a/spec/models/web_hook_spec.rb b/spec/models/web_hook_spec.rb
index d71fec811f0..8f8decb81c6 100644
--- a/spec/models/web_hook_spec.rb
+++ b/spec/models/web_hook_spec.rb
@@ -39,8 +39,8 @@ describe ProjectHook do
 
   describe "execute" do
     before(:each) do
-      @project_hook = Factory :project_hook
-      @project = Factory :project
+      @project_hook = create(:project_hook)
+      @project = create(:project)
       @project.hooks << [@project_hook]
       @data = { before: 'oldrev', after: 'newrev', ref: 'ref'}