fat_free_crm 0.17.3 → 0.18.0

data/spec/models/setting_spec.rb

@@ -24,7 +24,7 @@ describe Setting do
   end
 
   it "should find existing setting by its name using [] or method notations, and cache settings" do
-    @setting = FactoryGirl.create(:setting, name: "thingymabob", value: "magoody")
+    @setting = create(:setting, name: "thingymabob", value: "magoody")
     expect(Setting.cache.key?("thingymabob")).to eq(false)
     expect(Setting[:thingymabob]).to eq("magoody")
     expect(Setting.cache.key?("thingymabob")).to eq(true)
@@ -32,7 +32,7 @@ describe Setting do
   end
 
   it "should use value from YAML if setting is missing from database" do
-    @setting = FactoryGirl.create(:setting, name: "magoody", value: nil)
+    @setting = create(:setting, name: "magoody", value: nil)
     Setting.yaml_settings[:magoody] = "thingymabob"
     expect(Setting[:magoody]).to eq("thingymabob")
     expect(Setting.magoody).to eq("thingymabob")

data/spec/models/users/preference_spec.rb

@@ -21,7 +21,7 @@ require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
 
 describe Preference do
   before(:each) do
-    @user = FactoryGirl.create(:user)
+    @user = create(:user)
     @magoody = Base64.encode64(Marshal.dump("magoody"))
   end
 
@@ -31,7 +31,7 @@ describe Preference do
 
   describe "get user preference" do
     it "should find and decode existing user preference by its name" do
-      @preference = FactoryGirl.create(:preference, user: @user, name: "thingymabob", value: @magoody)
+      @preference = create(:preference, user: @user, name: "thingymabob", value: @magoody)
       expect(@user.preference[:thingymabob]).to eq("magoody")
       expect(@user.preference["thingymabob"]).to eq("magoody")
     end
@@ -41,17 +41,17 @@ describe Preference do
     end
 
     it "should return correct user_id" do
-      @preference = FactoryGirl.create(:preference, user: @user, name: "thingymabob", value: @magoody)
+      @preference = create(:preference, user: @user, name: "thingymabob", value: @magoody)
       expect(@user.preference[:user_id]).to eq(@user.id)
     end
 
     it "should disregard other user's preference with the same name" do
-      @preference = FactoryGirl.create(:preference, user: FactoryGirl.create(:user), name: "thingymabob", value: @magoody)
+      @preference = create(:preference, user: create(:user), name: "thingymabob", value: @magoody)
       expect(@user.preference[:thingymabob]).to eq(nil)
     end
 
     it "should not fail is user is nil" do
-      @preference = FactoryGirl.create(:preference, user: nil, name: "thingymabob", value: @magoody)
+      @preference = create(:preference, user: nil, name: "thingymabob", value: @magoody)
       expect(@preference[:thingymabob]).to eq(nil)
     end
   end
@@ -63,7 +63,7 @@ describe Preference do
     end
 
     it "should update existing user preference" do
-      @preference = FactoryGirl.create(:preference, user: @user, name: "thingymabob", value: @magoody)
+      @preference = create(:preference, user: @user, name: "thingymabob", value: @magoody)
       @user.preference[:thingymabob] = "thingy"
       expect(@user.reload.preference[:thingymabob]).to eq("thingy")
     end

data/spec/models/users/user_spec.rb

@@ -53,24 +53,24 @@ describe User do
   end
 
   it "should have a valid factory" do
-    expect(FactoryGirl.build(:user)).to be_valid
+    expect(build(:user)).to be_valid
   end
 
   describe '#destroyable?' do
     describe "Destroying users with and without related assets" do
       before do
-        @user = FactoryGirl.build(:user)
-        @current_user = FactoryGirl.build(:user)
+        @user = build(:user)
+        @current_user = build(:user)
       end
 
       %w[account campaign lead contact opportunity].each do |asset|
         it "should not destroy the user if she owns #{asset}" do
-          FactoryGirl.create(asset, user: @user)
+          create(asset, user: @user)
           expect(@user.destroyable?(@current_user)).to eq(false)
         end
 
         it "should not destroy the user if she has #{asset} assigned" do
-          FactoryGirl.create(asset, assignee: @user)
+          create(asset, assignee: @user)
           expect(@user.destroyable?(@current_user)).to eq(false)
         end
       end
@@ -87,19 +87,19 @@ describe User do
 
   describe '#destroy' do
     before do
-      @user = FactoryGirl.create(:user)
+      @user = create(:user)
     end
     it "once the user gets deleted all her permissions must be deleted too" do
-      FactoryGirl.create(:permission, user: @user, asset: FactoryGirl.create(:account))
-      FactoryGirl.create(:permission, user: @user, asset: FactoryGirl.create(:contact))
+      create(:permission, user: @user, asset: create(:account))
+      create(:permission, user: @user, asset: create(:contact))
       expect(@user.permissions.count).to eq(2)
       @user.destroy
       expect(@user.permissions.count).to eq(0)
     end
 
     it "once the user gets deleted all her preferences must be deleted too" do
-      FactoryGirl.create(:preference, user: @user, name: "Hello", value: "World")
-      FactoryGirl.create(:preference, user: @user, name: "World", value: "Hello")
+      create(:preference, user: @user, name: "Hello", value: "World")
+      create(:preference, user: @user, name: "World", value: "Hello")
       expect(@user.preferences.count).to eq(2)
       @user.destroy
       expect(@user.preferences.count).to eq(0)
@@ -109,7 +109,7 @@ describe User do
   describe '#suspend_if_needs_approval' do
     it "should set suspended timestamp upon creation if signups need approval and the user is not an admin" do
       allow(Setting).to receive(:user_signup).and_return(:needs_approval)
-      @user = FactoryGirl.build(:user, suspended_at: nil)
+      @user = build(:user, suspended_at: nil)
 
       @user.suspend_if_needs_approval
 
@@ -118,7 +118,7 @@ describe User do
 
     it "should not set suspended timestamp upon creation if signups need approval and the user is an admin" do
       allow(Setting).to receive(:user_signup).and_return(:needs_approval)
-      @user = FactoryGirl.build(:user, admin: true, suspended_at: nil)
+      @user = build(:user, admin: true, suspended_at: nil)
 
       @user.suspend_if_needs_approval
 
@@ -129,16 +129,16 @@ describe User do
   context "scopes" do
     describe "have_assigned_opportunities" do
       before do
-        @user1 = FactoryGirl.create(:user)
-        FactoryGirl.create(:opportunity, assignee: @user1, stage: 'analysis', account: nil, campaign: nil, user: nil)
+        @user1 = create(:user)
+        create(:opportunity, assignee: @user1, stage: 'analysis', account: nil, campaign: nil, user: nil)
 
-        @user2 = FactoryGirl.create(:user)
+        @user2 = create(:user)
 
-        @user3 = FactoryGirl.create(:user)
-        FactoryGirl.create(:opportunity, assignee: @user3, stage: 'won', account: nil, campaign: nil, user: nil)
+        @user3 = create(:user)
+        create(:opportunity, assignee: @user3, stage: 'won', account: nil, campaign: nil, user: nil)
 
-        @user4 = FactoryGirl.create(:user)
-        FactoryGirl.create(:opportunity, assignee: @user4, stage: 'lost', account: nil, campaign: nil, user: nil)
+        @user4 = create(:user)
+        create(:opportunity, assignee: @user4, stage: 'lost', account: nil, campaign: nil, user: nil)
 
         @result = User.have_assigned_opportunities
       end
@@ -161,10 +161,10 @@ describe User do
   context "instance methods" do
     describe "assigned_opportunities" do
       before do
-        @user = FactoryGirl.create(:user)
+        @user = create(:user)
 
-        @opportunity1 = FactoryGirl.create(:opportunity, assignee: @user, account: nil, campaign: nil, user: nil)
-        @opportunity2 = FactoryGirl.create(:opportunity, assignee: FactoryGirl.create(:user), account: nil, campaign: nil, user: nil)
+        @opportunity1 = create(:opportunity, assignee: @user, account: nil, campaign: nil, user: nil)
+        @opportunity2 = create(:opportunity, assignee: create(:user), account: nil, campaign: nil, user: nil)
 
         @result = @user.assigned_opportunities
       end
@@ -181,7 +181,7 @@ describe User do
 
   describe "Setting I18n.locale" do
     before do
-      @user = FactoryGirl.build(:user)
+      @user = build(:user)
       @locale = I18n.locale
     end
 
@@ -204,14 +204,14 @@ describe User do
 
   describe "Setting single access token" do
     it "should update single_access_token attribute if it is not set already" do
-      @user = FactoryGirl.build(:user, single_access_token: nil)
+      @user = build(:user, single_access_token: nil)
 
       @user.set_single_access_token
       expect(@user.single_access_token).not_to eq(nil)
     end
 
     it "should not update single_access_token attribute if it is set already" do
-      @user = FactoryGirl.build(:user, single_access_token: "token")
+      @user = build(:user, single_access_token: "token")
 
       @user.set_single_access_token
       expect(@user.single_access_token).to eq("token")
@@ -219,7 +219,7 @@ describe User do
   end
 
   describe "serialization" do
-    let(:user) { FactoryGirl.build(:user) }
+    let(:user) { build(:user) }
 
     it "to json" do
       expect(user.to_json).to eql([user.name].to_json)

data/spec/shared/models.rb

@@ -47,7 +47,7 @@ end
 shared_examples Ability do |klass|
   subject { ability }
   let(:ability) { Ability.new(user) }
-  let(:user) { FactoryGirl.create(:user) }
+  let(:user) { create(:user) }
   let(:factory) { klass.model_name.to_s.underscore }
 
   context "create" do
@@ -55,86 +55,86 @@ shared_examples Ability do |klass|
   end
 
   context "when public access" do
-    let!(:asset) { FactoryGirl.create(factory, access: 'Public') }
+    let!(:asset) { create(factory, access: 'Public') }
 
     it { is_expected.to be_able_to(:manage, asset) }
   end
 
   context "when private access owner" do
-    let!(:asset) { FactoryGirl.create(factory, access: 'Private', user_id: user.id) }
+    let!(:asset) { create(factory, access: 'Private', user_id: user.id) }
 
     it { is_expected.to be_able_to(:manage, asset) }
   end
 
   context "when private access administrator" do
-    let!(:asset) { FactoryGirl.create(factory, access: 'Private') }
-    let(:user) { FactoryGirl.create(:user, admin: true) }
+    let!(:asset) { create(factory, access: 'Private') }
+    let(:user) { create(:user, admin: true) }
 
     it { is_expected.to be_able_to(:manage, asset) }
   end
 
   context "when private access not owner" do
-    let!(:asset) { FactoryGirl.create(factory, access: 'Private') }
+    let!(:asset) { create(factory, access: 'Private') }
 
     it { is_expected.not_to be_able_to(:manage, asset) }
   end
 
   context "when private access not owner but is assigned" do
-    let!(:asset) { FactoryGirl.create(factory, access: 'Private', assigned_to: user.id) }
+    let!(:asset) { create(factory, access: 'Private', assigned_to: user.id) }
 
     it { is_expected.to be_able_to(:manage, asset) }
   end
 
   context "when shared access with permission" do
-    let!(:asset) { FactoryGirl.create(factory, access: 'Shared', permissions: [permission]) }
+    let!(:asset) { create(factory, access: 'Shared', permissions: [permission]) }
     let(:permission) { Permission.new(user: user) }
 
     it { is_expected.to be_able_to(:manage, asset) }
   end
 
   context "when shared access with no permission" do
-    let!(:asset) { FactoryGirl.create(factory, access: 'Shared', permissions: [permission]) }
-    let(:permission) { Permission.new(user: FactoryGirl.create(:user)) }
+    let!(:asset) { create(factory, access: 'Shared', permissions: [permission]) }
+    let(:permission) { Permission.new(user: create(:user)) }
 
     it { is_expected.not_to be_able_to(:manage, asset) }
   end
 
   context "when shared access with no permission but administrator" do
-    let!(:asset) { FactoryGirl.create(factory, access: 'Shared', permissions: [permission]) }
-    let(:permission) { Permission.new(user: FactoryGirl.create(:user)) }
-    let(:user) { FactoryGirl.create(:user, admin: true) }
+    let!(:asset) { create(factory, access: 'Shared', permissions: [permission]) }
+    let(:permission) { Permission.new(user: create(:user)) }
+    let(:user) { create(:user, admin: true) }
 
     it { is_expected.to be_able_to(:manage, asset) }
   end
 
   context "when shared access with no permission but assigned" do
-    let!(:asset) { FactoryGirl.create(factory, access: 'Shared', permissions: [permission], assigned_to: user.id) }
-    let(:permission) { Permission.new(user: FactoryGirl.create(:user)) }
+    let!(:asset) { create(factory, access: 'Shared', permissions: [permission], assigned_to: user.id) }
+    let(:permission) { Permission.new(user: create(:user)) }
 
     it { is_expected.to be_able_to(:manage, asset) }
   end
 
   context "when shared access with group permission" do
-    let!(:asset) { FactoryGirl.create(factory, access: 'Shared', permissions: [permission]) }
+    let!(:asset) { create(factory, access: 'Shared', permissions: [permission]) }
     let(:permission) { Permission.new(group: group) }
-    let(:group) { FactoryGirl.create(:group, users: [user]) }
+    let(:group) { create(:group, users: [user]) }
 
     it { is_expected.to be_able_to(:manage, asset) }
   end
 
   context "when shared access with several group permissions" do
-    let!(:asset) { FactoryGirl.create(factory, access: 'Shared', permissions: permissions) }
+    let!(:asset) { create(factory, access: 'Shared', permissions: permissions) }
     let(:permissions) { [Permission.new(group: group1), Permission.new(group: group2)] }
-    let(:group1) { FactoryGirl.create(:group, users: [user]) }
-    let(:group2) { FactoryGirl.create(:group, users: [user]) }
+    let(:group1) { create(:group, users: [user]) }
+    let(:group2) { create(:group, users: [user]) }
 
     it { is_expected.to be_able_to(:manage, asset) }
   end
 
   context "when shared access with no group permission" do
-    let!(:asset) { FactoryGirl.create(factory, access: 'Shared', permissions: [permission]) }
+    let!(:asset) { create(factory, access: 'Shared', permissions: [permission]) }
     let(:permission) { Permission.new(group: group) }
-    let(:group) { FactoryGirl.create(:group) }
+    let(:group) { create(:group) }
 
     it { is_expected.not_to be_able_to(:manage, asset) }
   end

data/spec/spec_helper.rb

@@ -14,7 +14,7 @@ require 'capybara/rails'
 require 'paper_trail/frameworks/rspec'
 
 require 'acts_as_fu'
-require 'factory_girl_rails'
+require 'factory_bot_rails'
 require 'ffaker'
 require 'timecop'
 
@@ -40,7 +40,7 @@ RSpec.configure do |config|
 
   # RSpec configuration options for Fat Free CRM.
   config.include RSpec::Rails::Matchers
-  config.include FactoryGirl::Syntax::Methods
+  config.include FactoryBot::Syntax::Methods
 
   config.before(:each) do
     # Overwrite locale settings within "config/settings.yml" if necessary.

data/spec/support/auth_macros.rb

@@ -18,7 +18,7 @@ end
 # Note: Authentication is NOT ActiveRecord model, so we mock and stub it using RSpec.
 #----------------------------------------------------------------------------
 def login(user_stubs = {}, session_stubs = {})
-  User.current_user = @current_user = FactoryGirl.create(:user, user_stubs)
+  User.current_user = @current_user = create(:user, user_stubs)
   @current_user_session = double(Authentication, { record: current_user }.merge(session_stubs))
   allow(Authentication).to receive(:find).and_return(@current_user_session)
   # set_timezone

data/spec/support/macros.rb

@@ -13,11 +13,11 @@ end
 #----------------------------------------------------------------------------
 def stub_task(view)
   assigns[:task] = if view == "completed"
-                     FactoryGirl.create(:task, completed_at: Time.now - 1.minute)
+                     create(:task, completed_at: Time.now - 1.minute)
                    elsif view == "assigned"
-                     FactoryGirl.create(:task, assignee: FactoryGirl.create(:user))
+                     create(:task, assignee: create(:user))
                    else
-                     FactoryGirl.create(:task)
+                     create(:task)
                    end
 end
 

data/spec/views/accounts/_edit.haml_spec.rb

@@ -12,7 +12,7 @@ describe "/accounts/_edit" do
 
   before do
     login
-    assign(:account, @account = FactoryGirl.create(:account))
+    assign(:account, @account = create(:account))
   end
 
   it "should render [edit account] form" do

data/spec/views/accounts/create.js.haml_spec.rb

@@ -18,7 +18,7 @@ describe "/accounts/create" do
   # core object Account partial is not embedded.
   describe "create success" do
     before do
-      assign(:account, @account = FactoryGirl.build_stubbed(:account))
+      assign(:account, @account = build_stubbed(:account))
       assign(:accounts, [@account].paginate)
       assign(:account_category_total, Hash.new(1))
       render
@@ -42,7 +42,7 @@ describe "/accounts/create" do
 
   describe "create failure" do
     it "should re-render [create] template in :create_account div" do
-      assign(:account, FactoryGirl.build(:account, name: nil)) # make it invalid
+      assign(:account, build(:account, name: nil)) # make it invalid
       assign(:users, [current_user])
       render
 

data/spec/views/accounts/destroy.js.haml_spec.rb

@@ -12,7 +12,7 @@ describe "/accounts/destroy" do
 
   before do
     login
-    assign(:account, @account = FactoryGirl.build_stubbed(:account))
+    assign(:account, @account = build_stubbed(:account))
     assign(:accounts, [@account].paginate)
     assign(:account_category_total, Hash.new(1))
     render

data/spec/views/accounts/edit.js.haml_spec.rb

@@ -12,7 +12,7 @@ describe "/accounts/edit" do
 
   before do
     login
-    assign(:account, @account = FactoryGirl.build_stubbed(:account, user: current_user))
+    assign(:account, @account = build_stubbed(:account, user: current_user))
     assign(:users, [current_user])
   end
 
@@ -33,7 +33,7 @@ describe "/accounts/edit" do
 
   it "edit: should hide previously open [Edit Account] for and replace it with account partial" do
     params[:cancel] = nil
-    assign(:previous, previous = FactoryGirl.build_stubbed(:account, user: current_user))
+    assign(:previous, previous = build_stubbed(:account, user: current_user))
 
     render
     expect(rendered).to include("account_#{previous.id}")

data/spec/views/accounts/index.haml_spec.rb

@@ -19,13 +19,13 @@ describe "/accounts/index" do
   end
 
   it "should render account name" do
-    assign(:accounts, [FactoryGirl.build_stubbed(:account, name: 'New Media Inc'), FactoryGirl.build_stubbed(:account)].paginate)
+    assign(:accounts, [build_stubbed(:account, name: 'New Media Inc'), build_stubbed(:account)].paginate)
     render
     expect(rendered).to have_tag('a', text: "New Media Inc")
   end
 
   it "should render list of accounts if list of accounts is not empty" do
-    assign(:accounts, [FactoryGirl.build_stubbed(:account), FactoryGirl.build_stubbed(:account)].paginate)
+    assign(:accounts, [build_stubbed(:account), build_stubbed(:account)].paginate)
 
     render
     expect(view).to render_template(partial: "_account")

data/spec/views/accounts/index.js.haml_spec.rb

@@ -15,7 +15,7 @@ describe "/accounts/index" do
   end
 
   it "should render [account] template with @accounts collection if there are accounts" do
-    assign(:accounts, [FactoryGirl.build_stubbed(:account, id: 42)].paginate)
+    assign(:accounts, [build_stubbed(:account, id: 42)].paginate)
 
     render template: 'accounts/index', formats: [:js]