fat_free_crm 0.17.2 → 0.19.0

data/spec/features/tasks_spec.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
 #------------------------------------------------------------------------------
-require File.expand_path("../acceptance_helper.rb", __FILE__)
+require File.expand_path('acceptance_helper.rb', __dir__)
 
 feature 'Tasks', '
   In order to increase keep track of things
@@ -17,7 +17,7 @@ feature 'Tasks', '
   end
 
   scenario 'should view a list of tasks which are assigned to the logged in user' do
-    4.times { |i| FactoryGirl.create(:task, name: "Task #{i}", user: @user) }
+    4.times { |i| create(:task, name: "Task #{i}", user: @user) }
     visit tasks_page
     expect(page).to have_content('Task 0')
     expect(page).to have_content('Task 1')
@@ -45,7 +45,7 @@ feature 'Tasks', '
   end
 
   scenario 'creating a task for another user', js: true do
-    FactoryGirl.create(:user, first_name: 'Another', last_name: 'User')
+    create(:user, first_name: 'Another', last_name: 'User')
     with_versioning do
       visit tasks_page
       click_link 'Create Task'
@@ -72,7 +72,7 @@ feature 'Tasks', '
   end
 
   scenario 'should view and edit a task', js: true do
-    FactoryGirl.create(:task, id: 42, name: 'Example Task', user: @user)
+    create(:task, id: 42, name: 'Example Task', user: @user)
     with_versioning do
       visit tasks_page
       click_edit_for_task_id(42)
@@ -85,7 +85,7 @@ feature 'Tasks', '
   end
 
   scenario 'should delete a task', js: true do
-    FactoryGirl.create(:task, id: 42, name: 'Outdated Task', user: @user)
+    create(:task, id: 42, name: 'Outdated Task', user: @user)
     visit tasks_page
     click_delete_for_task_id(42)
     click_link 'Tasks'

data/spec/helpers/admin/field_groups_helper_spec.rb

@@ -9,7 +9,7 @@ require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
 
 describe Admin::FieldGroupsHelper do
   it "should return the correct info text about tag restrictions and classes for groups" do
-    field_group = FactoryGirl.build(:field_group, klass_name: "Contact", label: "Test Field Group")
+    field_group = create(:field_group, klass_name: "Contact", label: "Test Field Group")
     html = helper.field_group_subtitle(field_group)
     expect(html).to include("Test Field Group")
     expect(html).to include("This field group applies to contacts tagged with")

data/spec/helpers/application_helper_spec.rb

@@ -36,7 +36,7 @@ describe ApplicationHelper do
   end
 
   it "link_to_discard" do
-    lead = FactoryGirl.create(:lead)
+    lead = create(:lead)
     allow(controller.request).to receive(:fullpath).and_return("http://www.example.com/leads/#{lead.id}")
 
     link = helper.link_to_discard(lead)

data/spec/helpers/tasks_helper_spec.rb

@@ -10,7 +10,7 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 describe TasksHelper do
   describe "responding with generated links" do
     before do
-      @task = FactoryGirl.create(:task)
+      @task = create(:task)
     end
 
     it "should render link to uncomplete of a task" do

data/spec/helpers/users_helper_spec.rb

@@ -8,9 +8,9 @@
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe UsersHelper do
-  let(:myself) { FactoryGirl.create(:user, id: 54) }
-  let(:user1) { FactoryGirl.create(:user,  id: 60, first_name: 'Bob', last_name: "Hope") }
-  let(:user2) { FactoryGirl.create(:user,  id: 75, first_name: 'Billy', last_name: "Joel") }
+  let(:myself) { create(:user, id: 54) }
+  let(:user1) { create(:user,  id: 60, first_name: 'Bob', last_name: "Hope") }
+  let(:user2) { create(:user,  id: 75, first_name: 'Billy', last_name: "Joel") }
 
   describe "user_options_for_select" do
     it "includes 'myself'" do
@@ -24,16 +24,16 @@ describe UsersHelper do
 
   describe "user_select" do
     it "includes blank option" do
-      expect(user_select(:lead, [user1, user2], myself)).to match(/<option value="">Unassigned<\/option>/)
+      expect(user_select(:lead, [user1, user2], myself)).to match(%r{<option value="">Unassigned</option>})
     end
 
     it "includes myself" do
-      expect(user_select(:lead, [user1, user2], myself)).to match(/<option value="54">Myself<\/option>/)
+      expect(user_select(:lead, [user1, user2], myself)).to match(%r{<option value="54">Myself</option>})
     end
 
     it "includes other users" do
-      expect(user_select(:lead, [user1, user2], myself)).to match(/<option value="60">Bob Hope<\/option>/)
-      expect(user_select(:lead, [user1, user2], myself)).to match(/<option value="75">Billy Joel<\/option>/)
+      expect(user_select(:lead, [user1, user2], myself)).to match(%r{<option value="60">Bob Hope</option>})
+      expect(user_select(:lead, [user1, user2], myself)).to match(%r{<option value="75">Billy Joel</option>})
     end
   end
 end

data/spec/lib/comment_extensions_spec.rb

@@ -9,18 +9,24 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe FatFreeCRM::CommentExtensions do
   describe "add_comment_by_user" do
-    let(:user) { FactoryGirl.create(:user) }
+    let(:user) { create(:user) }
 
-    before :each do
-      build_model(:commentable_entity) do
-        string :subscribed_users
-        serialize :subscribed_users, Set
+    before do
+      ActiveRecord::Base.connection.create_table(:commentable_entities) do |t|
+        t.string :subscribed_users
+      end
 
+      class CommentableEntity < ActiveRecord::Base
+        serialize :subscribed_users, Set
         acts_as_commentable
         uses_comment_extensions
       end
     end
 
+    after do
+      ActiveRecord::Base.connection.drop_table(:commentable_entities)
+    end
+
     it "should create a comment for user" do
       entity = CommentableEntity.create
       entity.add_comment_by_user("I will handle this one", user)

data/spec/lib/errors_spec.rb

@@ -13,7 +13,7 @@ describe 'ActiveModel Validation Errors' do
       validates_presence_of :title, message: '^Missing title'
     end
 
-    adam = Adam.create(username: 'adam', email: 'adam@example.com')
+    adam = Adam.create(username: 'adam', email: 'adam@example.com', password: 'ouchmyrib')
     expect(adam.valid?).to eq(false)
     expect(adam.errors[:title]).to eq(['^Missing title'])
     expect(adam.errors.full_messages[0]).to eq('Missing title')
@@ -24,7 +24,7 @@ describe 'ActiveModel Validation Errors' do
       validates_presence_of :title, message: 'missing'
     end
 
-    eve = Eve.create(username: 'eve', email: 'eve@example.com')
+    eve = Eve.create(username: 'eve', email: 'eve@example.com', password: 'doyoulikeapples')
     expect(eve.valid?).to eq(false)
     expect(eve.errors[:title]).to eq(['missing'])
     expect(eve.errors.full_messages[0]).to eq('Title missing')

data/spec/lib/mail_processor/base_spec.rb

@@ -136,19 +136,19 @@ describe FatFreeCRM::MailProcessor::Base do
     end
 
     it "should find non-suspended user that matches From: field" do
-      @user = FactoryGirl.create(:user, email: @from.first, suspended_at: nil)
+      @user = create(:user, email: @from.first, suspended_at: nil)
       expect(@crawler.send(:sent_from_known_user?, @email)).to eq(true)
       expect(@crawler.instance_variable_get("@sender")).to eq(@user)
     end
 
     it "should not find user if his email doesn't match From: field" do
-      FactoryGirl.create(:user, email: "nobody@example.com")
+      create(:user, email: "nobody@example.com")
       expect(@crawler.send(:sent_from_known_user?, @email)).to eq(false)
       expect(@crawler.instance_variable_get("@sender")).to eq(nil)
     end
 
     it "should not find user if his email matches From: field but is suspended" do
-      FactoryGirl.create(:user, email: @from.first, suspended_at: Time.now)
+      create(:user, email: @from.first, suspended_at: Time.now)
       expect(@crawler.send(:sent_from_known_user?, @email)).to eq(false)
       expect(@crawler.instance_variable_get("@sender")).to eq(nil)
     end

data/spec/lib/mail_processor/comment_replies_spec.rb

@@ -23,7 +23,7 @@ describe FatFreeCRM::MailProcessor::CommentReplies do
   #------------------------------------------------------------------------------
   describe "Processing new emails" do
     before do
-      FactoryGirl.create(:user, email: "aaron@example.com")
+      create(:user, email: "aaron@example.com")
     end
 
     before(:each) do
@@ -32,7 +32,7 @@ describe FatFreeCRM::MailProcessor::CommentReplies do
     end
 
     it "should attach a new comment to a contact" do
-      @contact = FactoryGirl.create(:contact)
+      @contact = create(:contact)
       comment_reply = "This is a new comment reply via email"
 
       mail = Mail.new from:    "Aaron Assembler <aaron@example.com>",
@@ -50,7 +50,7 @@ describe FatFreeCRM::MailProcessor::CommentReplies do
     end
 
     it "should attach a new comment to an opportunity, using the 'op' shortcut in subject" do
-      @opportunity = FactoryGirl.create(:opportunity)
+      @opportunity = create(:opportunity)
       comment_reply = "This is a new comment reply via email"
 
       mail = Mail.new from:    "Aaron Assembler <aaron@example.com>",

data/spec/lib/mail_processor/dropbox_spec.rb

@@ -28,7 +28,7 @@ describe FatFreeCRM::MailProcessor::Dropbox do
 
     it "should discard a message if it's invalid" do
       expect(@crawler).to receive(:is_valid?).once.and_return(false)
-      FactoryGirl.create(:user, email: "aaron@example.com")
+      create(:user, email: "aaron@example.com")
       expect(@crawler).not_to receive(:archive)
       expect(@crawler).to receive(:discard).once
       @crawler.run
@@ -42,7 +42,7 @@ describe FatFreeCRM::MailProcessor::Dropbox do
     end
 
     it "should process a message if it finds the user" do
-      FactoryGirl.create(:user, email: "aaron@example.com")
+      create(:user, email: "aaron@example.com")
       expect(@crawler).to receive(:archive).once
       expect(@crawler).not_to receive(:discard)
       @crawler.run
@@ -54,12 +54,12 @@ describe FatFreeCRM::MailProcessor::Dropbox do
     before(:each) do
       mock_connect
       mock_disconnect
-      FactoryGirl.create(:user, email: "aaron@example.com")
+      create(:user, email: "aaron@example.com")
     end
 
     it "should find the named asset and attach the email message" do
       mock_message(DROPBOX_EMAILS[:first_line])
-      @campaign = FactoryGirl.create(:campaign, name: "Got milk!?")
+      @campaign = create(:campaign, name: "Got milk!?")
       expect(@crawler).to receive(:archive).once
       expect(@crawler).not_to receive(:with_recipients)
       @crawler.run
@@ -82,7 +82,7 @@ describe FatFreeCRM::MailProcessor::Dropbox do
 
     it "should find the lead and attach the email message" do
       mock_message(DROPBOX_EMAILS[:first_line_lead])
-      @lead = FactoryGirl.create(:lead, first_name: "Cindy", last_name: "Cluster")
+      @lead = create(:lead, first_name: "Cindy", last_name: "Cluster")
       expect(@crawler).to receive(:archive).once
       expect(@crawler).not_to receive(:with_recipients)
       @crawler.run
@@ -106,7 +106,7 @@ describe FatFreeCRM::MailProcessor::Dropbox do
 
     it "should find the contact and attach the email message" do
       mock_message(DROPBOX_EMAILS[:first_line_contact])
-      @contact = FactoryGirl.create(:contact, first_name: "Cindy", last_name: "Cluster")
+      @contact = create(:contact, first_name: "Cindy", last_name: "Cluster")
       expect(@crawler).to receive(:archive).once
       expect(@crawler).not_to receive(:with_recipients)
       @crawler.run
@@ -141,11 +141,11 @@ describe FatFreeCRM::MailProcessor::Dropbox do
       mock_connect
       mock_disconnect
       mock_message(DROPBOX_EMAILS[:plain])
-      FactoryGirl.create(:user, email: "aaron@example.com")
+      create(:user, email: "aaron@example.com")
     end
 
     it "should find the asset and attach the email message" do
-      @lead = FactoryGirl.create(:lead, email: "ben@example.com", access: "Public")
+      @lead = create(:lead, email: "ben@example.com", access: "Public")
       expect(@crawler).to receive(:archive).once
       expect(@crawler).not_to receive(:with_forwarded_recipient)
       @crawler.run
@@ -169,12 +169,12 @@ describe FatFreeCRM::MailProcessor::Dropbox do
     before(:each) do
       mock_connect
       mock_disconnect
-      FactoryGirl.create(:user, email: "aaron@example.com")
+      create(:user, email: "aaron@example.com")
       mock_message(DROPBOX_EMAILS[:forwarded])
     end
 
     it "should find the asset and attach the email message" do
-      @lead = FactoryGirl.create(:lead, email: "ben@example.com", access: "Public")
+      @lead = create(:lead, email: "ben@example.com", access: "Public")
       expect(@crawler).to receive(:archive).once
       @crawler.run
 
@@ -187,7 +187,7 @@ describe FatFreeCRM::MailProcessor::Dropbox do
       timezone = ActiveRecord::Base.default_timezone
       begin
         ActiveRecord::Base.default_timezone = :utc
-        @lead = FactoryGirl.create(:lead, email: "ben@example.com", access: "Public", updated_at: 5.day.ago)
+        @lead = create(:lead, email: "ben@example.com", access: "Public", updated_at: 5.day.ago)
 
         @crawler.run
         expect(@lead.reload.updated_at.to_i).to be >= now.to_i
@@ -197,7 +197,7 @@ describe FatFreeCRM::MailProcessor::Dropbox do
     end
 
     it "should change lead's status (:new => :contacted)" do
-      @lead = FactoryGirl.create(:lead, email: "ben@example.com", access: "Public", status: "new")
+      @lead = create(:lead, email: "ben@example.com", access: "Public", status: "new")
 
       @crawler.run
       expect(@lead.reload.status).to eq("contacted")
@@ -219,13 +219,13 @@ describe FatFreeCRM::MailProcessor::Dropbox do
       @settings = @crawler.instance_variable_get("@settings")
       @settings[:address_aliases] = ["dropbox@example.com"]
 
-      FactoryGirl.create(:user, email: "aaron@example.com")
+      create(:user, email: "aaron@example.com")
       mock_message(DROPBOX_EMAILS[:forwarded])
     end
 
     it "should not match the dropbox email address if routed to an alias" do
-      @lead = FactoryGirl.create(:lead, email: "ben@example.com", access: "Public")
-      @lead_dropbox = FactoryGirl.create(:lead, email: "dropbox@example.com", access: "Public")
+      @lead = create(:lead, email: "ben@example.com", access: "Public")
+      @lead_dropbox = create(:lead, email: "dropbox@example.com", access: "Public")
 
       expect(@crawler).to receive(:archive).once
       @crawler.run
@@ -240,7 +240,7 @@ describe FatFreeCRM::MailProcessor::Dropbox do
     before(:each) do
       mock_connect
       mock_disconnect
-      FactoryGirl.create(:user, email: "aaron@example.com")
+      create(:user, email: "aaron@example.com")
     end
 
     it "should create a contact from the email recipient (To: recipient, Bcc: dropbox)" do
@@ -280,7 +280,7 @@ describe FatFreeCRM::MailProcessor::Dropbox do
     it "should extract text and strip tags from multipart text/html" do
       text = @dropbox.send(:plain_text_body, Mail.new(DROPBOX_EMAILS[:html]))
       expect(text).to be_present
-      expect(text).not_to match(/<\/?[^>]*>/)
+      expect(text).not_to match(%r{</?[^>]*>})
     end
   end
 

data/spec/lib/mail_processor/sample_emails/dropbox.rb

@@ -17,7 +17,7 @@ DROPBOX_EMAILS = {
     #{FFaker::Lorem.paragraph}
 
     Aaron
-EMAIL
+  EMAIL
 
   html: <<~EMAIL,
     From: Aaron Assembler <aaron@example.com>
@@ -34,7 +34,7 @@ EMAIL
         <p>Aaron</p>
       </body>
     </html>
-EMAIL
+  EMAIL
 
   first_line: <<~EMAIL,
     From: Aaron Assembler <aaron@example.com>
@@ -48,7 +48,7 @@ EMAIL
     #{FFaker::Lorem.paragraph}
 
     Aaron
-EMAIL
+  EMAIL
 
   first_line_lead: <<~EMAIL,
     From: Aaron Assembler <aaron@example.com>
@@ -62,7 +62,7 @@ EMAIL
     #{FFaker::Lorem.paragraph}
 
     Aaron
-EMAIL
+  EMAIL
 
   first_line_contact: <<~EMAIL,
     From: Aaron Assembler <aaron@example.com>
@@ -76,7 +76,7 @@ EMAIL
     #{FFaker::Lorem.paragraph}
 
     Aaron
-EMAIL
+  EMAIL
 
   forwarded: <<~EMAIL,
     From: Aaron Assembler <aaron@example.com>
@@ -95,9 +95,9 @@ EMAIL
     #{FFaker::Lorem.paragraph}
 
     Ben
-EMAIL
+  EMAIL
 
-  multipart: <<~EMAIL,
+  multipart: <<~EMAIL
     From: Aaron Assembler <aaron@example.com>
     To: Ben Bootloader <ben@example.com>
     Subject: Hi there
@@ -169,5 +169,5 @@ EMAIL
     ADpMhSwQ4p2Bz9o8V84oX868ufPn0KNLn64hAgA7
 
     --_006_200DA2FF7EAFC04BAD979DB9CF293BB365151E88CLEARWATERtesta_--
-EMAIL
+  EMAIL
 }

data/spec/lib/permissions_spec.rb

@@ -8,12 +8,17 @@
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe FatFreeCRM::Permissions do
-  before :each do
-    build_model(:user_with_permission) do
+  before do
+    ActiveRecord::Base.connection.create_table(:user_with_permissions) do |t|
+      t.string :access
+    end
+    class UserWithPermission < ActiveRecord::Base
       uses_user_permissions
-      string :access
     end
   end
+  after do
+    ActiveRecord::Base.connection.drop_table(:user_with_permissions)
+  end
 
   describe "initialization" do
     it "should add 'has_many permissions' to the model" do
@@ -44,8 +49,8 @@ describe FatFreeCRM::Permissions do
     end
 
     it "should replace existing permissions" do
-      @entity.permissions << FactoryGirl.create(:permission, user_id: 1, asset: @entity)
-      @entity.permissions << FactoryGirl.create(:permission, user_id: 2, asset: @entity)
+      @entity.permissions << create(:permission, user_id: 1, asset: @entity)
+      @entity.permissions << create(:permission, user_id: 2, asset: @entity)
       @entity.user_ids = %w[2 3]
       @entity.save!
       expect(@entity.permissions.size).to eq(2)
@@ -73,8 +78,8 @@ describe FatFreeCRM::Permissions do
     end
 
     it "should replace existing permissions" do
-      @entity.permissions << FactoryGirl.build(:permission, group_id: 1, user_id: nil, asset: @entity)
-      @entity.permissions << FactoryGirl.build(:permission, group_id: 2, user_id: nil, asset: @entity)
+      @entity.permissions << build(:permission, group_id: 1, user_id: nil, asset: @entity)
+      @entity.permissions << build(:permission, group_id: 2, user_id: nil, asset: @entity)
       expect(@entity.permissions.size).to eq(2)
       @entity.group_ids = ['3']
       @entity.save!
@@ -89,19 +94,19 @@ describe FatFreeCRM::Permissions do
       @entity = UserWithPermission.create
     end
     it "should delete all permissions if access is set to Public" do
-      perm = FactoryGirl.create(:permission, user_id: 1, asset: @entity)
+      perm = create(:permission, user_id: 1, asset: @entity)
       expect(perm).to receive(:destroy)
       expect(Permission).to receive(:where).with(asset_id: @entity.id, asset_type: @entity.class.to_s).and_return([perm])
       @entity.update_attribute(:access, 'Public')
     end
     it "should delete all permissions if access is set to Private" do
-      perm = FactoryGirl.create(:permission, user_id: 1, asset: @entity)
+      perm = create(:permission, user_id: 1, asset: @entity)
       expect(perm).to receive(:destroy)
       expect(Permission).to receive(:where).with(asset_id: @entity.id, asset_type: @entity.class.to_s).and_return([perm])
       @entity.update_attribute(:access, 'Private')
     end
     it "should not remove permissions if access is set to Shared" do
-      perm = FactoryGirl.create(:permission, user_id: 1, asset: @entity)
+      perm = create(:permission, user_id: 1, asset: @entity)
       expect(perm).not_to receive(:destroy)
       @entity.permissions << perm
       expect(Permission).not_to receive(:find_all_by_asset_id)
@@ -110,24 +115,6 @@ describe FatFreeCRM::Permissions do
     end
   end
 
-  describe "save_with_permissions" do
-    it "should raise deprecation warning and call save" do
-      entity = UserWithPermission.new
-      expect(ActiveSupport::Deprecation).to receive(:warn)
-      expect(entity).to receive(:save)
-      entity.save_with_permissions
-    end
-  end
-
-  describe "update_with_permissions" do
-    it "should raise deprecation warning and call update_attributes" do
-      entity = UserWithPermission.new
-      expect(ActiveSupport::Deprecation).to receive(:warn)
-      expect(entity).to receive(:update_attributes).with({})
-      entity.update_with_permissions({})
-    end
-  end
-
   describe "save_with_model_permissions" do
     it "should copy permissions from original model" do
       entity = UserWithPermission.new