fat_free_crm 0.17.1 → 0.18.2

data/spec/models/polymorphic/version_spec.rb

@@ -23,20 +23,20 @@
 require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
 
 describe Version, versioning: true do
-  let(:current_user) { FactoryGirl.create(:user) }
+  let(:current_user) { create(:user) }
   before { PaperTrail.whodunnit = current_user.id.to_s }
 
   it "should create a new instance given valid attributes" do
-    FactoryGirl.create(:version, whodunnit: PaperTrail.whodunnit, item: FactoryGirl.create(:lead))
+    create(:version, whodunnit: PaperTrail.whodunnit, item: create(:lead))
   end
 
   describe "with multiple version records" do
     before do
-      @lead = FactoryGirl.create(:lead)
+      @lead = create(:lead)
 
       %w[create destroy update view].each do |event|
-        FactoryGirl.create(:version, event: event, item: @lead, whodunnit: PaperTrail.whodunnit)
-        FactoryGirl.create(:version, event: event, item: @lead, whodunnit: "1")
+        create(:version, event: event, item: @lead, whodunnit: PaperTrail.whodunnit)
+        create(:version, event: event, item: @lead, whodunnit: "1")
       end
     end
 
@@ -71,7 +71,7 @@ describe Version, versioning: true do
   %w[account campaign contact lead opportunity task].each do |item|
     describe "Create, update, and delete (#{item})" do
       before :each do
-        @item = FactoryGirl.create(item.to_sym, user: current_user)
+        @item = create(item.to_sym, user: current_user)
         @conditions = { item_id: @item.id, item_type: @item.class.name, whodunnit: PaperTrail.whodunnit }
       end
 
@@ -99,7 +99,7 @@ describe Version, versioning: true do
       end
 
       it "should add a version when commenting on a #{item}" do
-        @comment = FactoryGirl.create(:comment, commentable: @item, user: current_user)
+        @comment = create(:comment, commentable: @item, user: current_user)
 
         @version = Version.where(related_id: @item.id, related_type: @item.class.name, whodunnit: PaperTrail.whodunnit, event: 'create').first
         expect(@version).not_to eq(nil)
@@ -109,7 +109,7 @@ describe Version, versioning: true do
 
   describe "Recently viewed items (task)" do
     before do
-      @task = FactoryGirl.create(:task)
+      @task = create(:task)
       @conditions = { item_id: @task.id, item_type: @task.class.name }
     end
 
@@ -128,7 +128,7 @@ describe Version, versioning: true do
 
   describe "Action refinements for task updates" do
     before do
-      @task = FactoryGirl.create(:task, user: current_user)
+      @task = create(:task, user: current_user)
       @conditions = { item_id: @task.id, item_type: @task.class.name, whodunnit: PaperTrail.whodunnit }
     end
 
@@ -147,7 +147,7 @@ describe Version, versioning: true do
     end
 
     it "should create 'rescheduled' task event" do
-      @task.update(bucket: "due_tomorrow") # FactoryGirl creates :due_asap task
+      @task.update(bucket: "due_tomorrow") # FactoryBot creates :due_asap task
 
       versions = Version.where(@conditions)
       expect(versions.pluck(:event)).to include('reschedule')
@@ -156,7 +156,7 @@ describe Version, versioning: true do
 
   describe "Rejecting a lead" do
     before do
-      @lead = FactoryGirl.create(:lead, user: current_user, status: "new")
+      @lead = create(:lead, user: current_user, status: "new")
       @conditions = { item_id: @lead.id, item_type: @lead.class.name, whodunnit: PaperTrail.whodunnit }
     end
 
@@ -170,12 +170,12 @@ describe Version, versioning: true do
 
   describe "Permissions" do
     before do
-      @user = FactoryGirl.create(:user)
+      @user = create(:user)
       Version.delete_all
     end
 
     it "should not show the create/update versions if the item is private" do
-      @item = FactoryGirl.create(:account, user: current_user, access: "Private")
+      @item = create(:account, user: current_user, access: "Private")
       @item.update(name: 'New Name')
 
       versions = Version.where(item_id: @item.id, item_type: @item.class.name)
@@ -186,7 +186,7 @@ describe Version, versioning: true do
     end
 
     it "should not show the destroy version if the item is private" do
-      @item = FactoryGirl.create(:account, user: current_user, access: "Private")
+      @item = create(:account, user: current_user, access: "Private")
       @item.destroy
 
       versions = Version.where(item_id: @item.id, item_type: @item.class.name)
@@ -197,10 +197,10 @@ describe Version, versioning: true do
     end
 
     it "should not show create/update versions if the item was not shared with the user" do
-      @item = FactoryGirl.create(:account,
-                                 user: current_user,
-                                 access: "Shared",
-                                 permissions: [FactoryGirl.build(:permission, user: current_user, asset: @item)])
+      @item = create(:account,
+                     user: current_user,
+                     access: "Shared",
+                     permissions: [build(:permission, user: current_user, asset: @item)])
       @item.update(name: 'New Name')
 
       versions = Version.where(item_id: @item.id, item_type: @item.class.name)
@@ -211,10 +211,10 @@ describe Version, versioning: true do
     end
 
     it "should not show the destroy version if the item was not shared with the user" do
-      @item = FactoryGirl.create(:account,
-                                 user: current_user,
-                                 access: "Shared",
-                                 permissions: [FactoryGirl.build(:permission, user: current_user, asset: @item)])
+      @item = create(:account,
+                     user: current_user,
+                     access: "Shared",
+                     permissions: [build(:permission, user: current_user, asset: @item)])
       @item.destroy
 
       versions = Version.where(item_id: @item.id, item_type: @item.class.name)
@@ -225,10 +225,10 @@ describe Version, versioning: true do
     end
 
     it "should show create/update versions if the item was shared with the user" do
-      @item = FactoryGirl.create(:account,
-                                 user: current_user,
-                                 access: "Shared",
-                                 permissions: [FactoryGirl.build(:permission, user: @user, asset: @item)])
+      @item = create(:account,
+                     user: current_user,
+                     access: "Shared",
+                     permissions: [build(:permission, user: @user, asset: @item)])
       @item.update(name: 'New Name')
 
       versions = Version.where(item_id: @item.id, item_type: @item.class.name)

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/controllers.rb

@@ -12,13 +12,13 @@ shared_examples "auto complete" do
   end
 
   it "should do the search and find records that match autocomplete query" do
-    get :auto_complete, params: { auto_complete_query: @query }
+    get :auto_complete, params: { term: @query }
     expect(assigns[:query]).to eq(@query)
     expect(assigns[:auto_complete]).to eq(@auto_complete_matches) # Each controller must define it.
   end
 
   it "should save current autocomplete controller in a session" do
-    get :auto_complete, params: { auto_complete_query: @query }
+    get :auto_complete, params: { term: @query }
 
     # We don't save Admin/Users autocomplete controller in a session since Users are not
     # exposed through the Jumpbox.
@@ -28,7 +28,7 @@ shared_examples "auto complete" do
   end
 
   it "should render application/_auto_complete template" do
-    post :auto_complete, params: { auto_complete_query: @query }
+    post :auto_complete, params: { term: @query }
     expect(response).to render_template("application/_auto_complete")
   end
 end

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