fat_free_crm 0.17.3 → 0.18.0

data/spec/controllers/home_controller_spec.rb

@@ -16,14 +16,14 @@ describe HomeController do
     end
 
     it "should get a list of activities" do
-      activity = FactoryGirl.create(:version, item: FactoryGirl.create(:account, user: current_user))
+      activity = create(:version, item: create(:account, user: current_user))
       expect(controller).to receive(:get_activities).once.and_return([activity])
       get :index
       expect(assigns[:activities]).to eq([activity])
     end
 
     it "should not include views in the list of activities" do
-      FactoryGirl.create(:version, item: FactoryGirl.create(:account, user: @current_user), event: "view")
+      create(:version, item: create(:account, user: @current_user), event: "view")
       expect(controller).to receive(:get_activities).once.and_return([])
 
       get :index
@@ -31,21 +31,21 @@ describe HomeController do
     end
 
     it "should get a list of my tasks ordered by due_at" do
-      task_1 = FactoryGirl.create(:task, name: "Your first task", bucket: "due_asap", assigned_to: current_user.id)
-      task_2 = FactoryGirl.create(:task, name: "Another task for you", bucket: "specific_time", calendar: 5.days.from_now.to_s, assigned_to: current_user.id)
-      task_3 = FactoryGirl.create(:task, name: "Third Task", bucket: "due_next_week", assigned_to: current_user.id)
-      task_4 = FactoryGirl.create(:task, name: "i've assigned it to myself", user: current_user, calendar: 20.days.from_now.to_s, assigned_to: nil, bucket: "specific_time")
+      task_1 = create(:task, name: "Your first task", bucket: "due_asap", assigned_to: current_user.id)
+      task_2 = create(:task, name: "Another task for you", bucket: "specific_time", calendar: 5.days.from_now.to_s, assigned_to: current_user.id)
+      task_3 = create(:task, name: "Third Task", bucket: "due_next_week", assigned_to: current_user.id)
+      task_4 = create(:task, name: "i've assigned it to myself", user: current_user, calendar: 20.days.from_now.to_s, assigned_to: nil, bucket: "specific_time")
 
-      FactoryGirl.create(:task, name: "Someone else's Task", user_id: current_user.id, bucket: "due_asap", assigned_to: FactoryGirl.create(:user).id)
-      FactoryGirl.create(:task, name: "Not my task", bucket: "due_asap", assigned_to: FactoryGirl.create(:user).id)
+      create(:task, name: "Someone else's Task", user_id: current_user.id, bucket: "due_asap", assigned_to: create(:user).id)
+      create(:task, name: "Not my task", bucket: "due_asap", assigned_to: create(:user).id)
 
       get :index
       expect(assigns[:my_tasks]).to eq([task_1, task_2, task_3, task_4])
     end
 
     it "should not display completed tasks" do
-      my_task = FactoryGirl.create(:task, user_id: current_user.id, name: "Your first task", bucket: "due_asap", assigned_to: current_user.id)
-      FactoryGirl.create(:task, user_id: current_user.id, name: "Completed task", bucket: "due_asap", completed_at: 1.days.ago, completed_by: current_user.id, assigned_to: current_user.id)
+      my_task = create(:task, user_id: current_user.id, name: "Your first task", bucket: "due_asap", assigned_to: current_user.id)
+      create(:task, user_id: current_user.id, name: "Completed task", bucket: "due_asap", completed_at: 1.days.ago, completed_by: current_user.id, assigned_to: current_user.id)
 
       get :index
 
@@ -53,26 +53,26 @@ describe HomeController do
     end
 
     it "should get a list of my opportunities ordered by closes_on" do
-      opportunity_1 = FactoryGirl.create(:opportunity, name: "Your first opportunity", closes_on: 15.days.from_now, assigned_to: current_user.id, stage: 'proposal')
-      opportunity_2 = FactoryGirl.create(:opportunity, name: "Another opportunity for you", closes_on: 10.days.from_now, assigned_to: current_user.id, stage: 'proposal')
-      opportunity_3 = FactoryGirl.create(:opportunity, name: "Third Opportunity", closes_on: 5.days.from_now, assigned_to: current_user.id, stage: 'proposal')
-      opportunity_4 = FactoryGirl.create(:opportunity, name: "Fourth Opportunity", closes_on: 50.days.from_now, assigned_to: nil, user_id: current_user.id, stage: 'proposal')
+      opportunity_1 = create(:opportunity, name: "Your first opportunity", closes_on: 15.days.from_now, assigned_to: current_user.id, stage: 'proposal')
+      opportunity_2 = create(:opportunity, name: "Another opportunity for you", closes_on: 10.days.from_now, assigned_to: current_user.id, stage: 'proposal')
+      opportunity_3 = create(:opportunity, name: "Third Opportunity", closes_on: 5.days.from_now, assigned_to: current_user.id, stage: 'proposal')
+      opportunity_4 = create(:opportunity, name: "Fourth Opportunity", closes_on: 50.days.from_now, assigned_to: nil, user_id: current_user.id, stage: 'proposal')
 
-      FactoryGirl.create(:opportunity_in_pipeline, name: "Someone else's Opportunity", assigned_to: FactoryGirl.create(:user).id, stage: 'proposal')
-      FactoryGirl.create(:opportunity_in_pipeline, name: "Not my opportunity", assigned_to: FactoryGirl.create(:user).id, stage: 'proposal')
+      create(:opportunity_in_pipeline, name: "Someone else's Opportunity", assigned_to: create(:user).id, stage: 'proposal')
+      create(:opportunity_in_pipeline, name: "Not my opportunity", assigned_to: create(:user).id, stage: 'proposal')
 
       get :index
       expect(assigns[:my_opportunities]).to eq([opportunity_3, opportunity_2, opportunity_1, opportunity_4])
     end
 
     it "should get a list of my accounts ordered by name" do
-      account_1 = FactoryGirl.create(:account, name: "Anderson", assigned_to: current_user.id)
-      account_2 = FactoryGirl.create(:account, name: "Wilson", assigned_to: current_user.id)
-      account_3 = FactoryGirl.create(:account, name: "Triple", assigned_to: current_user.id)
-      account_4 = FactoryGirl.create(:account, name: "Double", assigned_to: nil, user_id: current_user.id)
+      account_1 = create(:account, name: "Anderson", assigned_to: current_user.id)
+      account_2 = create(:account, name: "Wilson", assigned_to: current_user.id)
+      account_3 = create(:account, name: "Triple", assigned_to: current_user.id)
+      account_4 = create(:account, name: "Double", assigned_to: nil, user_id: current_user.id)
 
-      FactoryGirl.create(:account, name: "Someone else's Account", assigned_to: FactoryGirl.create(:user).id)
-      FactoryGirl.create(:account, name: "Not my account", assigned_to: FactoryGirl.create(:user).id)
+      create(:account, name: "Someone else's Account", assigned_to: create(:user).id)
+      create(:account, name: "Not my account", assigned_to: create(:user).id)
 
       get :index
       expect(assigns[:my_accounts]).to eq([account_1, account_4, account_3, account_2])
@@ -87,9 +87,9 @@ describe HomeController do
     end
 
     it "should assign instance variables for user preferences" do
-      @asset = FactoryGirl.create(:preference, user: current_user, name: "activity_asset", value: Base64.encode64(Marshal.dump("tasks")))
-      @user = FactoryGirl.create(:preference, user: current_user, name: "activity_user", value: Base64.encode64(Marshal.dump("Billy Bones")))
-      @duration = FactoryGirl.create(:preference, user: current_user, name: "activity_duration", value: Base64.encode64(Marshal.dump("two days")))
+      @asset = create(:preference, user: current_user, name: "activity_asset", value: Base64.encode64(Marshal.dump("tasks")))
+      @user = create(:preference, user: current_user, name: "activity_user", value: Base64.encode64(Marshal.dump("Billy Bones")))
+      @duration = create(:preference, user: current_user, name: "activity_duration", value: Base64.encode64(Marshal.dump("two days")))
 
       get :options, xhr: true
       expect(assigns[:asset]).to eq("tasks")
@@ -122,7 +122,7 @@ describe HomeController do
     end
 
     it "should get a list of activities" do
-      @activity = FactoryGirl.create(:version, item: FactoryGirl.create(:account, user: current_user))
+      @activity = create(:version, item: create(:account, user: current_user))
       expect(controller).to receive(:get_activities).once.and_return([@activity])
 
       get :index

data/spec/controllers/passwords_controller_spec.rb

@@ -8,7 +8,7 @@
 require 'spec_helper'
 
 describe PasswordsController do
-  let(:user) { FactoryGirl.build(:user) }
+  let(:user) { build(:user) }
 
   describe "update" do
     before(:each) do

data/spec/controllers/tasks_controller_spec.rb

@@ -24,9 +24,9 @@ describe TasksController do
       end
       hash[due] << case view
                    when "pending"
-                     FactoryGirl.create(:task, user: user, bucket: due.to_s)
+                     create(:task, user: user, bucket: due.to_s)
                    when "assigned"
-                     FactoryGirl.create(:task, user: user, bucket: due.to_s, assigned_to: 1)
+                     create(:task, user: user, bucket: due.to_s, assigned_to: 1)
                    when "completed"
                      completed_at = case due
                                     when :completed_today
@@ -40,7 +40,7 @@ describe TasksController do
                                     when :completed_last_month
                                       Date.today.beginning_of_month - 1.day
                      end
-                     FactoryGirl.create(:task, user: user, bucket: due.to_s, completed_at: completed_at)
+                     create(:task, user: user, bucket: due.to_s, completed_at: completed_at)
       end
       hash
     end
@@ -142,8 +142,8 @@ describe TasksController do
   #----------------------------------------------------------------------------
   describe "responding to GET new" do
     it "should expose a new task as @task and render [new] template" do
-      account = FactoryGirl.create(:account, user: current_user)
-      @task = FactoryGirl.build(:task, user: current_user, asset: account)
+      account = create(:account, user: current_user)
+      @task = build(:task, user: current_user, asset: account)
       allow(Task).to receive(:new).and_return(@task)
       @bucket = Setting.unroll(:task_bucket)[1..-1] << ["On Specific Date...", :specific_time]
       @category = Setting.unroll(:task_category)
@@ -156,7 +156,7 @@ describe TasksController do
     end
 
     it "should find related asset when necessary" do
-      @asset = FactoryGirl.create(:account, id: 42)
+      @asset = create(:account, id: 42)
 
       get :new, params: { related: "account_42" }, xhr: true
       expect(assigns[:asset]).to eq(@asset)
@@ -165,7 +165,7 @@ describe TasksController do
 
     describe "(when creating related task)" 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
@@ -174,7 +174,7 @@ describe TasksController 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)
@@ -187,8 +187,8 @@ describe TasksController do
   #----------------------------------------------------------------------------
   describe "responding to GET edit" do
     it "should expose the requested task as @task and render [edit] template" do
-      @asset = FactoryGirl.create(:account, user: current_user)
-      @task = FactoryGirl.create(:task, user: current_user, asset: @asset)
+      @asset = create(:account, user: current_user)
+      @task = create(:task, user: current_user, asset: @asset)
       @bucket = Setting.unroll(:task_bucket)[1..-1] << ["On Specific Date...", :specific_time]
       @category = Setting.unroll(:task_category)
 
@@ -201,8 +201,8 @@ describe TasksController do
     end
 
     it "should find previously open task when necessary" do
-      @task = FactoryGirl.create(:task, user: current_user)
-      @previous = FactoryGirl.create(:task, id: 999, user: current_user)
+      @task = create(:task, user: current_user)
+      @previous = create(:task, id: 999, user: current_user)
 
       get :edit, params: { id: @task.id, previous: 999 }, xhr: true
       expect(assigns[:task]).to eq(@task)
@@ -212,7 +212,7 @@ describe TasksController do
 
     describe "(task got deleted or reassigned)" do
       it "should reload current page with the flash message if the task got deleted" do
-        @task = FactoryGirl.create(:task, user: FactoryGirl.create(:user), assignee: current_user)
+        @task = create(:task, user: create(:user), assignee: current_user)
         @task.destroy
 
         get :edit, params: { id: @task.id }, xhr: true
@@ -221,7 +221,7 @@ describe TasksController do
       end
 
       it "should reload current page with the flash message if the task got reassigned" do
-        @task = FactoryGirl.create(:task, user: FactoryGirl.create(:user), assignee: FactoryGirl.create(:user))
+        @task = create(:task, user: create(:user), assignee: create(:user))
 
         get :edit, params: { id: @task.id }, xhr: true
         expect(flash[:warning]).not_to eq(nil)
@@ -231,8 +231,8 @@ describe TasksController do
 
     describe "(previous task got deleted or reassigned)" do
       before(:each) do
-        @task = FactoryGirl.create(:task, user: current_user)
-        @previous = FactoryGirl.create(:task, user: FactoryGirl.create(:user), assignee: current_user)
+        @task = create(:task, user: current_user)
+        @previous = create(:task, user: create(:user), assignee: current_user)
       end
 
       it "should notify the view if previous task got deleted" do
@@ -245,7 +245,7 @@ describe TasksController do
       end
 
       it "should notify the view if previous task got reassigned" do
-        @previous.update_attribute(:assignee, FactoryGirl.create(:user))
+        @previous.update_attribute(:assignee, create(:user))
 
         get :edit, params: { id: @task.id, previous: @previous.id }, xhr: true
         expect(flash[:warning]).to eq(nil)
@@ -261,7 +261,7 @@ describe TasksController do
   describe "responding to POST create" do
     describe "with valid params" do
       it "should expose a newly created task as @task and render [create] template" do
-        @task = FactoryGirl.build(:task, user: current_user)
+        @task = build(:task, user: current_user)
         allow(Task).to receive(:new).and_return(@task)
 
         post :create, params: { task: { name: "Hello world" } }, xhr: true
@@ -273,7 +273,7 @@ describe TasksController do
 
       ["", "?view=pending", "?view=assigned", "?view=completed"].each do |view|
         it "should update tasks sidebar when [create] is being called from [/tasks#{view}] page" do
-          @task = FactoryGirl.build(:task, user: current_user)
+          @task = build(:task, user: current_user)
           allow(Task).to receive(:new).and_return(@task)
 
           request.env["HTTP_REFERER"] = "http://localhost/tasks#{view}"
@@ -285,7 +285,7 @@ describe TasksController do
 
     describe "with invalid params" do
       it "should expose a newly created but unsaved task as @lead and still render [create] template" do
-        @task = FactoryGirl.build(:task, name: nil, user: current_user)
+        @task = build(:task, name: nil, user: current_user)
         allow(Task).to receive(:new).and_return(@task)
 
         post :create, params: { task: {} }, xhr: true
@@ -303,7 +303,7 @@ describe TasksController do
   describe "responding to PUT update" do
     describe "with valid params" do
       it "should update the requested task, expose it as @task, and render [update] template" do
-        @task = FactoryGirl.create(:task, name: "Hi", user: current_user)
+        @task = create(:task, name: "Hi", user: current_user)
 
         put :update, params: { id: @task.id, task: { name: "Hello" } }, xhr: true
         expect(@task.reload.name).to eq("Hello")
@@ -315,7 +315,7 @@ describe TasksController do
 
       ["", "?view=pending", "?view=assigned", "?view=completed"].each do |view|
         it "should update tasks sidebar when [update] is being called from [/tasks#{view}] page" do
-          @task = FactoryGirl.create(:task, name: "Hi", user: current_user)
+          @task = create(:task, name: "Hi", user: current_user)
 
           request.env["HTTP_REFERER"] = "http://localhost/tasks#{view}"
           put :update, params: { id: @task.id, task: { name: "Hello" } }, xhr: true
@@ -326,7 +326,7 @@ describe TasksController do
 
     describe "with invalid params" do
       it "should not update the task, but still expose it as @task and render [update] template" do
-        @task = FactoryGirl.create(:task, name: "Hi", user: current_user)
+        @task = create(:task, name: "Hi", user: current_user)
 
         put :update, params: { id: @task.id, task: { name: nil } }, xhr: true
         expect(@task.reload.name).to eq("Hi")
@@ -339,7 +339,7 @@ describe TasksController do
 
     describe "task got deleted or reassigned" do
       it "should reload current page with the flash message if the task got deleted" do
-        @task = FactoryGirl.create(:task, user: FactoryGirl.create(:user), assignee: current_user)
+        @task = create(:task, user: create(:user), assignee: current_user)
         @task.destroy
 
         put :update, params: { id: @task.id, task: { name: "Hello" } }, xhr: true
@@ -348,7 +348,7 @@ describe TasksController do
       end
 
       it "should reload current page with the flash message if the task got reassigned" do
-        @task = FactoryGirl.create(:task, user: FactoryGirl.create(:user), assignee: FactoryGirl.create(:user))
+        @task = create(:task, user: create(:user), assignee: create(:user))
 
         put :update, params: { id: @task.id, task: { name: "Hello" } }, xhr: true
         expect(flash[:warning]).not_to eq(nil)
@@ -362,7 +362,7 @@ describe TasksController do
   #----------------------------------------------------------------------------
   describe "responding to DELETE destroy" do
     it "should destroy the requested task and render [destroy] template" do
-      @task = FactoryGirl.create(:task, user: current_user)
+      @task = create(:task, user: current_user)
 
       delete :destroy, params: { id: @task.id, bucket: "due_asap" }, xhr: true
       expect(assigns(:task)).to eq(@task)
@@ -373,7 +373,7 @@ describe TasksController do
 
     ["", "?view=pending", "?view=assigned", "?view=completed"].each do |view|
       it "should update sidebar when [destroy] is being called from [/tasks#{view}]" do
-        @task = FactoryGirl.create(:task, user: current_user)
+        @task = create(:task, user: current_user)
 
         request.env["HTTP_REFERER"] = "http://localhost/tasks#{view}"
         delete :destroy, params: { id: @task.id, bucket: "due_asap" }, xhr: true
@@ -382,7 +382,7 @@ describe TasksController do
     end
 
     it "should not update sidebar when [destroy] is being called from asset page" do
-      @task = FactoryGirl.create(:task, user: current_user)
+      @task = create(:task, user: current_user)
 
       delete :destroy, params: { id: @task.id }, xhr: true
       expect(assigns[:task_total]).to eq(nil)
@@ -390,7 +390,7 @@ describe TasksController do
 
     describe "task got deleted or reassigned" do
       it "should reload current page with the flash message if the task got deleted" do
-        @task = FactoryGirl.create(:task, user: FactoryGirl.create(:user), assignee: current_user)
+        @task = create(:task, user: create(:user), assignee: current_user)
         @task.destroy
 
         delete :destroy, params: { id: @task.id }, xhr: true
@@ -399,7 +399,7 @@ describe TasksController do
       end
 
       it "should reload current page with the flash message if the task got reassigned" do
-        @task = FactoryGirl.create(:task, user: FactoryGirl.create(:user), assignee: FactoryGirl.create(:user))
+        @task = create(:task, user: create(:user), assignee: create(:user))
 
         delete :destroy, params: { id: @task.id }, xhr: true
         expect(flash[:warning]).not_to eq(nil)
@@ -413,7 +413,7 @@ describe TasksController do
   #----------------------------------------------------------------------------
   describe "responding to PUT complete" do
     it "should change task status, expose task as @task, and render [complete] template" do
-      @task = FactoryGirl.create(:task, completed_at: nil, user: current_user)
+      @task = create(:task, completed_at: nil, user: current_user)
 
       put :complete, params: { id: @task.id }, xhr: true
       expect(@task.reload.completed_at).not_to eq(nil)
@@ -423,7 +423,7 @@ describe TasksController do
     end
 
     it "should change task status, expose task as @task, and render [complete] template where task.bucket = 'specific_time'" do
-      @task = FactoryGirl.create(:task, completed_at: nil, user: current_user, bucket: "specific_time", calendar: "01/01/2010 1:00 AM")
+      @task = create(:task, completed_at: nil, user: current_user, bucket: "specific_time", calendar: "01/01/2010 1:00 AM")
 
       put :complete, params: { id: @task.id }, xhr: true
       expect(@task.reload.completed_at).not_to eq(nil)
@@ -433,7 +433,7 @@ describe TasksController do
     end
 
     it "should change update tasks sidebar if bucket is not empty" do
-      @task = FactoryGirl.create(:task, completed_at: nil, user: current_user)
+      @task = create(:task, completed_at: nil, user: current_user)
 
       put :complete, params: { id: @task.id, bucket: "due_asap" }, xhr: true
       expect(assigns[:task_total]).to be_an_instance_of(HashWithIndifferentAccess)
@@ -441,7 +441,7 @@ describe TasksController do
 
     describe "task got deleted or reassigned" do
       it "should reload current page with the flash message if the task got deleted" do
-        @task = FactoryGirl.create(:task, user: FactoryGirl.create(:user), assignee: current_user)
+        @task = create(:task, user: create(:user), assignee: current_user)
         @task.destroy
 
         put :complete, params: { id: @task.id }, xhr: true
@@ -450,7 +450,7 @@ describe TasksController do
       end
 
       it "should reload current page with the flash message if the task got reassigned" do
-        @task = FactoryGirl.create(:task, user: FactoryGirl.create(:user), assignee: FactoryGirl.create(:user))
+        @task = create(:task, user: create(:user), assignee: create(:user))
 
         put :complete, params: { id: @task.id }, xhr: true
         expect(flash[:warning]).not_to eq(nil)
@@ -464,7 +464,7 @@ describe TasksController do
   #----------------------------------------------------------------------------
   describe "responding to PUT uncomplete" do
     it "should change task status, expose task as @task, and render template" do
-      @task = FactoryGirl.create(:task, completed_at: Time.now, user: current_user)
+      @task = create(:task, completed_at: Time.now, user: current_user)
 
       put :uncomplete, params: { id: @task.id }, xhr: true
       expect(@task.reload.completed_at).to eq(nil)
@@ -475,7 +475,7 @@ describe TasksController do
 
     describe "task got deleted" do
       it "should reload current page with the flash message if the task got deleted" do
-        @task = FactoryGirl.create(:task, user: FactoryGirl.create(:user), assignee: current_user, completed_at: Time.now)
+        @task = create(:task, user: create(:user), assignee: current_user, completed_at: Time.now)
         @task.destroy
 
         put :uncomplete, params: { id: @task.id }, xhr: true

data/spec/controllers/users_controller_spec.rb

@@ -92,7 +92,7 @@ describe UsersController do
     describe "if user is allowed to sign up" do
       it "should expose a new user as @user and render [new] template" do
         expect(User).to receive(:can_signup?).and_return(true)
-        @user = FactoryGirl.build(:user)
+        @user = build(:user)
         allow(User).to receive(:new).and_return(@user)
 
         get :new
@@ -147,7 +147,7 @@ describe UsersController do
         @username = "none"
         @email = @username + "@example.com"
         @password = "secret"
-        @user = FactoryGirl.build(:user, username: @username, email: @email)
+        @user = build(:user, username: @username, email: @email)
         allow(User).to receive(:new).and_return(@user)
       end
 
@@ -172,7 +172,7 @@ describe UsersController do
     describe "with invalid params" do
       it "assigns a newly created but unsaved user as @user and renders [new] template" do
         login_admin
-        @user = FactoryGirl.build(:user, username: "", email: "")
+        @user = build(:user, username: "", email: "")
         allow(User).to receive(:new).and_return(@user)
 
         post :create, params: { user: {} }
@@ -253,7 +253,7 @@ describe UsersController do
     end
 
     it "should delete avatar if user chooses to use Gravatar" do
-      @avatar = FactoryGirl.create(:avatar, user: @user, entity: @user)
+      @avatar = create(:avatar, user: @user, entity: @user)
 
       put :upload_avatar, params: { id: @user.id, gravatar: 1 }, xhr: true
       expect(@user.reload.avatar).to eq(nil)
@@ -261,7 +261,7 @@ describe UsersController do
     end
 
     it "should do nothing if user hasn't specified the avatar file to upload" do
-      @avatar = FactoryGirl.create(:avatar, user: @user, entity: @user)
+      @avatar = create(:avatar, user: @user, entity: @user)
 
       put :upload_avatar, params: { id: @user.id }, xhr: true
       expect(@user.avatar).to eq(@avatar)
@@ -373,19 +373,19 @@ describe UsersController do
     end
 
     it "should assign @users_with_opportunities" do
-      FactoryGirl.create(:opportunity, stage: "prospecting", assignee: @user)
+      create(:opportunity, stage: "prospecting", assignee: @user)
       get :opportunities_overview, xhr: true
       expect(assigns[:users_with_opportunities]).to eq([@current_user])
     end
 
     it "@users_with_opportunities should be ordered by name" do
-      FactoryGirl.create(:opportunity, stage: "prospecting", assignee: @user)
+      create(:opportunity, stage: "prospecting", assignee: @user)
 
-      user1 = FactoryGirl.create(:user, first_name: "Zebra", last_name: "Stripes")
-      FactoryGirl.create(:opportunity, stage: "prospecting", assignee: user1)
+      user1 = create(:user, first_name: "Zebra", last_name: "Stripes")
+      create(:opportunity, stage: "prospecting", assignee: user1)
 
-      user2 = FactoryGirl.create(:user, first_name: "Bilbo", last_name: "Magic")
-      FactoryGirl.create(:opportunity, stage: "prospecting", assignee: user2)
+      user2 = create(:user, first_name: "Bilbo", last_name: "Magic")
+      create(:opportunity, stage: "prospecting", assignee: user2)
 
       get :opportunities_overview, xhr: true
 
@@ -393,9 +393,9 @@ describe UsersController do
     end
 
     it "should assign @unassigned_opportunities with only open unassigned opportunities" do
-      @o1 = FactoryGirl.create(:opportunity, stage: "prospecting", assignee: nil)
-      @o2 = FactoryGirl.create(:opportunity, stage: "won", assignee: nil)
-      @o3 = FactoryGirl.create(:opportunity, stage: "prospecting", assignee: nil)
+      @o1 = create(:opportunity, stage: "prospecting", assignee: nil)
+      @o2 = create(:opportunity, stage: "won", assignee: nil)
+      @o3 = create(:opportunity, stage: "prospecting", assignee: nil)
 
       get :opportunities_overview, xhr: true
 
@@ -404,9 +404,9 @@ describe UsersController do
     end
 
     it "@unassigned_opportunities should be ordered by stage" do
-      @o1 = FactoryGirl.create(:opportunity, stage: "proposal", assignee: nil)
-      @o2 = FactoryGirl.create(:opportunity, stage: "prospecting", assignee: nil)
-      @o3 = FactoryGirl.create(:opportunity, stage: "negotiation", assignee: nil)
+      @o1 = create(:opportunity, stage: "proposal", assignee: nil)
+      @o2 = create(:opportunity, stage: "prospecting", assignee: nil)
+      @o3 = create(:opportunity, stage: "negotiation", assignee: nil)
 
       get :opportunities_overview, xhr: true
 
@@ -419,7 +419,7 @@ describe UsersController do
     end
 
     it "should not include users who have no open assigned opportunities" do
-      FactoryGirl.create(:opportunity, stage: "won", assignee: @user)
+      create(:opportunity, stage: "won", assignee: @user)
 
       get :opportunities_overview, xhr: true
       expect(assigns[:users_with_opportunities]).to eq([])