fat_free_crm 0.17.2 → 0.19.0

data/spec/factories/list_factories.rb

@@ -5,9 +5,9 @@
 # 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"
+    name { "Foo List" }
+    url { "/controller/action" }
   end
 end

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
@@ -18,22 +18,22 @@ FactoryGirl.define do
     user
     campaign
     account
-    assigned_to nil
+    assigned_to         { nil }
     name                { FFaker::Lorem.sentence[0, 64] }
-    access "Public"
+    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) }
+    deleted_at          { nil }
+    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) }
+    name                { "foo" }
+    value               { nil }
+    updated_at          { FactoryBot.generate(:time) }
+    created_at          { FactoryBot.generate(:time) }
   end
 end

data/spec/factories/shared_factories.rb

@@ -5,23 +5,25 @@
 # 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 ""
+    whodunnit           { "" }
     item                { raise "Please specify :item for the version" }
-    event "create"
-    created_at          { FactoryGirl.generate(:time) }
+    event               { "create" }
+    created_at          { FactoryBot.generate(:time) }
   end
 
   factory :comment do
     user
     commentable         { raise "Please specify :commentable for the comment" }
-    title               { FactoryGirl.generate(:title) }
-    private false
+    title               { FactoryBot.generate(:title) }
+
+    private             { false }
+
     comment             { FFaker::Lorem.paragraph }
-    state "Expanded"
-    updated_at          { FactoryGirl.generate(:time) }
-    created_at          { FactoryGirl.generate(:time) }
+    state               { "Expanded" }
+    updated_at          { FactoryBot.generate(:time) }
+    created_at          { FactoryBot.generate(:time) }
   end
 
   factory :email do
@@ -31,16 +33,16 @@ FactoryGirl.define do
     sent_from           { FFaker::Internet.email }
     sent_to             { FFaker::Internet.email }
     cc                  { FFaker::Internet.email }
-    bcc nil
+    bcc                 { nil }
     subject             { FFaker::Lorem.sentence }
     body                { FFaker::Lorem.paragraph[0, 255] }
-    header nil
-    sent_at             { FactoryGirl.generate(:time) }
-    received_at         { FactoryGirl.generate(:time) }
-    deleted_at nil
-    state "Expanded"
-    updated_at          { FactoryGirl.generate(:time) }
-    created_at          { FactoryGirl.generate(:time) }
+    header              { nil }
+    sent_at             { FactoryBot.generate(:time) }
+    received_at         { FactoryBot.generate(:time) }
+    deleted_at          { nil }
+    state               { "Expanded" }
+    updated_at          { FactoryBot.generate(:time) }
+    created_at          { FactoryBot.generate(:time) }
   end
 
   factory :address do
@@ -51,18 +53,18 @@ 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) }
-    deleted_at nil
+    updated_at          { FactoryBot.generate(:time) }
+    created_at          { FactoryBot.generate(:time) }
+    deleted_at          { nil }
   end
 
   factory :avatar 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,22 +5,22 @@
 # 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
-    assigned_to nil
-    completed_by nil
+    asset               { nil }
+    assigned_to         { nil }
+    completed_by        { nil }
     name                { FFaker::Lorem.sentence[0, 64] }
-    priority nil
+    priority            { nil }
     category            { %w[call email follow_up lunch meeting money presentation trip].sample }
-    bucket "due_asap"
-    due_at              { FactoryGirl.generate(:time) }
+    bucket              { "due_asap" }
+    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) }
+    completed_at        { nil }
+    deleted_at          { nil }
+    updated_at          { FactoryBot.generate(:time) }
+    created_at          { FactoryBot.generate(:time) }
   end
 
   factory :completed_task, parent: :task do

data/spec/factories/user_factories.rb

@@ -5,62 +5,59 @@
 # 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 }
     mobile              { FFaker::PhoneNumber.phone_number }
-    aim nil
-    yahoo nil
-    google nil
-    skype nil
-    admin false
-    password_hash       { SecureRandom.hex(64) }
+    aim                 { nil }
+    yahoo               { nil }
+    google              { nil }
+    skype               { nil }
+    admin               { false }
+    encrypted_password  { SecureRandom.hex(64) }
     password_salt       { SecureRandom.hex(64) }
-    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) }
-    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) }
-    suspended_at nil
-    password "password"
-    password_confirmation "password"
+    last_sign_in_at     { FactoryBot.generate(:time) }
+    current_sign_in_at  { FactoryBot.generate(:time) }
+    last_sign_in_ip     { "127.0.0.1" }
+    current_sign_in_ip  { "127.0.0.1" }
+    sign_in_count       { rand(1..100) }
+    deleted_at          { nil }
+    updated_at          { FactoryBot.generate(:time) }
+    created_at          { FactoryBot.generate(:time) }
+    suspended_at        { nil }
+    password            { "password" }
+    password_confirmation { "password" }
   end
 
   factory :admin do
-    admin true
+    admin { true }
   end
 
   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

data/spec/features/admin/groups_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 'Groups tab', '
   In order to increase customer satisfaction
@@ -17,7 +17,7 @@ feature 'Groups tab', '
   end
 
   scenario 'should create a new group', js: true do
-    FactoryGirl.create(:user, first_name: "Mr", last_name: "Spock")
+    create(:user, first_name: "Mr", last_name: "Spock")
     visit admin_groups_path
     expect(page).to have_content("Couldn't find any Groups.")
     click_link 'create a new group'

data/spec/features/admin/users_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 'Users tab', '
   In order to increase customer satisfaction
@@ -17,7 +17,7 @@ feature 'Users tab', '
   end
 
   scenario 'should create a new user', js: true do
-    FactoryGirl.create(:group, name: "Superheroes")
+    create(:group, name: "Superheroes")
     visit admin_users_path
     click_link 'Create User'
     expect(page).to have_selector('#user_username', visible: true)
@@ -25,6 +25,8 @@ feature 'Users tab', '
     fill_in 'user_email', with: 'lightning@example.com'
     fill_in 'user_first_name', with: 'Captain'
     fill_in 'user_last_name', with: 'Thunder'
+    fill_in 'user_password', with: 'password'
+    fill_in 'user_password_confirmation', with: 'password'
     fill_in 'user_title', with: 'Chief'
     fill_in 'user_company', with: 'Weather Inc.'
     select 'Superheroes', from: 'user_group_ids'

data/spec/features/campaigns_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 'Campaigns', '
   In order to increase customer satisfaction
@@ -17,7 +17,7 @@ feature 'Campaigns', '
   end
 
   scenario 'should view a list of campaigns' do
-    3.times { |i| FactoryGirl.create(:campaign, name: "Campaign #{i}") }
+    3.times { |i| create(:campaign, name: "Campaign #{i}") }
     visit campaigns_page
     expect(page).to have_content('Campaign 0')
     expect(page).to have_content('Campaign 1')
@@ -60,7 +60,7 @@ feature 'Campaigns', '
   end
 
   scenario 'should view and edit a campaign', js: true do
-    FactoryGirl.create(:campaign, name: "My Cool Campaign")
+    create(:campaign, name: "My Cool Campaign")
     with_versioning do
       visit campaigns_page
       click_link 'My Cool Campaign'
@@ -76,7 +76,7 @@ feature 'Campaigns', '
   end
 
   scenario 'should delete a campaign', js: true do
-    FactoryGirl.create(:campaign, name: "Old Campaign")
+    create(:campaign, name: "Old Campaign")
     visit campaigns_page
     click_link 'Old Campaign'
     click_link 'Delete?'
@@ -87,7 +87,7 @@ feature 'Campaigns', '
   end
 
   scenario 'should search for a campaign', js: true do
-    2.times { |i| FactoryGirl.create(:campaign, name: "Campaign #{i}") }
+    2.times { |i| create(:campaign, name: "Campaign #{i}") }
     visit campaigns_page
     expect(find('#campaigns')).to have_content("Campaign 0")
     expect(find('#campaigns')).to have_content("Campaign 1")