fat_free_crm 0.17.3 → 0.19.2

data/spec/controllers/users_controller_spec.rb

@@ -50,7 +50,6 @@ describe UsersController do
       it "should render the requested user as JSON" do
         expect(User).to receive(:find).and_return(current_user)
         expect_any_instance_of(User).to receive(:to_json).and_return("generated JSON")
-
         get :show, params: { id: current_user.id }
         expect(response.body).to eq("generated JSON")
       end
@@ -85,32 +84,6 @@ describe UsersController do
     end
   end
 
-  # GET /users/new
-  # GET /users/new.xml                                                     HTML
-  #----------------------------------------------------------------------------
-  describe "responding to GET new" do
-    describe "if user is allowed to sign up" do
-      it "should expose a new user as @user and render [new] template" do
-        expect(User).to receive(:can_signup?).and_return(true)
-        @user = FactoryGirl.build(:user)
-        allow(User).to receive(:new).and_return(@user)
-
-        get :new
-        expect(assigns[:user]).to eq(@user)
-        expect(response).to render_template("users/new")
-      end
-    end
-
-    describe "if user is not allowed to sign up" do
-      it "should redirect to login_path" do
-        expect(User).to receive(:can_signup?).and_return(false)
-
-        get :new
-        expect(response).to redirect_to(login_path)
-      end
-    end
-  end
-
   # GET /users/1/edit                                                      AJAX
   #----------------------------------------------------------------------------
   describe "responding to GET edit" do
@@ -138,50 +111,6 @@ describe UsersController do
     end
   end
 
-  # POST /users
-  # POST /users.xml                                                        HTML
-  #----------------------------------------------------------------------------
-  describe "responding to POST create" do
-    describe "with valid params" do
-      before(:each) do
-        @username = "none"
-        @email = @username + "@example.com"
-        @password = "secret"
-        @user = FactoryGirl.build(:user, username: @username, email: @email)
-        allow(User).to receive(:new).and_return(@user)
-      end
-
-      it "exposes a newly created user as @user and redirect to profile page" do
-        login_admin
-        post :create, params: { user: { username: @username, email: @email, password: @password, password_confirmation: @password } }
-        expect(assigns[:user]).to eq(@user)
-        expect(flash[:notice]).to match(/welcome/)
-        expect(response).to redirect_to(profile_path)
-      end
-
-      it "should redirect to login page if user signup needs approval" do
-        allow(Setting).to receive(:user_signup).and_return(:needs_approval)
-
-        post :create, params: { user: { username: @username, email: @email, password: @password, password_confirmation: @password } }
-        expect(assigns[:user]).to eq(@user)
-        expect(flash[:notice]).to match(/approval/)
-        expect(response).to redirect_to(login_path)
-      end
-    end
-
-    describe "with invalid params" do
-      it "assigns a newly created but unsaved user as @user and renders [new] template" do
-        login_admin
-        @user = FactoryGirl.build(:user, username: "", email: "")
-        allow(User).to receive(:new).and_return(@user)
-
-        post :create, params: { user: {} }
-        expect(assigns[:user]).to eq(@user)
-        expect(response).to render_template("users/new")
-      end
-    end
-  end
-
   # PUT /users/1
   # PUT /users/1.xml                                                       AJAX
   #----------------------------------------------------------------------------
@@ -253,7 +182,7 @@ describe UsersController do
     end
 
     it "should delete avatar if user chooses to use Gravatar" do
-      @avatar = FactoryGirl.create(:avatar, user: @user, entity: @user)
+      @avatar = create(:avatar, user: @user, entity: @user)
 
       put :upload_avatar, params: { id: @user.id, gravatar: 1 }, xhr: true
       expect(@user.reload.avatar).to eq(nil)
@@ -261,7 +190,7 @@ describe UsersController do
     end
 
     it "should do nothing if user hasn't specified the avatar file to upload" do
-      @avatar = FactoryGirl.create(:avatar, user: @user, entity: @user)
+      @avatar = create(:avatar, user: @user, entity: @user)
 
       put :upload_avatar, params: { id: @user.id }, xhr: true
       expect(@user.avatar).to eq(@avatar)
@@ -312,52 +241,53 @@ describe UsersController do
   #----------------------------------------------------------------------------
   describe "responding to PUT change_password" do
     before(:each) do
-      login
-      allow(User).to receive(:find).and_return(current_user)
-      allow(@current_user_session).to receive(:unauthorized_record=).and_return(current_user)
-      allow(@current_user_session).to receive(:save).and_return(current_user)
-      @user = current_user
-      @new_password = "secret?!"
+      @old_password = 'foobar123'
+      @user = FactoryBot.create(:user, password: @old_password, password_confirmation: @old_password)
+      perform_login(@user)
+      @old_encrypted_password = @user.encrypted_password
+      @new_password = 'secret?!'
     end
 
     it "should set new user password" do
-      put :change_password, params: { id: @user.id, current_password: @user.password, user: { password: @new_password, password_confirmation: @new_password } }, xhr: true
-      expect(assigns[:user]).to eq(current_user)
-      expect(current_user.password).to eq(@new_password)
-      expect(current_user.errors).to be_empty
-      expect(flash[:notice]).not_to eq(nil)
+      put :change_password, params: { id: @user.id, current_password: @old_password, user: { password: @new_password, password_confirmation: @new_password } }, xhr: true
+      expect(assigns[:user]).to eq(@user)
+      expect(assigns[:user].password).to eq('secret?!')
+      expect(assigns[:user].errors).to be_empty
+      expect(assigns[:user].reload.encrypted_password).to_not eq(@old_encrypted_password) # password change
       expect(response).to render_template("users/change_password")
     end
 
-    it "should allow to change password if current password is blank" do
-      @user.password_hash = nil
+    it "should not allow to change password if current password is blank" do
+      current_user.encrypted_password = nil
       put :change_password, params: { id: @user.id, current_password: "", user: { password: @new_password, password_confirmation: @new_password } }, xhr: true
-      expect(current_user.password).to eq(@new_password)
-      expect(current_user.errors).to be_empty
-      expect(flash[:notice]).not_to eq(nil)
+      expect(assigns[:user].password).to eq(nil)
+      expect(assigns[:user].errors.size).to eq(1) # .error_on(:current_password)
+      expect(assigns[:user].reload.encrypted_password).to eq(@old_encrypted_password) # password stays the same
       expect(response).to render_template("users/change_password")
     end
 
     it "should not change user password if password field is blank" do
-      put :change_password, params: { id: @user.id, current_password: @user.password, user: { password: "", password_confirmation: "" } }, xhr: true
+      put :change_password, params: { id: @user.id, current_password: @old_password, user: { password: "", password_confirmation: "" } }, xhr: true
       expect(assigns[:user]).to eq(current_user)
-      expect(current_user.password).to eq(@user.password) # password stays the same
-      expect(current_user.errors).to be_empty # no errors
-      expect(flash[:notice]).not_to eq(nil)
+      expect(assigns[:user].password).to eq(nil)
+      expect(assigns[:user].errors).to be_empty # no errors
+      expect(assigns[:user].reload.encrypted_password).to eq(@old_encrypted_password) # password stays the same
       expect(response).to render_template("users/change_password")
     end
 
     it "should require valid current password" do
       put :change_password, params: { id: @user.id, current_password: "what?!", user: { password: @new_password, password_confirmation: @new_password } }, xhr: true
-      expect(current_user.password).to eq(@user.password) # password stays the same
-      expect(current_user.errors.size).to eq(1) # .error_on(:current_password)
+      expect(assigns[:user].password).to eq(nil)
+      expect(assigns[:user].errors.size).to eq(1) # .error_on(:current_password)
+      expect(assigns[:user].reload.encrypted_password).to eq(@old_encrypted_password) # password stays the same
       expect(response).to render_template("users/change_password")
     end
 
     it "should require new password and password confirmation to match" do
-      put :change_password, params: { id: @user.id, current_password: @user.password, user: { password: @new_password, password_confirmation: "none" } }, xhr: true
-      expect(current_user.password).to eq(@user.password) # password stays the same
-      expect(current_user.errors.size).to eq(1) # .error_on(:current_password)
+      put :change_password, params: { id: @user.id, current_password: @old_password, user: { password: @new_password, password_confirmation: "none" } }, xhr: true
+      expect(assigns[:user].password).to eq('secret?!')
+      expect(assigns[:user].errors.size).to eq(1) # .error_on(:current_password)
+      expect(assigns[:user].reload.encrypted_password).to eq(@old_encrypted_password) # password stays the same
       expect(response).to render_template("users/change_password")
     end
   end
@@ -368,24 +298,24 @@ describe UsersController do
   describe "responding to GET opportunities_overview" do
     before(:each) do
       login
-      @user = @current_user
+      @user = current_user
       @user.update_attributes(first_name: "Apple", last_name: "Boy")
     end
 
     it "should assign @users_with_opportunities" do
-      FactoryGirl.create(:opportunity, stage: "prospecting", assignee: @user)
+      create(:opportunity, stage: "prospecting", assignee: @user)
       get :opportunities_overview, xhr: true
-      expect(assigns[:users_with_opportunities]).to eq([@current_user])
+      expect(assigns[:users_with_opportunities]).to eq([@user])
     end
 
     it "@users_with_opportunities should be ordered by name" do
-      FactoryGirl.create(:opportunity, stage: "prospecting", assignee: @user)
+      create(:opportunity, stage: "prospecting", assignee: @user)
 
-      user1 = FactoryGirl.create(:user, first_name: "Zebra", last_name: "Stripes")
-      FactoryGirl.create(:opportunity, stage: "prospecting", assignee: user1)
+      user1 = create(:user, first_name: "Zebra", last_name: "Stripes")
+      create(:opportunity, stage: "prospecting", assignee: user1)
 
-      user2 = FactoryGirl.create(:user, first_name: "Bilbo", last_name: "Magic")
-      FactoryGirl.create(:opportunity, stage: "prospecting", assignee: user2)
+      user2 = create(:user, first_name: "Bilbo", last_name: "Magic")
+      create(:opportunity, stage: "prospecting", assignee: user2)
 
       get :opportunities_overview, xhr: true
 
@@ -393,9 +323,9 @@ describe UsersController do
     end
 
     it "should assign @unassigned_opportunities with only open unassigned opportunities" do
-      @o1 = FactoryGirl.create(:opportunity, stage: "prospecting", assignee: nil)
-      @o2 = FactoryGirl.create(:opportunity, stage: "won", assignee: nil)
-      @o3 = FactoryGirl.create(:opportunity, stage: "prospecting", assignee: nil)
+      @o1 = create(:opportunity, stage: "prospecting", assignee: nil)
+      @o2 = create(:opportunity, stage: "won", assignee: nil)
+      @o3 = create(:opportunity, stage: "prospecting", assignee: nil)
 
       get :opportunities_overview, xhr: true
 
@@ -404,9 +334,9 @@ describe UsersController do
     end
 
     it "@unassigned_opportunities should be ordered by stage" do
-      @o1 = FactoryGirl.create(:opportunity, stage: "proposal", assignee: nil)
-      @o2 = FactoryGirl.create(:opportunity, stage: "prospecting", assignee: nil)
-      @o3 = FactoryGirl.create(:opportunity, stage: "negotiation", assignee: nil)
+      @o1 = create(:opportunity, stage: "proposal", assignee: nil)
+      @o2 = create(:opportunity, stage: "prospecting", assignee: nil)
+      @o3 = create(:opportunity, stage: "negotiation", assignee: nil)
 
       get :opportunities_overview, xhr: true
 
@@ -419,7 +349,7 @@ describe UsersController do
     end
 
     it "should not include users who have no open assigned opportunities" do
-      FactoryGirl.create(:opportunity, stage: "won", assignee: @user)
+      create(:opportunity, stage: "won", assignee: @user)
 
       get :opportunities_overview, xhr: true
       expect(assigns[:users_with_opportunities]).to eq([])

data/spec/factories/account_factories.rb

@@ -5,36 +5,36 @@
 # Fat Free CRM is freely distributable under the terms of MIT license.
 # See MIT-LICENSE file or http://www.opensource.org/licenses/mit-license.php
 #------------------------------------------------------------------------------
-FactoryGirl.define do
+FactoryBot.define do
   factory :account do
     user
-    assigned_to nil
+    assigned_to         { nil }
     name                { FFaker::Company.name + rand(100).to_s }
-    access "Public"
-    website             { FactoryGirl.generate(:website) }
+    access              { "Public" }
+    website             { FactoryBot.generate(:website) }
     email               { FFaker::Internet.email }
     toll_free_phone     { FFaker::PhoneNumber.phone_number }
     phone               { FFaker::PhoneNumber.phone_number }
     fax                 { FFaker::PhoneNumber.phone_number }
     background_info     { FFaker::Lorem.paragraph[0, 255] }
-    deleted_at nil
-    updated_at          { FactoryGirl.generate(:time) }
-    created_at          { FactoryGirl.generate(:time) }
+    deleted_at          { nil }
+    updated_at          { FactoryBot.generate(:time) }
+    created_at          { FactoryBot.generate(:time) }
   end
 
   factory :account_contact do
     account
     contact
-    deleted_at nil
-    updated_at          { FactoryGirl.generate(:time) }
-    created_at          { FactoryGirl.generate(:time) }
+    deleted_at          { nil }
+    updated_at          { FactoryBot.generate(:time) }
+    created_at          { FactoryBot.generate(:time) }
   end
 
   factory :account_opportunity do
     account
     opportunity
-    deleted_at nil
-    updated_at          { FactoryGirl.generate(:time) }
-    created_at          { FactoryGirl.generate(:time) }
+    deleted_at          { nil }
+    updated_at          { FactoryBot.generate(:time) }
+    created_at          { FactoryBot.generate(:time) }
   end
 end

data/spec/factories/campaign_factories.rb

@@ -5,12 +5,12 @@
 # Fat Free CRM is freely distributable under the terms of MIT license.
 # See MIT-LICENSE file or http://www.opensource.org/licenses/mit-license.php
 #------------------------------------------------------------------------------
-FactoryGirl.define do
+FactoryBot.define do
   factory :campaign do
     user
     name                { FFaker::Lorem.sentence[0, 64] }
-    assigned_to nil
-    access "Public"
+    assigned_to         { nil }
+    access              { "Public" }
     status              { %w[planned started completed planned started completed on_hold called_off].sample }
     budget              { rand(500) }
     target_leads        { rand(200) }
@@ -19,12 +19,12 @@ FactoryGirl.define do
     leads_count         { rand(200) }
     opportunities_count { rand(20) }
     revenue             { rand(1000) }
-    ends_on             { FactoryGirl.generate(:date) }
-    starts_on           { FactoryGirl.generate(:date) }
+    ends_on             { FactoryBot.generate(:date) }
+    starts_on           { FactoryBot.generate(:date) }
     objectives          { FFaker::Lorem.paragraph[0, 255] }
     background_info     { FFaker::Lorem.paragraph[0, 255] }
-    deleted_at nil
-    updated_at          { FactoryGirl.generate(:time) }
-    created_at          { FactoryGirl.generate(:time) }
+    deleted_at          { nil }
+    updated_at          { FactoryBot.generate(:time) }
+    created_at          { FactoryBot.generate(:time) }
   end
 end

data/spec/factories/contact_factories.rb

@@ -5,16 +5,16 @@
 # Fat Free CRM is freely distributable under the terms of MIT license.
 # See MIT-LICENSE file or http://www.opensource.org/licenses/mit-license.php
 #------------------------------------------------------------------------------
-FactoryGirl.define do
+FactoryBot.define do
   factory :contact do
     user
     lead
-    assigned_to nil
-    reports_to nil
+    assigned_to         { nil }
+    reports_to          { nil }
     first_name          { FFaker::Name.first_name }
     last_name           { FFaker::Name.last_name }
-    access "Public"
-    title               { FactoryGirl.generate(:title) }
+    access              { "Public" }
+    title               { FactoryBot.generate(:title) }
     department          { FFaker::Name.name + " Dept." }
     source              { %w[campaign cold_call conference online referral self web word_of_mouth other].sample }
     email               { FFaker::Internet.email }
@@ -22,24 +22,24 @@ FactoryGirl.define do
     phone               { FFaker::PhoneNumber.phone_number }
     mobile              { FFaker::PhoneNumber.phone_number }
     fax                 { FFaker::PhoneNumber.phone_number }
-    blog                { FactoryGirl.generate(:website) }
-    facebook            { FactoryGirl.generate(:website) }
-    linkedin            { FactoryGirl.generate(:website) }
-    twitter             { FactoryGirl.generate(:website) }
-    do_not_call false
-    born_on "1992-10-10"
+    blog                { FactoryBot.generate(:website) }
+    facebook            { FactoryBot.generate(:website) }
+    linkedin            { FactoryBot.generate(:website) }
+    twitter             { FactoryBot.generate(:website) }
+    do_not_call         { false }
+    born_on             { "1992-10-10" }
     background_info     { FFaker::Lorem.paragraph[0, 255] }
-    deleted_at nil
-    updated_at          { FactoryGirl.generate(:time) }
-    created_at          { FactoryGirl.generate(:time) }
+    deleted_at          { nil }
+    updated_at          { FactoryBot.generate(:time) }
+    created_at          { FactoryBot.generate(:time) }
   end
 
   factory :contact_opportunity do
     contact
     opportunity
-    role "foo"
-    deleted_at nil
-    updated_at          { FactoryGirl.generate(:time) }
-    created_at          { FactoryGirl.generate(:time) }
+    role                { "foo" }
+    deleted_at          { nil }
+    updated_at          { FactoryBot.generate(:time) }
+    created_at          { FactoryBot.generate(:time) }
   end
 end

data/spec/factories/field_factories.rb

@@ -5,7 +5,7 @@
 # Fat Free CRM is freely distributable under the terms of MIT license.
 # See MIT-LICENSE file or http://www.opensource.org/licenses/mit-license.php
 #------------------------------------------------------------------------------
-FactoryGirl.define do
+FactoryBot.define do
   sequence :klass_name do |_x|
     %w[Contact Account Opportunity Lead Campaign].sample
   end
@@ -17,23 +17,24 @@ FactoryGirl.define do
   end
 
   factory :field_group do
-    klass_name          { FactoryGirl.generate(:klass_name) }
-    label               { FactoryGirl.generate(:field_label) }
+    klass_name          { FactoryBot.generate(:klass_name) }
+    label               { FactoryBot.generate(:field_label) }
     tag
   end
 
   factory :field do
-    type "Field"
+    type { "Field" }
     field_group
-    position            { FactoryGirl.generate(:field_position) }
-    label               { FactoryGirl.generate(:field_label) }
+    position            { FactoryBot.generate(:field_position) }
+    label               { FactoryBot.generate(:field_label) }
     name                { |f| f.label.downcase.gsub(/[^a-z0-9]+/, '_') }
-    as "string"
-    updated_at          { FactoryGirl.generate(:time) }
-    created_at          { FactoryGirl.generate(:time) }
+    as { "string" }
+    minlength           { rand(100) }
+    updated_at          { FactoryBot.generate(:time) }
+    created_at          { FactoryBot.generate(:time) }
   end
 
   factory :custom_field do
-    type "CustomField"
+    type { "CustomField" }
   end
 end

data/spec/factories/lead_factories.rb

@@ -5,32 +5,32 @@
 # Fat Free CRM is freely distributable under the terms of MIT license.
 # See MIT-LICENSE file or http://www.opensource.org/licenses/mit-license.php
 #------------------------------------------------------------------------------
-FactoryGirl.define do
+FactoryBot.define do
   factory :lead do
     user
     campaign
-    assigned_to nil
+    assigned_to         { nil }
     first_name          { FFaker::Name.first_name }
     last_name           { FFaker::Name.last_name }
-    access "Public"
+    access              { "Public" }
     company             { FFaker::Company.name }
-    title               { FactoryGirl.generate(:title) }
+    title               { FactoryBot.generate(:title) }
     source              { %w[campaign cold_call conference online referral self web word_of_mouth other].sample }
     status              { %w[new contacted converted rejected].sample }
-    rating 1
+    rating              { 1 }
     referred_by         { FFaker::Name.name }
-    do_not_call false
-    blog                { FactoryGirl.generate(:website) }
-    linkedin            { FactoryGirl.generate(:website) }
-    facebook            { FactoryGirl.generate(:website) }
-    twitter             { FactoryGirl.generate(:website) }
+    do_not_call         { false }
+    blog                { FactoryBot.generate(:website) }
+    linkedin            { FactoryBot.generate(:website) }
+    facebook            { FactoryBot.generate(:website) }
+    twitter             { FactoryBot.generate(:website) }
     email               { FFaker::Internet.email }
     alt_email           { FFaker::Internet.email }
     phone               { FFaker::PhoneNumber.phone_number }
     mobile              { FFaker::PhoneNumber.phone_number }
     background_info     { FFaker::Lorem.paragraph[0, 255] }
-    deleted_at nil
-    updated_at          { FactoryGirl.generate(:time) }
-    created_at          { FactoryGirl.generate(:time) }
+    deleted_at          { nil }
+    updated_at          { FactoryBot.generate(:time) }
+    created_at          { FactoryBot.generate(:time) }
   end
 end