fat_free_crm 0.16.4 → 0.17.1

data/spec/models/list_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (c) 2008-2013 Michael Dvorkin and contributors.
 #
 # Fat Free CRM is freely distributable under the terms of MIT license.

data/spec/models/observers/entity_observer_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (c) 2008-2013 Michael Dvorkin and contributors.
 #
 # Fat Free CRM is freely distributable under the terms of MIT license.

data/spec/models/polymorphic/address_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (c) 2008-2013 Michael Dvorkin and contributors.
 #
 # Fat Free CRM is freely distributable under the terms of MIT license.
@@ -26,10 +28,6 @@
 require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
 
 describe Address do
-  before(:each) do
-    login
-  end
-
   it "should create a new instance given valid attributes" do
     Address.create!(street1: "street1", street2: "street2", city: "city", state: "state", zipcode: "zipcode", country: "country", full_address: "fa", address_type: "Lead", addressable: FactoryGirl.create(:lead))
   end

data/spec/models/polymorphic/avatar_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (c) 2008-2013 Michael Dvorkin and contributors.
 #
 # Fat Free CRM is freely distributable under the terms of MIT license.

data/spec/models/polymorphic/comment_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (c) 2008-2013 Michael Dvorkin and contributors.
 #
 # Fat Free CRM is freely distributable under the terms of MIT license.
@@ -22,10 +24,6 @@
 require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
 
 describe Comment do
-  before(:each) do
-    login
-  end
-
   it "should create a new instance given valid attributes" do
     Comment.create!(comment: "Hello", user: FactoryGirl.create(:user), commentable: FactoryGirl.create(:lead))
   end

data/spec/models/polymorphic/email_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (c) 2008-2013 Michael Dvorkin and contributors.
 #
 # Fat Free CRM is freely distributable under the terms of MIT license.

data/spec/models/polymorphic/task_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (c) 2008-2013 Michael Dvorkin and contributors.
 #
 # Fat Free CRM is freely distributable under the terms of MIT license.
@@ -30,7 +32,7 @@
 require 'spec_helper'
 
 describe Task do
-  before { login }
+  let(:current_user) { FactoryGirl.create(:user) }
 
   describe "Task/Create" do
     it "should create a new task instance given valid attributes" do
@@ -48,7 +50,7 @@ describe Task do
         task = FactoryGirl.create(:task, due_at: Time.now.end_of_week, bucket: "due_this_week")
         expect(task.errors).to be_empty
         expect(task.bucket).to eq("due_this_week")
-        expect(task.due_at).to eq(Time.zone.now.end_of_week)
+        expect(task.due_at.change(usec: 0)).to eq(Time.zone.now.end_of_week.change(usec: 0))
       end
 
       it "should create a task with due date selected from the calendar within #{offset ? 'different' : 'current'} timezone" do
@@ -104,7 +106,7 @@ describe Task do
         task.update_attributes(bucket: "due_this_week")
         expect(task.errors).to be_empty
         expect(task.bucket).to eq("due_this_week")
-        expect(task.due_at).to eq(Time.zone.now.end_of_week)
+        expect(task.due_at.change(usec: 0)).to eq(Time.zone.now.end_of_week.change(usec: 0))
       end
 
       it "should update due date if specific calendar date selected within #{offset ? 'different' : 'current'} timezone" do
@@ -377,7 +379,7 @@ describe Task do
       it "should show tasks ordered by due_at" do
         t1 = FactoryGirl.create(:task, name: 't1', bucket: "due_asap")
         t2 = FactoryGirl.create(:task, calendar: 5.days.from_now.strftime("%Y-%m-%d %H:%M"), bucket: "specific_time")
-        t3 = FactoryGirl.create(:task, name: 't3',  bucket: "due_next_week")
+        t3 = FactoryGirl.create(:task, name: 't3', bucket: "due_next_week")
         t4 = FactoryGirl.create(:task, calendar: 20.days.from_now.strftime("%Y-%m-%d %H:%M"), bucket: "specific_time")
         expect(Task.by_due_at).to eq([t1, t2, t3, t4])
       end

data/spec/models/polymorphic/version_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (c) 2008-2013 Michael Dvorkin and contributors.
 #
 # Fat Free CRM is freely distributable under the terms of MIT license.
@@ -21,10 +23,8 @@
 require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
 
 describe Version, versioning: true do
-  before do
-    login
-    PaperTrail.whodunnit = current_user.id.to_s
-  end
+  let(:current_user) { FactoryGirl.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))
@@ -200,8 +200,7 @@ describe Version, versioning: true do
       @item = FactoryGirl.create(:account,
                                  user: current_user,
                                  access: "Shared",
-                                 permissions: [FactoryGirl.build(:permission, user: current_user, asset: @item)]
-      )
+                                 permissions: [FactoryGirl.build(:permission, user: current_user, asset: @item)])
       @item.update(name: 'New Name')
 
       versions = Version.where(item_id: @item.id, item_type: @item.class.name)
@@ -215,8 +214,7 @@ describe Version, versioning: true do
       @item = FactoryGirl.create(:account,
                                  user: current_user,
                                  access: "Shared",
-                                 permissions: [FactoryGirl.build(:permission, user: current_user, asset: @item)]
-      )
+                                 permissions: [FactoryGirl.build(:permission, user: current_user, asset: @item)])
       @item.destroy
 
       versions = Version.where(item_id: @item.id, item_type: @item.class.name)
@@ -230,8 +228,7 @@ describe Version, versioning: true do
       @item = FactoryGirl.create(:account,
                                  user: current_user,
                                  access: "Shared",
-                                 permissions: [FactoryGirl.build(:permission, user: @user, asset: @item)]
-      )
+                                 permissions: [FactoryGirl.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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (c) 2008-2013 Michael Dvorkin and contributors.
 #
 # Fat Free CRM is freely distributable under the terms of MIT license.
@@ -51,4 +53,25 @@ describe Setting do
     expect(Setting[:hello]).to eq(false)
     expect(Setting.hello).to eq(false)
   end
+
+  describe "#dig" do
+    it "should dig into nested hashes" do
+      Setting[:hello] = { foo: { bar: 3 } }
+      expect(Setting.dig(:hello, :foo, :bar)).to eq(3)
+    end
+
+    it "should dig into nested arrays" do
+      Setting[:hello] = [1, [2, 3]]
+      expect(Setting.dig(:hello, 1, 1)).to eq(3)
+    end
+
+    it "should return nil if nil" do
+      expect(Setting.dig(:foo, :bar)).to eq(nil)
+    end
+
+    it "should return nil if nil" do
+      Setting[:hello] = "world"
+      expect { Setting.dig(:hello, :foo) }.to raise_error(TypeError)
+    end
+  end
 end

data/spec/models/users/abilities/user_ability_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (c) 2008-2013 Michael Dvorkin and contributors.
 #
 # Fat Free CRM is freely distributable under the terms of MIT license.

data/spec/models/users/authentication_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (c) 2008-2013 Michael Dvorkin and contributors.
 #
 # Fat Free CRM is freely distributable under the terms of MIT license.

data/spec/models/users/group_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (c) 2008-2013 Michael Dvorkin and contributors.
 #
 # Fat Free CRM is freely distributable under the terms of MIT license.

data/spec/models/users/permission_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (c) 2008-2013 Michael Dvorkin and contributors.
 #
 # Fat Free CRM is freely distributable under the terms of MIT license.

data/spec/models/users/preference_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (c) 2008-2013 Michael Dvorkin and contributors.
 #
 # Fat Free CRM is freely distributable under the terms of MIT license.

data/spec/models/users/user_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (c) 2008-2013 Michael Dvorkin and contributors.
 #
 # Fat Free CRM is freely distributable under the terms of MIT license.
@@ -58,39 +60,31 @@ describe User do
     describe "Destroying users with and without related assets" do
       before do
         @user = FactoryGirl.build(:user)
+        @current_user = FactoryGirl.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)
-
-          expect(@user.destroyable?).to eq(false)
+          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)
-          expect(@user.destroyable?).to eq(false)
+          expect(@user.destroyable?(@current_user)).to eq(false)
         end
       end
 
-      it "should not destroy the user if she owns a comment" do
-        login
-        account = build(:account, user: current_user)
-        FactoryGirl.create(:comment, user: @user, commentable: account)
-        expect(@user.destroyable?).to eq(false)
-      end
-
       it "should not destroy the current user" do
-        login
-
-        expect(current_user.destroyable?).to eq(false)
+        expect(@user.destroyable?(@user)).to eq(false)
       end
 
       it "should destroy the user" do
-        expect(@user.destroyable?).to eq(true)
+        expect(@user.destroyable?(@current_user)).to eq(true)
       end
     end
   end
+
   describe '#destroy' do
     before do
       @user = FactoryGirl.create(:user)
@@ -112,12 +106,12 @@ describe User do
     end
   end
 
-  describe '#check_if_needs_approval' 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.check_if_needs_approval
+      @user.suspend_if_needs_approval
 
       expect(@user).to be_suspended
     end
@@ -126,7 +120,7 @@ describe User do
       allow(Setting).to receive(:user_signup).and_return(:needs_approval)
       @user = FactoryGirl.build(:user, admin: true, suspended_at: nil)
 
-      @user.check_if_needs_approval
+      @user.suspend_if_needs_approval
 
       expect(@user).not_to be_suspended
     end

data/spec/routing/accounts_routing_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (c) 2008-2013 Michael Dvorkin and contributors.
 #
 # Fat Free CRM is freely distributable under the terms of MIT license.

data/spec/routing/admin/users_routing_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (c) 2008-2013 Michael Dvorkin and contributors.
 #
 # Fat Free CRM is freely distributable under the terms of MIT license.

data/spec/routing/campaigns_routing_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (c) 2008-2013 Michael Dvorkin and contributors.
 #
 # Fat Free CRM is freely distributable under the terms of MIT license.

data/spec/routing/comments_routing_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (c) 2008-2013 Michael Dvorkin and contributors.
 #
 # Fat Free CRM is freely distributable under the terms of MIT license.

data/spec/routing/contacts_routing_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (c) 2008-2013 Michael Dvorkin and contributors.
 #
 # Fat Free CRM is freely distributable under the terms of MIT license.

data/spec/routing/emails_routing_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (c) 2008-2013 Michael Dvorkin and contributors.
 #
 # Fat Free CRM is freely distributable under the terms of MIT license.

data/spec/routing/leads_routing_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (c) 2008-2013 Michael Dvorkin and contributors.
 #
 # Fat Free CRM is freely distributable under the terms of MIT license.

data/spec/routing/opportunities_routing_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (c) 2008-2013 Michael Dvorkin and contributors.
 #
 # Fat Free CRM is freely distributable under the terms of MIT license.

data/spec/routing/tasks_routing_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (c) 2008-2013 Michael Dvorkin and contributors.
 #
 # Fat Free CRM is freely distributable under the terms of MIT license.

data/spec/routing/users_routing_spec.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (c) 2008-2013 Michael Dvorkin and contributors.
 #
 # Fat Free CRM is freely distributable under the terms of MIT license.

data/spec/shared/controllers.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (c) 2008-2013 Michael Dvorkin and contributors.
 #
 # Fat Free CRM is freely distributable under the terms of MIT license.

data/spec/shared/models.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (c) 2008-2013 Michael Dvorkin and contributors.
 #
 # Fat Free CRM is freely distributable under the terms of MIT license.

data/spec/spec_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (c) 2008-2013 Michael Dvorkin and contributors.
 #
 # Fat Free CRM is freely distributable under the terms of MIT license.
@@ -94,11 +96,11 @@ ActionView::Base.class_eval do
   end
 
   def called_from_index_page?(controller = controller_name)
-    if controller != "tasks"
-      request.referer =~ %r{/#{controller}$}
-    else
-      request.referer =~ /tasks\?*/
-    end
+    request.referer =~ if controller != "tasks"
+                         %r{/#{controller}$}
+                       else
+                         /tasks\?*/
+                       end
   end
 
   def called_from_landing_page?(controller = controller_name)

data/spec/support/assert_select.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (c) 2008-2013 Michael Dvorkin and contributors.
 #
 # Fat Free CRM is freely distributable under the terms of MIT license.

data/spec/support/auth_macros.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (c) 2008-2013 Michael Dvorkin and contributors.
 #
 # Fat Free CRM is freely distributable under the terms of MIT license.
@@ -20,21 +22,12 @@ def login(user_stubs = {}, session_stubs = {})
   @current_user_session = double(Authentication, { record: current_user }.merge(session_stubs))
   allow(Authentication).to receive(:find).and_return(@current_user_session)
   # set_timezone
-end
-alias require_user login
-
-#----------------------------------------------------------------------------
-def login_and_assign(user_stubs = {}, session_stubs = {})
-  User.current_user = @current_user = FactoryGirl.build_stubbed(: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
   assigns[:current_user] = current_user
 end
 
-def login_and_assign!(_user_stubs = {}, _session_stubs = {})
-  login
-  assigns[:current_user] = current_user
+#----------------------------------------------------------------------------
+def login_admin
+  login(admin: true)
 end
 
 #----------------------------------------------------------------------------

data/spec/support/macros.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Copyright (c) 2008-2013 Michael Dvorkin and contributors.
 #
 # Fat Free CRM is freely distributable under the terms of MIT license.
@@ -10,13 +12,13 @@ end
 
 #----------------------------------------------------------------------------
 def stub_task(view)
-  if view == "completed"
-    assigns[:task] = FactoryGirl.create(:task, completed_at: Time.now - 1.minute)
-  elsif view == "assigned"
-    assigns[:task] = FactoryGirl.create(:task, assignee: FactoryGirl.create(:user))
-  else
-    assigns[:task] = FactoryGirl.create(:task)
-  end
+  assigns[:task] = if view == "completed"
+                     FactoryGirl.create(:task, completed_at: Time.now - 1.minute)
+                   elsif view == "assigned"
+                     FactoryGirl.create(:task, assignee: FactoryGirl.create(:user))
+                   else
+                     FactoryGirl.create(:task)
+                   end
 end
 
 #----------------------------------------------------------------------------