fat_free_crm 0.17.3 → 0.18.0

data/spec/lib/comment_extensions_spec.rb

@@ -9,7 +9,7 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe FatFreeCRM::CommentExtensions do
   describe "add_comment_by_user" do
-    let(:user) { FactoryGirl.create(:user) }
+    let(:user) { create(:user) }
 
     before :each do
       build_model(:commentable_entity) do

data/spec/lib/mail_processor/base_spec.rb

@@ -136,19 +136,19 @@ describe FatFreeCRM::MailProcessor::Base do
     end
 
     it "should find non-suspended user that matches From: field" do
-      @user = FactoryGirl.create(:user, email: @from.first, suspended_at: nil)
+      @user = create(:user, email: @from.first, suspended_at: nil)
       expect(@crawler.send(:sent_from_known_user?, @email)).to eq(true)
       expect(@crawler.instance_variable_get("@sender")).to eq(@user)
     end
 
     it "should not find user if his email doesn't match From: field" do
-      FactoryGirl.create(:user, email: "nobody@example.com")
+      create(:user, email: "nobody@example.com")
       expect(@crawler.send(:sent_from_known_user?, @email)).to eq(false)
       expect(@crawler.instance_variable_get("@sender")).to eq(nil)
     end
 
     it "should not find user if his email matches From: field but is suspended" do
-      FactoryGirl.create(:user, email: @from.first, suspended_at: Time.now)
+      create(:user, email: @from.first, suspended_at: Time.now)
       expect(@crawler.send(:sent_from_known_user?, @email)).to eq(false)
       expect(@crawler.instance_variable_get("@sender")).to eq(nil)
     end

data/spec/lib/mail_processor/comment_replies_spec.rb

@@ -23,7 +23,7 @@ describe FatFreeCRM::MailProcessor::CommentReplies do
   #------------------------------------------------------------------------------
   describe "Processing new emails" do
     before do
-      FactoryGirl.create(:user, email: "aaron@example.com")
+      create(:user, email: "aaron@example.com")
     end
 
     before(:each) do
@@ -32,7 +32,7 @@ describe FatFreeCRM::MailProcessor::CommentReplies do
     end
 
     it "should attach a new comment to a contact" do
-      @contact = FactoryGirl.create(:contact)
+      @contact = create(:contact)
       comment_reply = "This is a new comment reply via email"
 
       mail = Mail.new from:    "Aaron Assembler <aaron@example.com>",
@@ -50,7 +50,7 @@ describe FatFreeCRM::MailProcessor::CommentReplies do
     end
 
     it "should attach a new comment to an opportunity, using the 'op' shortcut in subject" do
-      @opportunity = FactoryGirl.create(:opportunity)
+      @opportunity = create(:opportunity)
       comment_reply = "This is a new comment reply via email"
 
       mail = Mail.new from:    "Aaron Assembler <aaron@example.com>",

data/spec/lib/mail_processor/dropbox_spec.rb

@@ -28,7 +28,7 @@ describe FatFreeCRM::MailProcessor::Dropbox do
 
     it "should discard a message if it's invalid" do
       expect(@crawler).to receive(:is_valid?).once.and_return(false)
-      FactoryGirl.create(:user, email: "aaron@example.com")
+      create(:user, email: "aaron@example.com")
       expect(@crawler).not_to receive(:archive)
       expect(@crawler).to receive(:discard).once
       @crawler.run
@@ -42,7 +42,7 @@ describe FatFreeCRM::MailProcessor::Dropbox do
     end
 
     it "should process a message if it finds the user" do
-      FactoryGirl.create(:user, email: "aaron@example.com")
+      create(:user, email: "aaron@example.com")
       expect(@crawler).to receive(:archive).once
       expect(@crawler).not_to receive(:discard)
       @crawler.run
@@ -54,12 +54,12 @@ describe FatFreeCRM::MailProcessor::Dropbox do
     before(:each) do
       mock_connect
       mock_disconnect
-      FactoryGirl.create(:user, email: "aaron@example.com")
+      create(:user, email: "aaron@example.com")
     end
 
     it "should find the named asset and attach the email message" do
       mock_message(DROPBOX_EMAILS[:first_line])
-      @campaign = FactoryGirl.create(:campaign, name: "Got milk!?")
+      @campaign = create(:campaign, name: "Got milk!?")
       expect(@crawler).to receive(:archive).once
       expect(@crawler).not_to receive(:with_recipients)
       @crawler.run
@@ -82,7 +82,7 @@ describe FatFreeCRM::MailProcessor::Dropbox do
 
     it "should find the lead and attach the email message" do
       mock_message(DROPBOX_EMAILS[:first_line_lead])
-      @lead = FactoryGirl.create(:lead, first_name: "Cindy", last_name: "Cluster")
+      @lead = create(:lead, first_name: "Cindy", last_name: "Cluster")
       expect(@crawler).to receive(:archive).once
       expect(@crawler).not_to receive(:with_recipients)
       @crawler.run
@@ -106,7 +106,7 @@ describe FatFreeCRM::MailProcessor::Dropbox do
 
     it "should find the contact and attach the email message" do
       mock_message(DROPBOX_EMAILS[:first_line_contact])
-      @contact = FactoryGirl.create(:contact, first_name: "Cindy", last_name: "Cluster")
+      @contact = create(:contact, first_name: "Cindy", last_name: "Cluster")
       expect(@crawler).to receive(:archive).once
       expect(@crawler).not_to receive(:with_recipients)
       @crawler.run
@@ -141,11 +141,11 @@ describe FatFreeCRM::MailProcessor::Dropbox do
       mock_connect
       mock_disconnect
       mock_message(DROPBOX_EMAILS[:plain])
-      FactoryGirl.create(:user, email: "aaron@example.com")
+      create(:user, email: "aaron@example.com")
     end
 
     it "should find the asset and attach the email message" do
-      @lead = FactoryGirl.create(:lead, email: "ben@example.com", access: "Public")
+      @lead = create(:lead, email: "ben@example.com", access: "Public")
       expect(@crawler).to receive(:archive).once
       expect(@crawler).not_to receive(:with_forwarded_recipient)
       @crawler.run
@@ -169,12 +169,12 @@ describe FatFreeCRM::MailProcessor::Dropbox do
     before(:each) do
       mock_connect
       mock_disconnect
-      FactoryGirl.create(:user, email: "aaron@example.com")
+      create(:user, email: "aaron@example.com")
       mock_message(DROPBOX_EMAILS[:forwarded])
     end
 
     it "should find the asset and attach the email message" do
-      @lead = FactoryGirl.create(:lead, email: "ben@example.com", access: "Public")
+      @lead = create(:lead, email: "ben@example.com", access: "Public")
       expect(@crawler).to receive(:archive).once
       @crawler.run
 
@@ -187,7 +187,7 @@ describe FatFreeCRM::MailProcessor::Dropbox do
       timezone = ActiveRecord::Base.default_timezone
       begin
         ActiveRecord::Base.default_timezone = :utc
-        @lead = FactoryGirl.create(:lead, email: "ben@example.com", access: "Public", updated_at: 5.day.ago)
+        @lead = create(:lead, email: "ben@example.com", access: "Public", updated_at: 5.day.ago)
 
         @crawler.run
         expect(@lead.reload.updated_at.to_i).to be >= now.to_i
@@ -197,7 +197,7 @@ describe FatFreeCRM::MailProcessor::Dropbox do
     end
 
     it "should change lead's status (:new => :contacted)" do
-      @lead = FactoryGirl.create(:lead, email: "ben@example.com", access: "Public", status: "new")
+      @lead = create(:lead, email: "ben@example.com", access: "Public", status: "new")
 
       @crawler.run
       expect(@lead.reload.status).to eq("contacted")
@@ -219,13 +219,13 @@ describe FatFreeCRM::MailProcessor::Dropbox do
       @settings = @crawler.instance_variable_get("@settings")
       @settings[:address_aliases] = ["dropbox@example.com"]
 
-      FactoryGirl.create(:user, email: "aaron@example.com")
+      create(:user, email: "aaron@example.com")
       mock_message(DROPBOX_EMAILS[:forwarded])
     end
 
     it "should not match the dropbox email address if routed to an alias" do
-      @lead = FactoryGirl.create(:lead, email: "ben@example.com", access: "Public")
-      @lead_dropbox = FactoryGirl.create(:lead, email: "dropbox@example.com", access: "Public")
+      @lead = create(:lead, email: "ben@example.com", access: "Public")
+      @lead_dropbox = create(:lead, email: "dropbox@example.com", access: "Public")
 
       expect(@crawler).to receive(:archive).once
       @crawler.run
@@ -240,7 +240,7 @@ describe FatFreeCRM::MailProcessor::Dropbox do
     before(:each) do
       mock_connect
       mock_disconnect
-      FactoryGirl.create(:user, email: "aaron@example.com")
+      create(:user, email: "aaron@example.com")
     end
 
     it "should create a contact from the email recipient (To: recipient, Bcc: dropbox)" do

data/spec/lib/permissions_spec.rb

@@ -44,8 +44,8 @@ describe FatFreeCRM::Permissions do
     end
 
     it "should replace existing permissions" do
-      @entity.permissions << FactoryGirl.create(:permission, user_id: 1, asset: @entity)
-      @entity.permissions << FactoryGirl.create(:permission, user_id: 2, asset: @entity)
+      @entity.permissions << create(:permission, user_id: 1, asset: @entity)
+      @entity.permissions << create(:permission, user_id: 2, asset: @entity)
       @entity.user_ids = %w[2 3]
       @entity.save!
       expect(@entity.permissions.size).to eq(2)
@@ -73,8 +73,8 @@ describe FatFreeCRM::Permissions do
     end
 
     it "should replace existing permissions" do
-      @entity.permissions << FactoryGirl.build(:permission, group_id: 1, user_id: nil, asset: @entity)
-      @entity.permissions << FactoryGirl.build(:permission, group_id: 2, user_id: nil, asset: @entity)
+      @entity.permissions << build(:permission, group_id: 1, user_id: nil, asset: @entity)
+      @entity.permissions << build(:permission, group_id: 2, user_id: nil, asset: @entity)
       expect(@entity.permissions.size).to eq(2)
       @entity.group_ids = ['3']
       @entity.save!
@@ -89,19 +89,19 @@ describe FatFreeCRM::Permissions do
       @entity = UserWithPermission.create
     end
     it "should delete all permissions if access is set to Public" do
-      perm = FactoryGirl.create(:permission, user_id: 1, asset: @entity)
+      perm = create(:permission, user_id: 1, asset: @entity)
       expect(perm).to receive(:destroy)
       expect(Permission).to receive(:where).with(asset_id: @entity.id, asset_type: @entity.class.to_s).and_return([perm])
       @entity.update_attribute(:access, 'Public')
     end
     it "should delete all permissions if access is set to Private" do
-      perm = FactoryGirl.create(:permission, user_id: 1, asset: @entity)
+      perm = create(:permission, user_id: 1, asset: @entity)
       expect(perm).to receive(:destroy)
       expect(Permission).to receive(:where).with(asset_id: @entity.id, asset_type: @entity.class.to_s).and_return([perm])
       @entity.update_attribute(:access, 'Private')
     end
     it "should not remove permissions if access is set to Shared" do
-      perm = FactoryGirl.create(:permission, user_id: 1, asset: @entity)
+      perm = create(:permission, user_id: 1, asset: @entity)
       expect(perm).not_to receive(:destroy)
       @entity.permissions << perm
       expect(Permission).not_to receive(:find_all_by_asset_id)
@@ -110,24 +110,6 @@ describe FatFreeCRM::Permissions do
     end
   end
 
-  describe "save_with_permissions" do
-    it "should raise deprecation warning and call save" do
-      entity = UserWithPermission.new
-      expect(ActiveSupport::Deprecation).to receive(:warn)
-      expect(entity).to receive(:save)
-      entity.save_with_permissions
-    end
-  end
-
-  describe "update_with_permissions" do
-    it "should raise deprecation warning and call update_attributes" do
-      entity = UserWithPermission.new
-      expect(ActiveSupport::Deprecation).to receive(:warn)
-      expect(entity).to receive(:update_attributes).with({})
-      entity.update_with_permissions({})
-    end
-  end
-
   describe "save_with_model_permissions" do
     it "should copy permissions from original model" do
       entity = UserWithPermission.new

data/spec/mailers/user_mailer_spec.rb

@@ -9,7 +9,7 @@ require 'spec_helper'
 
 describe UserMailer do
   describe "password_reset_instructions" do
-    let(:user) { FactoryGirl.build(:user, email: "forgot_my_password@example.com") }
+    let(:user) { build(:user, email: "forgot_my_password@example.com") }
     let(:mail) { UserMailer.password_reset_instructions(user) }
 
     before(:each) do
@@ -35,11 +35,11 @@ describe UserMailer do
   end
 
   describe "assigned_entity_notification" do
-    let(:assigner) { FactoryGirl.build(:user, first_name: "Bob", last_name: "Hope") }
-    let(:assignee) { FactoryGirl.build(:user, email: "assignee@example.com") }
+    let(:assigner) { build(:user, first_name: "Bob", last_name: "Hope") }
+    let(:assignee) { build(:user, email: "assignee@example.com") }
 
     context "for an account" do
-      let(:account) { FactoryGirl.build_stubbed(:account, id: 16, name: 'Ghostbusters', user: assigner, assignee: assignee) }
+      let(:account) { build_stubbed(:account, id: 16, name: 'Ghostbusters', user: assigner, assignee: assignee) }
       let(:mail) { UserMailer.assigned_entity_notification(account, assigner) }
 
       it "sets fatfree as the sender" do
@@ -64,7 +64,7 @@ describe UserMailer do
     end
 
     context "for a contact" do
-      let(:contact) { FactoryGirl.build_stubbed(:contact, id: 56, first_name: 'Harold', last_name: 'Ramis', user: assigner, assignee: assignee) }
+      let(:contact) { build_stubbed(:contact, id: 56, first_name: 'Harold', last_name: 'Ramis', user: assigner, assignee: assignee) }
       let(:mail) { UserMailer.assigned_entity_notification(contact, assigner) }
 
       it "sets fatfree as the sender" do
@@ -89,7 +89,7 @@ describe UserMailer do
     end
 
     context "for a lead" do
-      let(:lead) { FactoryGirl.build_stubbed(:lead, id: 42, first_name: 'Bill', last_name: 'Murray', user: assigner, assignee: assignee) }
+      let(:lead) { build_stubbed(:lead, id: 42, first_name: 'Bill', last_name: 'Murray', user: assigner, assignee: assignee) }
       let(:mail) { UserMailer.assigned_entity_notification(lead, assigner) }
 
       it "sets fatfree as the sender" do
@@ -114,7 +114,7 @@ describe UserMailer do
     end
 
     context "for an opportunity" do
-      let(:opportunity) { FactoryGirl.create(:opportunity, id: 24, name: 'Big', user: assigner, assignee: assignee) }
+      let(:opportunity) { create(:opportunity, id: 24, name: 'Big', user: assigner, assignee: assignee) }
       let(:mail) { UserMailer.assigned_entity_notification(opportunity, assigner) }
 
       it "sets fatfree as the sender" do

data/spec/models/entities/account_spec.rb

@@ -30,22 +30,20 @@
 require 'spec_helper'
 
 describe Account do
-  let(:current_user) { FactoryGirl.create(:user) }
-
   it "should create a new instance given valid attributes" do
-    Account.create!(name: "Test Account", user: FactoryGirl.create(:user))
+    Account.create!(name: "Test Account")
   end
 
   describe "Attach" do
     before do
-      @account = FactoryGirl.create(:account)
+      @account = create(:account)
     end
 
     it "should return nil when attaching existing asset" do
-      @task = FactoryGirl.create(:task, asset: @account, user: current_user)
-      @contact = FactoryGirl.create(:contact)
+      @task = create(:task, asset: @account)
+      @contact = create(:contact)
       @account.contacts << @contact
-      @opportunity = FactoryGirl.create(:opportunity)
+      @opportunity = create(:opportunity)
       @account.opportunities << @opportunity
 
       expect(@account.attach!(@task)).to eq(nil)
@@ -54,9 +52,9 @@ describe Account do
     end
 
     it "should return non-empty list of attachments when attaching new asset" do
-      @task = FactoryGirl.create(:task, user: current_user)
-      @contact = FactoryGirl.create(:contact)
-      @opportunity = FactoryGirl.create(:opportunity)
+      @task = create(:task)
+      @contact = create(:contact)
+      @opportunity = create(:opportunity)
 
       expect(@account.attach!(@task)).to eq([@task])
       expect(@account.attach!(@contact)).to eq([@contact])
@@ -66,11 +64,11 @@ describe Account do
 
   describe "Discard" do
     before do
-      @account = FactoryGirl.create(:account)
+      @account = create(:account)
     end
 
     it "should discard a task" do
-      @task = FactoryGirl.create(:task, asset: @account, user: current_user)
+      @task = create(:task, asset: @account)
       expect(@account.tasks.count).to eq(1)
 
       @account.discard!(@task)
@@ -79,7 +77,7 @@ describe Account do
     end
 
     it "should discard a contact" do
-      @contact = FactoryGirl.create(:contact)
+      @contact = create(:contact)
       @account.contacts << @contact
       expect(@account.contacts.count).to eq(1)
 
@@ -91,7 +89,7 @@ describe Account do
     # Commented out this test. "super from singleton method that is defined to multiple classes is not supported;"
     # ------------------------------------------------------
     #    it "should discard an opportunity" do
-    #      @opportunity = FactoryGirl.create(:opportunity)
+    #      @opportunity = create(:opportunity)
     #      @account.opportunities << @opportunity
     #      @account.opportunities.count.should == 1
 
@@ -103,16 +101,16 @@ describe Account do
 
   describe "Exportable" do
     describe "assigned account" do
-      let(:account1) { FactoryGirl.build(:account, user: FactoryGirl.create(:user), assignee: FactoryGirl.create(:user)) }
-      let(:account2) { FactoryGirl.build(:account, user: FactoryGirl.create(:user, first_name: nil, last_name: nil), assignee: FactoryGirl.create(:user, first_name: nil, last_name: nil)) }
+      let(:account1) { build(:account, assignee: create(:user)) }
+      let(:account2) { build(:account, user: create(:user, first_name: nil, last_name: nil), assignee: create(:user, first_name: nil, last_name: nil)) }
       it_should_behave_like("exportable") do
         let(:exported) { [account1, account2] }
       end
     end
 
     describe "unassigned account" do
-      let(:account1) { FactoryGirl.build(:account, user: FactoryGirl.create(:user), assignee: nil) }
-      let(:account2) { FactoryGirl.build(:account, user: FactoryGirl.create(:user, first_name: nil, last_name: nil), assignee: nil) }
+      let(:account1) { build(:account, assignee: nil) }
+      let(:account2) { build(:account, user: create(:user, first_name: nil, last_name: nil), assignee: nil) }
       it_should_behave_like("exportable") do
         let(:exported) { [account1, account2] }
       end
@@ -121,13 +119,13 @@ describe Account do
 
   describe "Before save" do
     it "create new: should replace empty category string with nil" do
-      account = FactoryGirl.build(:account, category: '')
+      account = build(:account, category: '')
       account.save
       expect(account.category).to eq(nil)
     end
 
     it "update existing: should replace empty category string with nil" do
-      account = FactoryGirl.create(:account, category: '')
+      account = create(:account, category: '')
       account.save
       expect(account.category).to eq(nil)
     end
@@ -139,13 +137,14 @@ describe Account do
 
   describe "scopes" do
     context "visible_on_dashboard" do
-      before :each do
-        @user = FactoryGirl.create(:user)
-        @a1 = FactoryGirl.create(:account, user: @user)
-        @a2 = FactoryGirl.create(:account, user: @user, assignee: FactoryGirl.create(:user))
-        @a3 = FactoryGirl.create(:account, user: FactoryGirl.create(:user), assignee: @user)
-        @a4 = FactoryGirl.create(:account, user: FactoryGirl.create(:user), assignee: FactoryGirl.create(:user))
-        @a5 = FactoryGirl.create(:account, user: FactoryGirl.create(:user), assignee: @user)
+      before do
+        @another_user = create(:user)
+        @user = create(:user)
+        @a1 = create(:account, user: @user)
+        @a2 = create(:account, user: @user, assignee: @another_user)
+        @a3 = create(:account, assignee: @user)
+        @a4 = create(:account, assignee: @another_user)
+        @a5 = create(:account, assignee: @user)
       end
 
       it "should show accounts which have been created by the user and are unassigned" do
@@ -167,11 +166,11 @@ describe Account do
 
     context "by_name" do
       it "should show accounts ordered by name" do
-        @a1 = FactoryGirl.create(:account, name: "Account A")
-        @a2 = FactoryGirl.create(:account, name: "Account Z")
-        @a3 = FactoryGirl.create(:account, name: "Account J")
-        @a4 = FactoryGirl.create(:account, name: "Account X")
-        @a5 = FactoryGirl.create(:account, name: "Account L")
+        @a1 = create(:account, name: "Account A")
+        @a2 = create(:account, name: "Account Z")
+        @a3 = create(:account, name: "Account J")
+        @a4 = create(:account, name: "Account X")
+        @a5 = create(:account, name: "Account L")
 
         expect(Account.by_name).to eq([@a1, @a3, @a5, @a4, @a2])
       end

data/spec/models/entities/campaign_spec.rb

@@ -34,31 +34,25 @@
 require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
 
 describe Campaign do
-  let(:current_user) { FactoryGirl.create(:user) }
-
   it "should create a new instance given valid attributes" do
-    Campaign.create!(name: "Campaign", user: FactoryGirl.create(:user))
+    Campaign.create!(name: "Campaign")
   end
 
   describe "Attach" do
     before do
-      @campaign = FactoryGirl.create(:campaign)
+      @campaign = create(:campaign)
     end
 
     it "should return nil when attaching existing asset" do
-      @task = FactoryGirl.create(:task, asset: @campaign, user: current_user)
-      @lead = FactoryGirl.create(:lead, campaign: @campaign)
-      @opportunity = FactoryGirl.create(:opportunity, campaign: @campaign)
-
-      expect(@campaign.attach!(@task)).to eq(nil)
-      expect(@campaign.attach!(@lead)).to eq(nil)
-      expect(@campaign.attach!(@opportunity)).to eq(nil)
+      expect(@campaign.attach!(create(:task, asset: @campaign))).to eq(nil)
+      expect(@campaign.attach!(create(:lead, campaign: @campaign))).to eq(nil)
+      expect(@campaign.attach!(create(:opportunity, campaign: @campaign))).to eq(nil)
     end
 
     it "should return non-empty list of attachments when attaching new asset" do
-      @task = FactoryGirl.create(:task, user: current_user)
-      @lead = FactoryGirl.create(:lead)
-      @opportunity = FactoryGirl.create(:opportunity)
+      @task = create(:task)
+      @lead = create(:lead)
+      @opportunity = create(:opportunity)
 
       expect(@campaign.attach!(@task)).to eq([@task])
       expect(@campaign.attach!(@lead)).to eq([@lead])
@@ -67,15 +61,14 @@ describe Campaign do
 
     it "should increment leads count when attaching a new lead" do
       @leads_count = @campaign.leads_count
-      @lead = FactoryGirl.create(:lead)
 
-      @campaign.attach!(@lead)
+      @campaign.attach!(create(:lead))
       expect(@campaign.reload.leads_count).to eq(@leads_count + 1)
     end
 
     it "should increment opportunities count when attaching new opportunity" do
       @opportunities_count = @campaign.opportunities_count
-      @opportunity = FactoryGirl.create(:opportunity)
+      @opportunity = create(:opportunity)
       @campaign.attach!(@opportunity)
       expect(@campaign.reload.opportunities_count).to eq(@opportunities_count + 1)
     end
@@ -83,11 +76,11 @@ describe Campaign do
 
   describe "Detach" do
     before do
-      @campaign = FactoryGirl.create(:campaign, leads_count: 42, opportunities_count: 42)
+      @campaign = create(:campaign, leads_count: 42, opportunities_count: 42)
     end
 
     it "should discard a task" do
-      @task = FactoryGirl.create(:task, asset: @campaign, user: current_user)
+      @task = create(:task, asset: @campaign)
       expect(@campaign.tasks.count).to eq(1)
 
       @campaign.discard!(@task)
@@ -96,7 +89,7 @@ describe Campaign do
     end
 
     it "should discard a lead" do
-      @lead = FactoryGirl.create(:lead, campaign: @campaign)
+      @lead = create(:lead, campaign: @campaign)
       expect(@campaign.reload.leads_count).to eq(43)
 
       @campaign.discard!(@lead)
@@ -105,7 +98,7 @@ describe Campaign do
     end
 
     it "should discard an opportunity" do
-      @opportunity = FactoryGirl.create(:opportunity, campaign: @campaign)
+      @opportunity = create(:opportunity, campaign: @campaign)
       expect(@campaign.reload.opportunities_count).to eq(43)
 
       @campaign.discard!(@opportunity)
@@ -116,16 +109,16 @@ describe Campaign do
 
   describe "Exportable" do
     describe "assigned campaign" do
-      let(:campaign1) { FactoryGirl.build(:campaign, user: FactoryGirl.create(:user, first_name: "John", last_name: "Smith"), assignee: FactoryGirl.create(:user)) }
-      let(:campaign2) { FactoryGirl.build(:campaign, user: FactoryGirl.create(:user, first_name: nil, last_name: nil), assignee: FactoryGirl.create(:user, first_name: nil, last_name: nil)) }
+      let(:campaign1) { build(:campaign, user: create(:user, first_name: "John", last_name: "Smith"), assignee: create(:user)) }
+      let(:campaign2) { build(:campaign, user: create(:user, first_name: nil, last_name: nil), assignee: create(:user, first_name: nil, last_name: nil)) }
       it_should_behave_like("exportable") do
         let(:exported) { [campaign1, campaign2] }
       end
     end
 
     describe "unassigned campaign" do
-      let(:campaign1) { FactoryGirl.build(:campaign, user: FactoryGirl.create(:user), assignee: nil) }
-      let(:campaign2) { FactoryGirl.build(:campaign, user: FactoryGirl.create(:user, first_name: nil, last_name: nil), assignee: nil) }
+      let(:campaign1) { build(:campaign, user: create(:user), assignee: nil) }
+      let(:campaign2) { build(:campaign, user: create(:user, first_name: nil, last_name: nil), assignee: nil) }
       it_should_behave_like("exportable") do
         let(:exported) { [campaign1, campaign2] }
       end