Remove backward compatibility of factories.

spec/observers/activity_observer_spec.rb

@@ -1,17 +1,17 @@
 require 'spec_helper'
 
 describe ActivityObserver do
-  let(:project)  { Factory :project } 
+  let(:project)  { create(:project) }
 
   def self.it_should_be_valid_event
     it { @event.should_not be_nil }
     it { @event.project.should == project }
   end
 
-  describe "Merge Request created" do 
+  describe "Merge Request created" do
     before do
       MergeRequest.observers.enable :activity_observer do
-        @merge_request = Factory :merge_request, project: project
+        @merge_request = create(:merge_request, project: project)
         @event = Event.last
       end
     end
@@ -21,10 +21,10 @@ describe ActivityObserver do
     it { @event.target.should == @merge_request }
   end
 
-  describe "Issue created" do 
+  describe "Issue created" do
     before do
       Issue.observers.enable :activity_observer do
-        @issue = Factory :issue, project: project
+        @issue = create(:issue, project: project)
         @event = Event.last
       end
     end
@@ -34,10 +34,10 @@ describe ActivityObserver do
     it { @event.target.should == @issue }
   end
 
-  #describe "Issue commented" do 
-    #before do 
-      #@issue = Factory :issue, project: project
-      #@note = Factory :note, noteable: @issue, project: project
+  #describe "Issue commented" do
+    #before do
+      #@issue = create(:issue, project: project)
+      #@note = create(:note, noteable: @issue, project: project)
       #@event = Event.last
     #end
 

spec/observers/issue_observer_spec.rb

@@ -16,7 +16,7 @@ describe IssueObserver do
       subject.should_receive(:after_create)
 
       Issue.observers.enable :issue_observer do
-        Factory.create(:issue, project: Factory.create(:project))
+        create(:issue, project: create(:project))
       end
     end
 
@@ -43,7 +43,7 @@ describe IssueObserver do
     end
 
     it 'is called when an issue is changed' do
-      changed = Factory.create(:issue, project: Factory.create(:project))
+      changed = create(:issue, project: create(:project))
       subject.should_receive(:after_update)
 
       Issue.observers.enable :issue_observer do

spec/observers/merge_request_observer_spec.rb

@@ -16,7 +16,7 @@ describe MergeRequestObserver do
       subject.should_receive(:after_create)
 
       MergeRequest.observers.enable :merge_request_observer do
-        Factory.create(:merge_request, project: Factory.create(:project))
+        create(:merge_request, project: create(:project))
       end
     end
 
@@ -43,7 +43,7 @@ describe MergeRequestObserver do
     end
 
     it 'is called when a merge request is changed' do
-      changed = Factory.create(:merge_request, project: Factory.create(:project))
+      changed = create(:merge_request, project: create(:project))
       subject.should_receive(:after_update)
 
       MergeRequest.observers.enable :merge_request_observer do

spec/observers/note_observer_spec.rb

@@ -13,7 +13,7 @@ describe NoteObserver do
       subject.should_receive :after_create
 
       Note.observers.enable :note_observer do
-        Factory.create(:note)
+        create(:note)
       end
     end
 

spec/observers/user_observer_spec.rb

@@ -4,7 +4,7 @@ describe UserObserver do
   subject { UserObserver.instance }
 
   it 'calls #after_create when new users are created' do
-    new_user = Factory.new(:user)
+    new_user = build(:user)
     subject.should_receive(:after_create).with(new_user)
 
     User.observers.enable :user_observer do

spec/observers/users_project_observer_spec.rb

@@ -1,13 +1,13 @@
 require 'spec_helper'
 
 describe UsersProjectObserver do
-  let(:user) { Factory.create :user }
-  let(:project) { Factory.create(:project, 
-                                 code: "Fuu", 
-                                 path: "Fuu" ) }
-  let(:users_project) { Factory.create(:users_project,
-                                        project: project,
-                                        user: user )}
+  let(:user) { create(:user) }
+  let(:project) { create(:project,
+                         code: "Fuu",
+                         path: "Fuu" ) }
+  let(:users_project) { create(:users_project,
+                               project: project,
+                               user: user )}
   subject { UsersProjectObserver.instance }
 
   describe "#after_commit" do