fat_free_crm 0.17.3 → 0.18.0

data/spec/controllers/entities/opportunities_controller_spec.rb

@@ -26,7 +26,7 @@ describe OpportunitiesController do
     end
 
     it "should expose all opportunities as @opportunities and render [index] template" do
-      @opportunities = [FactoryGirl.create(:opportunity, user: current_user)]
+      @opportunities = [create(:opportunity, user: current_user)]
 
       get :index
       expect(assigns[:opportunities]).to eq(@opportunities)
@@ -42,11 +42,11 @@ describe OpportunitiesController do
     it "should filter out opportunities by stage" do
       controller.session[:opportunities_filter] = "prospecting,negotiation"
       @opportunities = [
-        FactoryGirl.create(:opportunity, user: current_user, stage: "negotiation"),
-        FactoryGirl.create(:opportunity, user: current_user, stage: "prospecting")
+        create(:opportunity, user: current_user, stage: "negotiation"),
+        create(:opportunity, user: current_user, stage: "prospecting")
       ]
       # This one should be filtered out.
-      FactoryGirl.create(:opportunity, user: current_user, stage: "analysis")
+      create(:opportunity, user: current_user, stage: "analysis")
 
       get :index
       # Note: can't compare opportunities directly because of BigDecimal objects.
@@ -55,8 +55,8 @@ describe OpportunitiesController do
     end
 
     it "should perform lookup using query string" do
-      @first  = FactoryGirl.create(:opportunity, user: current_user, name: "The first one")
-      @second = FactoryGirl.create(:opportunity, user: current_user, name: "The second one")
+      @first  = create(:opportunity, user: current_user, name: "The first one")
+      @second = create(:opportunity, user: current_user, name: "The second one")
 
       get :index, params: { query: "second" }
       expect(assigns[:opportunities]).to eq([@second])
@@ -66,7 +66,7 @@ describe OpportunitiesController do
 
     describe "AJAX pagination" do
       it "should pick up page number from params" do
-        @opportunities = [FactoryGirl.create(:opportunity, user: current_user)]
+        @opportunities = [create(:opportunity, user: current_user)]
         get :index, params: { page: 42 }, xhr: true
 
         expect(assigns[:current_page].to_i).to eq(42)
@@ -77,7 +77,7 @@ describe OpportunitiesController do
 
       it "should pick up saved page number from session" do
         session[:opportunities_current_page] = 42
-        @opportunities = [FactoryGirl.create(:opportunity, user: current_user)]
+        @opportunities = [create(:opportunity, user: current_user)]
         get :index, xhr: true
 
         expect(assigns[:current_page]).to eq(42)
@@ -88,7 +88,7 @@ describe OpportunitiesController do
       it "should reset current_page when query is altered" do
         session[:opportunities_current_page] = 42
         session[:opportunities_current_query] = "bill"
-        @opportunities = [FactoryGirl.create(:opportunity, user: current_user)]
+        @opportunities = [create(:opportunity, user: current_user)]
         get :index, xhr: true
 
         expect(assigns[:current_page]).to eq(1)
@@ -137,7 +137,7 @@ describe OpportunitiesController do
   describe "responding to GET show" do
     describe "with mime type of HTML" do
       before do
-        @opportunity = FactoryGirl.create(:opportunity, id: 42)
+        @opportunity = create(:opportunity, id: 42)
         @stage = Setting.unroll(:opportunity_stage)
         @comment = Comment.new
       end
@@ -158,7 +158,7 @@ describe OpportunitiesController do
 
     describe "with mime type of JSON" do
       it "should render the requested opportunity as JSON" do
-        @opportunity = FactoryGirl.create(:opportunity, id: 42)
+        @opportunity = create(:opportunity, id: 42)
         expect(Opportunity).to receive(:find).and_return(@opportunity)
         expect(@opportunity).to receive(:to_json).and_return("generated JSON")
 
@@ -170,7 +170,7 @@ describe OpportunitiesController do
 
     describe "with mime type of XML" do
       it "should render the requested opportunity as xml" do
-        @opportunity = FactoryGirl.create(:opportunity, id: 42)
+        @opportunity = create(:opportunity, id: 42)
         expect(Opportunity).to receive(:find).and_return(@opportunity)
         expect(@opportunity).to receive(:to_xml).and_return("generated XML")
 
@@ -182,7 +182,7 @@ describe OpportunitiesController do
 
     describe "opportunity got deleted or otherwise unavailable" do
       it "should redirect to opportunity index if the opportunity got deleted" do
-        @opportunity = FactoryGirl.create(:opportunity, user: current_user)
+        @opportunity = create(:opportunity, user: current_user)
         @opportunity.destroy
 
         get :show, params: { id: @opportunity.id }
@@ -191,7 +191,7 @@ describe OpportunitiesController do
       end
 
       it "should redirect to opportunity index if the opportunity is protected" do
-        @private = FactoryGirl.create(:opportunity, user: FactoryGirl.create(:user), access: "Private")
+        @private = create(:opportunity, user: create(:user), access: "Private")
 
         get :show, params: { id: @private.id }
         expect(flash[:warning]).not_to eq(nil)
@@ -199,7 +199,7 @@ describe OpportunitiesController do
       end
 
       it "should return 404 (Not Found) JSON error" do
-        @opportunity = FactoryGirl.create(:opportunity, user: current_user)
+        @opportunity = create(:opportunity, user: current_user)
         @opportunity.destroy
         request.env["HTTP_ACCEPT"] = "application/json"
 
@@ -208,7 +208,7 @@ describe OpportunitiesController do
       end
 
       it "should return 404 (Not Found) XML error" do
-        @opportunity = FactoryGirl.create(:opportunity, user: current_user)
+        @opportunity = create(:opportunity, user: current_user)
         @opportunity.destroy
         request.env["HTTP_ACCEPT"] = "application/xml"
 
@@ -225,7 +225,7 @@ describe OpportunitiesController do
     it "should expose a new opportunity as @opportunity and render [new] template" do
       @opportunity = Opportunity.new(user: current_user, access: Setting.default_access, stage: "prospecting")
       @account = Account.new(user: current_user, access: Setting.default_access)
-      @accounts = [FactoryGirl.create(:account, user: current_user)]
+      @accounts = [create(:account, user: current_user)]
 
       get :new, xhr: true
       expect(assigns[:opportunity].attributes).to eq(@opportunity.attributes)
@@ -235,7 +235,7 @@ describe OpportunitiesController do
     end
 
     it "should created an instance of related object when necessary" do
-      @contact = FactoryGirl.create(:contact, id: 42)
+      @contact = create(:contact, id: 42)
 
       get :new, params: { related: "contact_42" }, xhr: true
       expect(assigns[:contact]).to eq(@contact)
@@ -243,7 +243,7 @@ describe OpportunitiesController do
 
     describe "(when creating related opportunity)" do
       it "should redirect to parent asset's index page with the message if parent asset got deleted" do
-        @account = FactoryGirl.create(:account)
+        @account = create(:account)
         @account.destroy
 
         get :new, params: { related: "account_#{@account.id}" }, xhr: true
@@ -252,7 +252,7 @@ describe OpportunitiesController do
       end
 
       it "should redirect to parent asset's index page with the message if parent asset got protected" do
-        @account = FactoryGirl.create(:account, access: "Private")
+        @account = create(:account, access: "Private")
 
         get :new, params: { related: "account_#{@account.id}" }, xhr: true
         expect(flash[:warning]).not_to eq(nil)
@@ -267,9 +267,9 @@ describe OpportunitiesController do
     it "should expose the requested opportunity as @opportunity and render [edit] template" do
       # Note: campaign => nil makes sure campaign factory is not invoked which has a side
       # effect of creating an extra (campaign) user.
-      @account = FactoryGirl.create(:account, user: current_user)
-      @opportunity = FactoryGirl.create(:opportunity, id: 42, user: current_user, campaign: nil,
-                                                      account: @account)
+      @account = create(:account, user: current_user)
+      @opportunity = create(:opportunity, id: 42, user: current_user, campaign: nil,
+                                          account: @account)
       @stage = Setting.unroll(:opportunity_stage)
       @accounts = [@account]
 
@@ -284,8 +284,8 @@ describe OpportunitiesController do
     end
 
     it "should expose previous opportunity as @previous when necessary" do
-      @opportunity = FactoryGirl.create(:opportunity, id: 42)
-      @previous = FactoryGirl.create(:opportunity, id: 41)
+      @opportunity = create(:opportunity, id: 42)
+      @previous = create(:opportunity, id: 41)
 
       get :edit, params: { id: 42, previous: 41 }, xhr: true
       expect(assigns[:previous]).to eq(@previous)
@@ -293,7 +293,7 @@ describe OpportunitiesController do
 
     describe "opportunity got deleted or is otherwise unavailable" do
       it "should reload current page with the flash message if the opportunity got deleted" do
-        @opportunity = FactoryGirl.create(:opportunity, user: current_user)
+        @opportunity = create(:opportunity, user: current_user)
         @opportunity.destroy
 
         get :edit, params: { id: @opportunity.id }, xhr: true
@@ -302,7 +302,7 @@ describe OpportunitiesController do
       end
 
       it "should reload current page with the flash message if the opportunity is protected" do
-        @private = FactoryGirl.create(:opportunity, user: FactoryGirl.create(:user), access: "Private")
+        @private = create(:opportunity, user: create(:user), access: "Private")
 
         get :edit, params: { id: @private.id }, xhr: true
         expect(flash[:warning]).not_to eq(nil)
@@ -312,8 +312,8 @@ describe OpportunitiesController do
 
     describe "(previous opportunity got deleted or is otherwise unavailable)" do
       before do
-        @opportunity = FactoryGirl.create(:opportunity, user: current_user)
-        @previous = FactoryGirl.create(:opportunity, user: FactoryGirl.create(:user))
+        @opportunity = create(:opportunity, user: current_user)
+        @previous = create(:opportunity, user: create(:user))
       end
 
       it "should notify the view if previous opportunity got deleted" do
@@ -342,7 +342,7 @@ describe OpportunitiesController do
   describe "responding to POST create" do
     describe "with valid params" do
       before do
-        @opportunity = FactoryGirl.build(:opportunity, user: current_user)
+        @opportunity = build(:opportunity, user: current_user)
         allow(Opportunity).to receive(:new).and_return(@opportunity)
         @stage = Setting.unroll(:opportunity_stage)
       end
@@ -362,7 +362,7 @@ describe OpportunitiesController do
       end
 
       it "should find related account if called from account landing page" do
-        @account = FactoryGirl.create(:account, user: current_user)
+        @account = create(:account, user: current_user)
         request.env["HTTP_REFERER"] = "http://localhost/accounts/#{@account.id}"
 
         post :create, params: { opportunity: { name: "Hello" }, account: { id: @account.id } }, xhr: true
@@ -370,7 +370,7 @@ describe OpportunitiesController do
       end
 
       it "should find related campaign if called from campaign landing page" do
-        @campaign = FactoryGirl.create(:campaign, user: current_user)
+        @campaign = create(:campaign, user: current_user)
         request.env["HTTP_REFERER"] = "http://localhost/campaigns/#{@campaign.id}"
 
         post :create, params: { opportunity: { name: "Hello" }, campaign: @campaign.id, account: { name: "Hello again" } }, xhr: true
@@ -384,7 +384,7 @@ describe OpportunitiesController do
       end
 
       it "should associate opportunity with the campaign when called from campaign landing page" do
-        @campaign = FactoryGirl.create(:campaign)
+        @campaign = create(:campaign)
 
         request.env["HTTP_REFERER"] = "http://localhost/campaigns/#{@campaign.id}"
         post :create, params: { opportunity: { name: "Hello" }, campaign: @campaign.id, account: { name: "Test Account" } }, xhr: true
@@ -394,7 +394,7 @@ describe OpportunitiesController do
       end
 
       it "should associate opportunity with the contact when called from contact landing page" do
-        @contact = FactoryGirl.create(:contact, id: 42)
+        @contact = create(:contact, id: 42)
 
         request.env["HTTP_REFERER"] = "http://localhost/contacts/42"
         post :create, params: { opportunity: { name: "Hello" }, contact: 42, account: { name: "Hello again" } }, xhr: true
@@ -410,7 +410,7 @@ describe OpportunitiesController do
       end
 
       it "should associate opportunity with the existing account" do
-        @account = FactoryGirl.create(:account, id: 42)
+        @account = create(:account, id: 42)
 
         post :create, params: { opportunity: { name: "Hello world" }, account: { id: 42 } }, xhr: true
         expect(assigns(:opportunity)).to eq(@opportunity)
@@ -419,8 +419,8 @@ describe OpportunitiesController do
       end
 
       it "should update related campaign revenue if won" do
-        @campaign = FactoryGirl.create(:campaign, revenue: 0)
-        @opportunity = FactoryGirl.build(:opportunity, user: current_user, stage: "won", amount: 1100, discount: 100)
+        @campaign = create(:campaign, revenue: 0)
+        @opportunity = build(:opportunity, user: current_user, stage: "won", amount: 1100, discount: 100)
         allow(Opportunity).to receive(:new).and_return(@opportunity)
 
         post :create, params: { opportunity: { name: "Hello world" }, campaign: @campaign.id, account: { name: "Test Account" } }, xhr: true
@@ -430,7 +430,7 @@ describe OpportunitiesController do
       end
 
       it "should add a new comment to the newly created opportunity when specified" do
-        @opportunity = FactoryGirl.build(:opportunity, user: current_user)
+        @opportunity = build(:opportunity, user: current_user)
         allow(Opportunity).to receive(:new).and_return(@opportunity)
 
         post :create, params: { opportunity: { name: "Opportunity Knocks" }, account: { name: "My Account" }, comment_body: "Awesome comment is awesome" }, xhr: true
@@ -441,11 +441,11 @@ describe OpportunitiesController do
     describe "with invalid params" do
       it "should expose a newly created but unsaved opportunity as @opportunity with blank @account and render [create] template" do
         @account = Account.new(user: current_user)
-        @opportunity = FactoryGirl.build(:opportunity, name: nil, campaign: nil, user: current_user,
-                                                       account: @account)
+        @opportunity = build(:opportunity, name: nil, campaign: nil, user: current_user,
+                                           account: @account)
         allow(Opportunity).to receive(:new).and_return(@opportunity)
         @stage = Setting.unroll(:opportunity_stage)
-        @accounts = [FactoryGirl.create(:account, user: current_user)]
+        @accounts = [create(:account, user: current_user)]
 
         # Expect to redraw [create] form with blank account.
         post :create, params: { opportunity: {}, account: { user_id: current_user.id } }, xhr: true
@@ -456,9 +456,9 @@ describe OpportunitiesController do
       end
 
       it "should expose a newly created but unsaved opportunity as @opportunity with existing @account and render [create] template" do
-        @account = FactoryGirl.create(:account, id: 42, user: current_user)
-        @opportunity = FactoryGirl.build(:opportunity, name: nil, campaign: nil, user: current_user,
-                                                       account: @account)
+        @account = create(:account, id: 42, user: current_user)
+        @opportunity = build(:opportunity, name: nil, campaign: nil, user: current_user,
+                                           account: @account)
         allow(Opportunity).to receive(:new).and_return(@opportunity)
         @stage = Setting.unroll(:opportunity_stage)
 
@@ -471,7 +471,7 @@ describe OpportunitiesController do
       end
 
       it "should preserve the campaign when called from campaign landing page" do
-        @campaign = FactoryGirl.create(:campaign, id: 42)
+        @campaign = create(:campaign, id: 42)
 
         request.env["HTTP_REFERER"] = "http://localhost/campaigns/42"
         post :create, params: { opportunity: { name: nil }, campaign: 42, account: { name: "Test Account" } }, xhr: true
@@ -480,7 +480,7 @@ describe OpportunitiesController do
       end
 
       it "should preserve the contact when called from contact landing page" do
-        @contact = FactoryGirl.create(:contact, id: 42)
+        @contact = create(:contact, id: 42)
 
         request.env["HTTP_REFERER"] = "http://localhost/contacts/42"
         post :create, params: { opportunity: { name: nil }, contact: 42, account: { name: "Test Account" } }, xhr: true
@@ -496,7 +496,7 @@ describe OpportunitiesController do
   describe "responding to PUT update" do
     describe "with valid params" do
       it "should update the requested opportunity, expose it as @opportunity, and render [update] template" do
-        @opportunity = FactoryGirl.create(:opportunity, id: 42)
+        @opportunity = create(:opportunity, id: 42)
         @stage = Setting.unroll(:opportunity_stage)
 
         put :update, params: { id: 42, opportunity: { name: "Hello world" }, account: { name: "Test Account" } }, xhr: true
@@ -508,7 +508,7 @@ describe OpportunitiesController do
       end
 
       it "should get sidebar data if called from opportunities index" do
-        @opportunity = FactoryGirl.create(:opportunity, id: 42)
+        @opportunity = create(:opportunity, id: 42)
 
         request.env["HTTP_REFERER"] = "http://localhost/opportunities"
         put :update, params: { id: 42, opportunity: { name: "Hello world" }, account: { name: "Test Account" } }, xhr: true
@@ -516,8 +516,8 @@ describe OpportunitiesController do
       end
 
       it "should find related account if called from account landing page" do
-        @account = FactoryGirl.create(:account, user: current_user)
-        @opportunity = FactoryGirl.create(:opportunity, id: 42, account: @account)
+        @account = create(:account, user: current_user)
+        @opportunity = create(:opportunity, id: 42, account: @account)
         request.env["HTTP_REFERER"] = "http://localhost/accounts/#{@account.id}"
 
         put :update, params: { id: 42, opportunity: { name: "Hello world" } }, xhr: true
@@ -525,8 +525,8 @@ describe OpportunitiesController do
       end
 
       it "should remove related account if blank :account param is given" do
-        @account = FactoryGirl.create(:account, user: current_user)
-        @opportunity = FactoryGirl.create(:opportunity, id: 42, account: @account)
+        @account = create(:account, user: current_user)
+        @opportunity = create(:opportunity, id: 42, account: @account)
         request.env["HTTP_REFERER"] = "http://localhost/accounts/#{@account.id}"
 
         put :update, params: { id: 42, opportunity: { name: "Hello world" }, account: { id: "" } }, xhr: true
@@ -534,8 +534,8 @@ describe OpportunitiesController do
       end
 
       it "should find related campaign if called from campaign landing page" do
-        @campaign = FactoryGirl.create(:campaign, user: current_user)
-        @opportunity = FactoryGirl.create(:opportunity, id: 42, user: current_user)
+        @campaign = create(:campaign, user: current_user)
+        @opportunity = create(:opportunity, id: 42, user: current_user)
         @campaign.opportunities << @opportunity
         request.env["HTTP_REFERER"] = "http://localhost/campaigns/#{@campaign.id}"
 
@@ -544,7 +544,7 @@ describe OpportunitiesController do
       end
 
       it "should be able to create an account and associate it with updated opportunity" do
-        @opportunity = FactoryGirl.create(:opportunity, id: 42)
+        @opportunity = create(:opportunity, id: 42)
 
         put :update, params: { id: 42, opportunity: { name: "Hello" }, account: { name: "new account" } }, xhr: true
         expect(assigns[:opportunity]).to eq(@opportunity)
@@ -553,9 +553,9 @@ describe OpportunitiesController do
       end
 
       it "should be able to create an account and associate it with updated opportunity" do
-        @old_account = FactoryGirl.create(:account, id: 111)
-        @new_account = FactoryGirl.create(:account, id: 999)
-        @opportunity = FactoryGirl.create(:opportunity, id: 42, account: @old_account)
+        @old_account = create(:account, id: 111)
+        @new_account = create(:account, id: 999)
+        @opportunity = create(:opportunity, id: 42, account: @old_account)
 
         put :update, params: { id: 42, opportunity: { name: "Hello" }, account: { id: 999 } }, xhr: true
         expect(assigns[:opportunity]).to eq(@opportunity)
@@ -563,7 +563,7 @@ describe OpportunitiesController do
       end
 
       it "should update opportunity permissions when sharing with specific users" do
-        @opportunity = FactoryGirl.create(:opportunity, id: 42, access: "Public")
+        @opportunity = create(:opportunity, id: 42, access: "Public")
 
         put :update, params: { id: 42, opportunity: { name: "Hello", access: "Shared", user_ids: [7, 8] }, account: { name: "Test Account" } }, xhr: true
         expect(assigns[:opportunity].access).to eq("Shared")
@@ -571,8 +571,8 @@ describe OpportunitiesController do
       end
 
       it "should reload opportunity campaign if called from campaign landing page" do
-        @campaign = FactoryGirl.create(:campaign)
-        @opportunity = FactoryGirl.create(:opportunity, campaign: @campaign)
+        @campaign = create(:campaign)
+        @opportunity = create(:opportunity, campaign: @campaign)
 
         request.env["HTTP_REFERER"] = "http://localhost/campaigns/#{@campaign.id}"
         put :update, params: { id: @opportunity.id, opportunity: { name: "Hello" }, account: { name: "Test Account" } }, xhr: true
@@ -581,16 +581,16 @@ describe OpportunitiesController do
 
       describe "updating campaign revenue (same campaign)" do
         it "should add to actual revenue when opportunity is closed/won" do
-          @campaign = FactoryGirl.create(:campaign, revenue: 1000)
-          @opportunity = FactoryGirl.create(:opportunity, campaign: @campaign, stage: 'prospecting', amount: 1100, discount: 100)
+          @campaign = create(:campaign, revenue: 1000)
+          @opportunity = create(:opportunity, campaign: @campaign, stage: 'prospecting', amount: 1100, discount: 100)
 
           put :update, params: { id: @opportunity, opportunity: { stage: "won" }, account: { name: "Test Account" } }, xhr: true
           expect(@campaign.reload.revenue.to_i).to eq(2000) # 1000 -> 2000
         end
 
         it "should substract from actual revenue when opportunity is no longer closed/won" do
-          @campaign = FactoryGirl.create(:campaign, revenue: 1000)
-          @opportunity = FactoryGirl.create(:opportunity, campaign: @campaign, stage: "won", amount: 1100, discount: 100)
+          @campaign = create(:campaign, revenue: 1000)
+          @opportunity = create(:opportunity, campaign: @campaign, stage: "won", amount: 1100, discount: 100)
           # @campaign.revenue is now $2000 since we created winning opportunity.
 
           put :update, params: { id: @opportunity, opportunity: { stage: 'prospecting' }, account: { name: "Test Account" } }, xhr: true
@@ -598,8 +598,8 @@ describe OpportunitiesController do
         end
 
         it "should not update actual revenue when opportunity is not closed/won" do
-          @campaign = FactoryGirl.create(:campaign, revenue: 1000)
-          @opportunity = FactoryGirl.create(:opportunity, campaign: @campaign, stage: 'prospecting', amount: 1100, discount: 100)
+          @campaign = create(:campaign, revenue: 1000)
+          @opportunity = create(:opportunity, campaign: @campaign, stage: 'prospecting', amount: 1100, discount: 100)
 
           put :update, params: { id: @opportunity, opportunity: { stage: "lost" }, account: { name: "Test Account" } }, xhr: true
           expect(@campaign.reload.revenue.to_i).to eq(1000) # Stays the same.
@@ -608,8 +608,8 @@ describe OpportunitiesController do
 
       describe "updating campaign revenue (diferent campaigns)" do
         it "should update newly assigned campaign when opportunity is closed/won" do
-          @campaigns = { old: FactoryGirl.create(:campaign, revenue: 1000), new: FactoryGirl.create(:campaign, revenue: 1000) }
-          @opportunity = FactoryGirl.create(:opportunity, campaign: @campaigns[:old], stage: 'prospecting', amount: 1100, discount: 100)
+          @campaigns = { old: create(:campaign, revenue: 1000), new: create(:campaign, revenue: 1000) }
+          @opportunity = create(:opportunity, campaign: @campaigns[:old], stage: 'prospecting', amount: 1100, discount: 100)
 
           put :update, params: { id: @opportunity, opportunity: { stage: "won", campaign_id: @campaigns[:new].id }, account: { name: "Test Account" } }, xhr: true
 
@@ -618,8 +618,8 @@ describe OpportunitiesController do
         end
 
         it "should update old campaign when opportunity is no longer closed/won" do
-          @campaigns = { old: FactoryGirl.create(:campaign, revenue: 1000), new: FactoryGirl.create(:campaign, revenue: 1000) }
-          @opportunity = FactoryGirl.create(:opportunity, campaign: @campaigns[:old], stage: "won", amount: 1100, discount: 100)
+          @campaigns = { old: create(:campaign, revenue: 1000), new: create(:campaign, revenue: 1000) }
+          @opportunity = create(:opportunity, campaign: @campaigns[:old], stage: "won", amount: 1100, discount: 100)
           # @campaign.revenue is now $2000 since we created winning opportunity.
 
           put :update, params: { id: @opportunity, opportunity: { stage: 'prospecting', campaign_id: @campaigns[:new].id }, account: { name: "Test Account" } }, xhr: true
@@ -628,8 +628,8 @@ describe OpportunitiesController do
         end
 
         it "should not update campaigns when opportunity is not closed/won" do
-          @campaigns = { old: FactoryGirl.create(:campaign, revenue: 1000), new: FactoryGirl.create(:campaign, revenue: 1000) }
-          @opportunity = FactoryGirl.create(:opportunity, campaign: @campaigns[:old], stage: 'prospecting', amount: 1100, discount: 100)
+          @campaigns = { old: create(:campaign, revenue: 1000), new: create(:campaign, revenue: 1000) }
+          @opportunity = create(:opportunity, campaign: @campaigns[:old], stage: 'prospecting', amount: 1100, discount: 100)
 
           put :update, params: { id: @opportunity, opportunity: { stage: "lost", campaign_id: @campaigns[:new].id }, account: { name: "Test Account" } }, xhr: true
           expect(@campaigns[:old].reload.revenue.to_i).to eq(1000) # Stays the same.
@@ -639,7 +639,7 @@ describe OpportunitiesController do
 
       describe "opportunity got deleted or otherwise unavailable" do
         it "should reload current page with the flash message if the opportunity got deleted" do
-          @opportunity = FactoryGirl.create(:opportunity, user: current_user)
+          @opportunity = create(:opportunity, user: current_user)
           @opportunity.destroy
 
           put :update, params: { id: @opportunity.id }, xhr: true
@@ -648,7 +648,7 @@ describe OpportunitiesController do
         end
 
         it "should reload current page with the flash message if the opportunity is protected" do
-          @private = FactoryGirl.create(:opportunity, user: FactoryGirl.create(:user), access: "Private")
+          @private = create(:opportunity, user: create(:user), access: "Private")
 
           put :update, params: { id: @private.id }, xhr: true
           expect(flash[:warning]).not_to eq(nil)
@@ -659,7 +659,7 @@ describe OpportunitiesController do
 
     describe "with invalid params" do
       it "should not update the requested opportunity but still expose it as @opportunity, and render [update] template" do
-        @opportunity = FactoryGirl.create(:opportunity, id: 42, name: "Hello people")
+        @opportunity = create(:opportunity, id: 42, name: "Hello people")
 
         put :update, params: { id: 42, opportunity: { name: nil }, account: { name: "Test Account" } }, xhr: true
         expect(@opportunity.reload.name).to eq("Hello people")
@@ -669,9 +669,9 @@ describe OpportunitiesController do
       end
 
       it "should expose existing account as @account if selected" do
-        @account = FactoryGirl.create(:account, id: 99)
-        @opportunity = FactoryGirl.create(:opportunity, id: 42)
-        FactoryGirl.create(:account_opportunity, account: @account, opportunity: @opportunity)
+        @account = create(:account, id: 99)
+        @opportunity = create(:opportunity, id: 42)
+        create(:account_opportunity, account: @account, opportunity: @opportunity)
 
         put :update, params: { id: 42, opportunity: { name: nil }, account: { id: 99 } }, xhr: true
         expect(assigns(:account)).to eq(@account)
@@ -684,7 +684,7 @@ describe OpportunitiesController do
   #----------------------------------------------------------------------------
   describe "responding to DELETE destroy" do
     before do
-      @opportunity = FactoryGirl.create(:opportunity, user: current_user)
+      @opportunity = create(:opportunity, user: current_user)
     end
 
     describe "AJAX request" do
@@ -733,8 +733,8 @@ describe OpportunitiesController do
         end
 
         it "should reload campaiign to be able to refresh its summary" do
-          @account = FactoryGirl.create(:account)
-          @opportunity = FactoryGirl.create(:opportunity, user: current_user, account: @account)
+          @account = create(:account)
+          @opportunity = create(:opportunity, user: current_user, account: @account)
           request.env["HTTP_REFERER"] = "http://localhost/accounts/#{@account.id}"
 
           delete :destroy, params: { id: @opportunity.id }, xhr: true
@@ -743,8 +743,8 @@ describe OpportunitiesController do
         end
 
         it "should reload campaiign to be able to refresh its summary" do
-          @campaign = FactoryGirl.create(:campaign)
-          @opportunity = FactoryGirl.create(:opportunity, user: current_user, campaign: @campaign)
+          @campaign = create(:campaign)
+          @opportunity = create(:opportunity, user: current_user, campaign: @campaign)
           request.env["HTTP_REFERER"] = "http://localhost/campaigns/#{@campaign.id}"
 
           delete :destroy, params: { id: @opportunity.id }, xhr: true
@@ -755,7 +755,7 @@ describe OpportunitiesController do
 
       describe "opportunity got deleted or otherwise unavailable" do
         it "should reload current page is the opportunity got deleted" do
-          @opportunity = FactoryGirl.create(:opportunity, user: current_user)
+          @opportunity = create(:opportunity, user: current_user)
           @opportunity.destroy
 
           delete :destroy, params: { id: @opportunity.id }, xhr: true
@@ -764,7 +764,7 @@ describe OpportunitiesController do
         end
 
         it "should reload current page with the flash message if the opportunity is protected" do
-          @private = FactoryGirl.create(:opportunity, user: FactoryGirl.create(:user), access: "Private")
+          @private = create(:opportunity, user: create(:user), access: "Private")
 
           delete :destroy, params: { id: @private.id }, xhr: true
           expect(flash[:warning]).not_to eq(nil)
@@ -781,7 +781,7 @@ describe OpportunitiesController do
       end
 
       it "should redirect to opportunity index with the flash message is the opportunity got deleted" do
-        @opportunity = FactoryGirl.create(:opportunity, user: current_user)
+        @opportunity = create(:opportunity, user: current_user)
         @opportunity.destroy
 
         delete :destroy, params: { id: @opportunity.id }
@@ -790,7 +790,7 @@ describe OpportunitiesController do
       end
 
       it "should redirect to opportunity index with the flash message if the opportunity is protected" do
-        @private = FactoryGirl.create(:opportunity, user: FactoryGirl.create(:user), access: "Private")
+        @private = create(:opportunity, user: create(:user), access: "Private")
 
         delete :destroy, params: { id: @private.id }
         expect(flash[:warning]).not_to eq(nil)
@@ -805,16 +805,16 @@ describe OpportunitiesController do
   describe "responding to PUT attach" do
     describe "tasks" do
       before do
-        @model = FactoryGirl.create(:opportunity)
-        @attachment = FactoryGirl.create(:task, asset: nil)
+        @model = create(:opportunity)
+        @attachment = create(:task, asset: nil)
       end
       it_should_behave_like("attach")
     end
 
     describe "contacts" do
       before do
-        @model = FactoryGirl.create(:opportunity)
-        @attachment = FactoryGirl.create(:contact)
+        @model = create(:opportunity)
+        @attachment = create(:contact)
       end
       it_should_behave_like("attach")
     end
@@ -826,16 +826,16 @@ describe OpportunitiesController do
   describe "responding to POST discard" do
     describe "tasks" do
       before do
-        @model = FactoryGirl.create(:opportunity)
-        @attachment = FactoryGirl.create(:task, asset: @model)
+        @model = create(:opportunity)
+        @attachment = create(:task, asset: @model)
       end
       it_should_behave_like("discard")
     end
 
     describe "contacts" do
       before do
-        @attachment = FactoryGirl.create(:contact)
-        @model = FactoryGirl.create(:opportunity)
+        @attachment = create(:contact)
+        @model = create(:opportunity)
         @model.contacts << @attachment
       end
       it_should_behave_like("discard")
@@ -846,7 +846,7 @@ describe OpportunitiesController do
   #----------------------------------------------------------------------------
   describe "responding to POST auto_complete" do
     before do
-      @auto_complete_matches = [FactoryGirl.create(:opportunity, name: "Hello World", user: current_user)]
+      @auto_complete_matches = [create(:opportunity, name: "Hello World", user: current_user)]
     end
 
     it_should_behave_like("auto complete")
@@ -869,8 +869,8 @@ describe OpportunitiesController do
 
     it "should select @opportunities and render [index] template" do
       @opportunities = [
-        FactoryGirl.create(:opportunity, name: "A", user: current_user),
-        FactoryGirl.create(:opportunity, name: "B", user: current_user)
+        create(:opportunity, name: "A", user: current_user),
+        create(:opportunity, name: "B", user: current_user)
       ]
 
       get :redraw, params: { per_page: 1, sort_by: "name" }, xhr: true
@@ -884,7 +884,7 @@ describe OpportunitiesController do
   describe "responding to GET filter" do
     it "should expose filtered opportunities as @opportunity and render [filter] template" do
       session[:opportunities_filter] = "negotiation,analysis"
-      @opportunities = [FactoryGirl.create(:opportunity, stage: "prospecting", user: current_user)]
+      @opportunities = [create(:opportunity, stage: "prospecting", user: current_user)]
       @stage = Setting.unroll(:opportunity_stage)
 
       get :filter, params: { stage: "prospecting" }, xhr: true