fat_free_crm 0.17.3 → 0.18.0

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
     name                { FFaker::Company.name + rand(100).to_s }
     access "Public"
-    website             { FactoryGirl.generate(:website) }
+    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) }
+    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) }
+    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) }
+    updated_at          { FactoryBot.generate(:time) }
+    created_at          { FactoryBot.generate(:time) }
   end
 end

data/spec/factories/campaign_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
   factory :campaign do
     user
     name                { FFaker::Lorem.sentence[0, 64] }
@@ -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) }
+    updated_at          { FactoryBot.generate(:time) }
+    created_at          { FactoryBot.generate(:time) }
   end
 end

data/spec/factories/contact_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
   factory :contact do
     user
     lead
@@ -14,7 +14,7 @@ FactoryGirl.define do
     first_name          { FFaker::Name.first_name }
     last_name           { FFaker::Name.last_name }
     access "Public"
-    title               { FactoryGirl.generate(:title) }
+    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,16 +22,16 @@ 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) }
+    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) }
+    updated_at          { FactoryBot.generate(:time) }
+    created_at          { FactoryBot.generate(:time) }
   end
 
   factory :contact_opportunity do
@@ -39,7 +39,7 @@ FactoryGirl.define do
     opportunity
     role "foo"
     deleted_at nil
-    updated_at          { FactoryGirl.generate(:time) }
-    created_at          { FactoryGirl.generate(:time) }
+    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,20 +17,20 @@ 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"
     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) }
+    updated_at          { FactoryBot.generate(:time) }
+    created_at          { FactoryBot.generate(:time) }
   end
 
   factory :custom_field do

data/spec/factories/lead_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
   factory :lead do
     user
     campaign
@@ -14,23 +14,23 @@ FactoryGirl.define do
     last_name           { FFaker::Name.last_name }
     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
     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) }
+    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) }
+    updated_at          { FactoryBot.generate(:time) }
+    created_at          { FactoryBot.generate(:time) }
   end
 end

data/spec/factories/list_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
   factory :list do
     name "Foo List"
     url "/controller/action"

data/spec/factories/opportunity_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 :opportunity_status do |_s|
     %w[prospecting analysis presentation proposal negotiation final_review won lost].sample
   end
@@ -22,18 +22,18 @@ FactoryGirl.define do
     name                { FFaker::Lorem.sentence[0, 64] }
     access "Public"
     source              { %w[campaign cold_call conference online referral self web word_of_mouth other].sample }
-    stage               { FactoryGirl.generate(:opportunity_status) }
+    stage               { FactoryBot.generate(:opportunity_status) }
     probability         { rand(50) }
     amount              { rand(1000) }
     discount            { rand(100) }
-    closes_on           { FactoryGirl.generate(:date) }
+    closes_on           { FactoryBot.generate(:date) }
     background_info     { FFaker::Lorem.paragraph[0, 255] }
     deleted_at nil
-    updated_at          { FactoryGirl.generate(:time) }
-    created_at          { FactoryGirl.generate(:time) }
+    updated_at          { FactoryBot.generate(:time) }
+    created_at          { FactoryBot.generate(:time) }
   end
 
   factory :opportunity_in_pipeline, parent: :opportunity do
-    stage               { FactoryGirl.generate(:opportunity_open_status) }
+    stage               { FactoryBot.generate(:opportunity_open_status) }
   end
 end

data/spec/factories/sequences.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 :address do |_n|
     FFaker::Address.street_address + " " + FFaker::Address.secondary_address + "\n" + FFaker::Address.city + ", " + FFaker::AddressUS.state_abbr + " " + FFaker::AddressUS.zip_code
   end

data/spec/factories/setting_factories.rb

@@ -5,11 +5,11 @@
 # 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 :setting do
     name "foo"
     value nil
-    updated_at          { FactoryGirl.generate(:time) }
-    created_at          { FactoryGirl.generate(:time) }
+    updated_at          { FactoryBot.generate(:time) }
+    created_at          { FactoryBot.generate(:time) }
   end
 end

data/spec/factories/shared_factories.rb

@@ -5,23 +5,23 @@
 # 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 :version do
     whodunnit ""
     item                { raise "Please specify :item for the version" }
     event "create"
-    created_at          { FactoryGirl.generate(:time) }
+    created_at          { FactoryBot.generate(:time) }
   end
 
   factory :comment do
     user
     commentable         { raise "Please specify :commentable for the comment" }
-    title               { FactoryGirl.generate(:title) }
+    title               { FactoryBot.generate(:title) }
     private false
     comment             { FFaker::Lorem.paragraph }
     state "Expanded"
-    updated_at          { FactoryGirl.generate(:time) }
-    created_at          { FactoryGirl.generate(:time) }
+    updated_at          { FactoryBot.generate(:time) }
+    created_at          { FactoryBot.generate(:time) }
   end
 
   factory :email do
@@ -35,12 +35,12 @@ FactoryGirl.define do
     subject             { FFaker::Lorem.sentence }
     body                { FFaker::Lorem.paragraph[0, 255] }
     header nil
-    sent_at             { FactoryGirl.generate(:time) }
-    received_at         { FactoryGirl.generate(:time) }
+    sent_at             { FactoryBot.generate(:time) }
+    received_at         { FactoryBot.generate(:time) }
     deleted_at nil
     state "Expanded"
-    updated_at          { FactoryGirl.generate(:time) }
-    created_at          { FactoryGirl.generate(:time) }
+    updated_at          { FactoryBot.generate(:time) }
+    created_at          { FactoryBot.generate(:time) }
   end
 
   factory :address do
@@ -51,10 +51,10 @@ FactoryGirl.define do
     state               { FFaker::AddressUS.state_abbr }
     zipcode             { FFaker::AddressUS.zip_code }
     country             { FFaker::AddressUK.country }
-    full_address        { FactoryGirl.generate(:address) }
+    full_address        { FactoryBot.generate(:address) }
     address_type        { %w[Business Billing Shipping].sample }
-    updated_at          { FactoryGirl.generate(:time) }
-    created_at          { FactoryGirl.generate(:time) }
+    updated_at          { FactoryBot.generate(:time) }
+    created_at          { FactoryBot.generate(:time) }
     deleted_at nil
   end
 
@@ -62,7 +62,7 @@ FactoryGirl.define do
     user
     entity              { raise "Please specify :entity for the avatar" }
     image               { File.new(Rails.root.join('spec', 'fixtures', 'rails.png')) }
-    updated_at          { FactoryGirl.generate(:time) }
-    created_at          { FactoryGirl.generate(:time) }
+    updated_at          { FactoryBot.generate(:time) }
+    created_at          { FactoryBot.generate(:time) }
   end
 end

data/spec/factories/subscription_factories.rb

@@ -7,7 +7,7 @@
 #------------------------------------------------------------------------------
 # Read about factories at https://github.com/thoughtbot/factory_girl
 
-FactoryGirl.define do
+FactoryBot.define do
   factory :subscription do
   end
 end

data/spec/factories/tag_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
   factory :tag do
     name { FFaker::Internet.user_name }
   end

data/spec/factories/task_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
   factory :task do
     user
     asset nil
@@ -15,12 +15,12 @@ FactoryGirl.define do
     priority nil
     category            { %w[call email follow_up lunch meeting money presentation trip].sample }
     bucket "due_asap"
-    due_at              { FactoryGirl.generate(:time) }
+    due_at              { FactoryBot.generate(:time) }
     background_info     { FFaker::Lorem.paragraph[0, 255] }
     completed_at nil
     deleted_at nil
-    updated_at          { FactoryGirl.generate(:time) }
-    created_at          { FactoryGirl.generate(:time) }
+    updated_at          { FactoryBot.generate(:time) }
+    created_at          { FactoryBot.generate(:time) }
   end
 
   factory :completed_task, parent: :task do

data/spec/factories/user_factories.rb

@@ -5,13 +5,13 @@
 # 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 :user do
-    username            { FactoryGirl.generate(:username) }
+    username            { FactoryBot.generate(:username) }
     email               { FFaker::Internet.email }
     first_name          { FFaker::Name.first_name }
     last_name           { FFaker::Name.last_name }
-    title               { FactoryGirl.generate(:title) }
+    title               { FactoryBot.generate(:title) }
     company             { FFaker::Company.name }
     alt_email           { FFaker::Internet.email }
     phone               { FFaker::PhoneNumber.phone_number }
@@ -26,14 +26,14 @@ FactoryGirl.define do
     persistence_token   { SecureRandom.hex(64) }
     perishable_token    { SecureRandom.hex(10) }
     single_access_token nil
-    current_login_at    { FactoryGirl.generate(:time) }
-    last_login_at       { FactoryGirl.generate(:time) }
+    current_login_at    { FactoryBot.generate(:time) }
+    last_login_at       { FactoryBot.generate(:time) }
     last_login_ip "127.0.0.1"
     current_login_ip "127.0.0.1"
     login_count         { rand(1..100) }
     deleted_at nil
-    updated_at          { FactoryGirl.generate(:time) }
-    created_at          { FactoryGirl.generate(:time) }
+    updated_at          { FactoryBot.generate(:time) }
+    created_at          { FactoryBot.generate(:time) }
     suspended_at nil
     password "password"
     password_confirmation "password"
@@ -46,21 +46,21 @@ FactoryGirl.define do
   factory :permission do
     user
     asset               { raise "Please specify :asset for the permission" }
-    updated_at          { FactoryGirl.generate(:time) }
-    created_at          { FactoryGirl.generate(:time) }
+    updated_at          { FactoryBot.generate(:time) }
+    created_at          { FactoryBot.generate(:time) }
   end
 
   factory :preference do
     user
     name                { raise "Please specify :name for the preference" }
     value               { raise "Please specify :value for the preference" }
-    updated_at          { FactoryGirl.generate(:time) }
-    created_at          { FactoryGirl.generate(:time) }
+    updated_at          { FactoryBot.generate(:time) }
+    created_at          { FactoryBot.generate(:time) }
   end
 
   factory :group do
     name                { FFaker::Company.name }
-    updated_at          { FactoryGirl.generate(:time) }
-    created_at          { FactoryGirl.generate(:time) }
+    updated_at          { FactoryBot.generate(:time) }
+    created_at          { FactoryBot.generate(:time) }
   end
 end

data/spec/features/accounts_spec.rb

@@ -17,7 +17,7 @@ feature 'Accounts', '
   end
 
   scenario 'should view a list of accounts' do
-    2.times { |i| FactoryGirl.create(:account, name: "Account #{i}") }
+    2.times { |i| create(:account, name: "Account #{i}") }
     visit accounts_page
     expect(page).to have_content('Account 0')
     expect(page).to have_content('Account 1')
@@ -70,7 +70,7 @@ feature 'Accounts', '
   end
 
   scenario 'should view and edit an account', js: true, versioning: true do
-    FactoryGirl.create(:account, name: "A new account")
+    create(:account, name: "A new account")
     with_versioning do
       visit accounts_page
       find('div#accounts').click_link('A new account')
@@ -86,7 +86,7 @@ feature 'Accounts', '
   end
 
   scenario 'should delete an account', js: true do
-    FactoryGirl.create(:account, name: "My new account")
+    create(:account, name: "My new account")
     visit accounts_page
     find('div#accounts').click_link('My new account')
     click_link 'Delete?'
@@ -96,7 +96,7 @@ feature 'Accounts', '
   end
 
   scenario 'should search for an account', js: true do
-    2.times { |i| FactoryGirl.create(:account, name: "Account #{i}") }
+    2.times { |i| create(:account, name: "Account #{i}") }
     visit accounts_page
     expect(find('#accounts')).to have_content("Account 0")
     expect(find('#accounts')).to have_content("Account 1")
@@ -110,4 +110,17 @@ feature 'Accounts', '
     expect(find('#accounts')).not_to have_content("Account 0")
     expect(find('#accounts')).not_to have_content("Account 1")
   end
+
+  scenario 'should attach task to account', js: true, versioning: true do
+    create(:task, name: 'Task', user: @user)
+    create(:account, name: 'Account')
+    with_versioning do
+      visit accounts_page
+      expect(find('#accounts')).to have_content("Account")
+      click_link 'Account'
+      click_link 'Select Task'
+      fill_autocomplete('auto_complete_query', with: 'Ta')
+      expect(find('#tasks')).to have_content('Task re: Account')
+    end
+  end
 end