fat_free_crm 0.17.3 → 0.19.2

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

@@ -11,7 +11,7 @@
 #
 #  id                  :integer         not null, primary key
 #  username            :string(32)      default(""), not null
-#  email               :string(64)      default(""), not null
+#  email               :string(254)     default(""), not null
 #  first_name          :string(32)
 #  last_name           :string(32)
 #  title               :string(64)
@@ -23,21 +23,27 @@
 #  yahoo               :string(32)
 #  google              :string(32)
 #  skype               :string(32)
-#  password_hash       :string(255)     default(""), not null
+#  encrypted_password  :string(255)     default(""), not null
 #  password_salt       :string(255)     default(""), not null
-#  persistence_token   :string(255)     default(""), not null
-#  perishable_token    :string(255)     default(""), not null
-#  last_login_at       :datetime
-#  current_login_at    :datetime
-#  last_login_ip       :string(255)
-#  current_login_ip    :string(255)
-#  login_count         :integer         default(0), not null
+#  last_sign_in_at     :datetime
+#  current_sign_in_at  :datetime
+#  last_sign_in_ip     :string(255)
+#  current_sign_in_ip  :string(255)
+#  sign_in_count       :integer         default(0), not null
 #  deleted_at          :datetime
 #  created_at          :datetime
 #  updated_at          :datetime
 #  admin               :boolean         default(FALSE), not null
 #  suspended_at        :datetime
-#  single_access_token :string(255)
+#  unconfirmed_email   :string(254)     default(""), not null
+#  reset_password_token    :string(255)
+#  reset_password_sent_at  :datetime
+#  remember_token          :string(255)
+#  remember_created_at     :datetime
+#  authentication_token    :string(255)
+#  confirmation_token      :string(255)
+#  confirmed_at            :datetime
+#  confirmation_sent_at    :datetime
 #
 
 require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
@@ -53,28 +59,34 @@ 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
 
+      it "should not destroy the user if she owns a comment" do
+        account = build(:account, user: @current_user)
+        FactoryBot.create(:comment, user: @user, commentable: account)
+        expect(@user.destroyable?(@current_user)).to eq(false)
+      end
+
       it "should not destroy the current user" do
         expect(@user.destroyable?(@user)).to eq(false)
       end
@@ -87,19 +99,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 +121,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 +130,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 +141,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 +173,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 +193,7 @@ describe User do
 
   describe "Setting I18n.locale" do
     before do
-      @user = FactoryGirl.build(:user)
+      @user = build(:user)
       @locale = I18n.locale
     end
 
@@ -202,24 +214,8 @@ describe User do
     end
   end
 
-  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.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.set_single_access_token
-      expect(@user.single_access_token).to eq("token")
-    end
-  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/routing/users_routing_spec.rb

@@ -9,12 +9,38 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe UsersController do
   describe "routing" do
-    it "doesn't recognize #index" do
-      expect(get: "/users").not_to be_routable
+    it "recognizes #index" do
+      expect(get: "/users").to route_to(controller: "users", action: "index")
     end
 
-    it "recognizes and generates #new as /signup" do
-      expect(get: "/signup").to route_to(controller: "users", action: "new")
+    it "recognizes and generates Devise registrations routes" do
+      expect(get: "/users/sign_up").to route_to(controller: "registrations", action: "new")
+      expect(get: "/users/edit").to route_to(controller: "registrations", action: "edit")
+      expect(get: "/users/cancel").to route_to(controller: "registrations", action: "cancel")
+      expect(post: "/users").to route_to(controller: "registrations", action: "create")
+      expect(put: "/users").to route_to(controller: "registrations", action: "update")
+      expect(patch: "/users").to route_to(controller: "registrations", action: "update")
+      expect(delete: "/users").to route_to(controller: "registrations", action: "destroy")
+    end
+
+    it "recognizes and generates Devise sessions routes" do
+      expect(get: "/users/sign_in").to route_to(controller: "sessions", action: "new")
+      expect(post: "/users/sign_in").to route_to(controller: "sessions", action: "create")
+      expect(delete: "/users/sign_out").to route_to(controller: "sessions", action: "destroy")
+    end
+
+    it "recognizes and generates Devise passwords routes" do
+      expect(get: "/users/password/new").to route_to(controller: "passwords", action: "new")
+      expect(get: "/users/password/edit").to route_to(controller: "passwords", action: "edit")
+      expect(post: "/users/password").to route_to(controller: "passwords", action: "create")
+      expect(put: "/users/password").to route_to(controller: "passwords", action: "update")
+      expect(patch: "/users/password").to route_to(controller: "passwords", action: "update")
+    end
+
+    it "recognizes and generates Devise confirmations routes" do
+      expect(get: "/users/confirmation/new").to route_to(controller: "confirmations", action: "new")
+      expect(get: "/users/confirmation").to route_to(controller: "confirmations", action: "show")
+      expect(post: "/users/confirmation").to route_to(controller: "confirmations", action: "create")
     end
 
     it "recognizes and generates #show as /profile" do
@@ -29,10 +55,6 @@ describe UsersController do
       expect(get: "/users/aaron/edit").not_to be_routable
     end
 
-    it "recognizes and generates #create" do
-      expect(post: "/users").to route_to(controller: "users", action: "create")
-    end
-
     it "recognizes and generates #update" do
       expect(put: "/users/1").to route_to(controller: "users", action: "update", id: "1")
     end

data/spec/shared/controllers.rb

@@ -22,9 +22,7 @@ shared_examples "auto complete" do
 
     # We don't save Admin/Users autocomplete controller in a session since Users are not
     # exposed through the Jumpbox.
-    unless controller.class.to_s.starts_with?("Admin::")
-      expect(session[:auto_complete]).to eq(@controller.controller_name.to_sym)
-    end
+    expect(session[:auto_complete]).to eq(@controller.controller_name.to_sym) unless controller.class.to_s.starts_with?("Admin::")
   end
 
   it "should render application/_auto_complete template" do
@@ -39,12 +37,8 @@ shared_examples "attach" do
     expect(@model.send(@attachment.class.name.tableize)).to include(@attachment)
     expect(assigns[:attachment]).to eq(@attachment)
     expect(assigns[:attached]).to eq([@attachment])
-    if @model.is_a?(Campaign) && (@attachment.is_a?(Lead) || @attachment.is_a?(Opportunity))
-      expect(assigns[:campaign]).to eq(@attachment.reload.campaign)
-    end
-    if @model.is_a?(Account) && @attachment.respond_to?(:account) # Skip Tasks...
-      expect(assigns[:account]).to eq(@attachment.reload.account)
-    end
+    expect(assigns[:campaign]).to eq(@attachment.reload.campaign) if @model.is_a?(Campaign) && (@attachment.is_a?(Lead) || @attachment.is_a?(Opportunity))
+    expect(assigns[:account]).to eq(@attachment.reload.account) if @model.is_a?(Account) && @attachment.respond_to?(:account) # Skip Tasks...
     expect(response).to render_template("entities/attach")
   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