fat_free_crm 0.18.2 → 0.19.0

data/spec/factories/field_factories.rb

@@ -23,17 +23,18 @@ FactoryBot.define do
   end
 
   factory :field do
-    type "Field"
+    type { "Field" }
     field_group
     position            { FactoryBot.generate(:field_position) }
     label               { FactoryBot.generate(:field_label) }
     name                { |f| f.label.downcase.gsub(/[^a-z0-9]+/, '_') }
-    as "string"
+    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

@@ -9,17 +9,17 @@ 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               { 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
+    do_not_call         { false }
     blog                { FactoryBot.generate(:website) }
     linkedin            { FactoryBot.generate(:website) }
     facebook            { FactoryBot.generate(:website) }
@@ -29,7 +29,7 @@ FactoryBot.define do
     phone               { FFaker::PhoneNumber.phone_number }
     mobile              { FFaker::PhoneNumber.phone_number }
     background_info     { FFaker::Lorem.paragraph[0, 255] }
-    deleted_at nil
+    deleted_at          { nil }
     updated_at          { FactoryBot.generate(:time) }
     created_at          { FactoryBot.generate(:time) }
   end

data/spec/factories/list_factories.rb

@@ -7,7 +7,7 @@
 #------------------------------------------------------------------------------
 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

@@ -18,9 +18,9 @@ FactoryBot.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               { FactoryBot.generate(:opportunity_status) }
     probability         { rand(50) }
@@ -28,7 +28,7 @@ FactoryBot.define do
     discount            { rand(100) }
     closes_on           { FactoryBot.generate(:date) }
     background_info     { FFaker::Lorem.paragraph[0, 255] }
-    deleted_at nil
+    deleted_at          { nil }
     updated_at          { FactoryBot.generate(:time) }
     created_at          { FactoryBot.generate(:time) }
   end

data/spec/factories/setting_factories.rb

@@ -7,8 +7,8 @@
 #------------------------------------------------------------------------------
 FactoryBot.define do
   factory :setting do
-    name "foo"
-    value nil
+    name                { "foo" }
+    value               { nil }
     updated_at          { FactoryBot.generate(:time) }
     created_at          { FactoryBot.generate(:time) }
   end

data/spec/factories/shared_factories.rb

@@ -7,9 +7,9 @@
 #------------------------------------------------------------------------------
 FactoryBot.define do
   factory :version do
-    whodunnit ""
+    whodunnit           { "" }
     item                { raise "Please specify :item for the version" }
-    event "create"
+    event               { "create" }
     created_at          { FactoryBot.generate(:time) }
   end
 
@@ -17,9 +17,11 @@ FactoryBot.define do
     user
     commentable         { raise "Please specify :commentable for the comment" }
     title               { FactoryBot.generate(:title) }
-    private false
+
+    private             { false }
+
     comment             { FFaker::Lorem.paragraph }
-    state "Expanded"
+    state               { "Expanded" }
     updated_at          { FactoryBot.generate(:time) }
     created_at          { FactoryBot.generate(:time) }
   end
@@ -31,14 +33,14 @@ FactoryBot.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
+    header              { nil }
     sent_at             { FactoryBot.generate(:time) }
     received_at         { FactoryBot.generate(:time) }
-    deleted_at nil
-    state "Expanded"
+    deleted_at          { nil }
+    state               { "Expanded" }
     updated_at          { FactoryBot.generate(:time) }
     created_at          { FactoryBot.generate(:time) }
   end
@@ -55,7 +57,7 @@ FactoryBot.define do
     address_type        { %w[Business Billing Shipping].sample }
     updated_at          { FactoryBot.generate(:time) }
     created_at          { FactoryBot.generate(:time) }
-    deleted_at nil
+    deleted_at          { nil }
   end
 
   factory :avatar do

data/spec/factories/task_factories.rb

@@ -8,17 +8,17 @@
 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"
+    bucket              { "due_asap" }
     due_at              { FactoryBot.generate(:time) }
     background_info     { FFaker::Lorem.paragraph[0, 255] }
-    completed_at nil
-    deleted_at nil
+    completed_at        { nil }
+    deleted_at          { nil }
     updated_at          { FactoryBot.generate(:time) }
     created_at          { FactoryBot.generate(:time) }
   end

data/spec/factories/user_factories.rb

@@ -16,31 +16,28 @@ FactoryBot.define do
     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    { 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
+    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"
+    suspended_at        { nil }
+    password            { "password" }
+    password_confirmation { "password" }
   end
 
   factory :admin do
-    admin true
+    admin { true }
   end
 
   factory :permission do

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

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
@@ -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

data/spec/features/contacts_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 'Contacts', '
   In order to increase customer satisfaction

data/spec/features/dashboard_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 'Dashboard', '
   In order to monitor activity

data/spec/features/devise/sign_in_spec.rb

@@ -0,0 +1,58 @@
+# frozen_string_literal: true
+
+# Copyright (c) 2008-2013 Michael Dvorkin and contributors.
+#
+# 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 'features/acceptance_helper'
+
+feature 'Devise Sign-in' do
+  background do
+    Setting.user_signup = :needs_approval
+    @user = create :user,
+                   username: 'john',
+                   password: 'password',
+                   password_confirmation: 'password',
+                   email: 'john@example.com',
+                   sign_in_count: 0
+  end
+
+  scenario 'without confirmation' do
+    login_process('john', 'password')
+    expect(page).to have_content("You have to confirm your email address before continuing.")
+  end
+
+  scenario 'without approval' do
+    @user.confirm
+    login_process('john', 'password')
+    expect(page).to have_content("Your account has not been approved yet.")
+  end
+
+  scenario 'with approved and confirmed account' do
+    @user.confirm
+    @user.update_attribute(:suspended_at, nil)
+    login_process('john', 'password')
+    expect(page).to have_content("Signed in successfully.")
+  end
+
+  scenario 'invalid credentials' do
+    login_process('jo', 'pass')
+    expect(current_path).to eq "/users/sign_in"
+    expect(page).to have_content("Invalid Email or password")
+  end
+
+  scenario 'login with email' do
+    @user.confirm
+    @user.update_attribute(:suspended_at, nil)
+    login_process('john@example.com', 'password')
+    expect(page).to have_content("Signed in successfully")
+  end
+
+  def login_process(username, password)
+    visit '/users/sign_in'
+    fill_in 'user[email]', with: username
+    fill_in 'user[password]', with: password
+    click_button 'Login'
+  end
+end

data/spec/features/devise/sign_up_spec.rb

@@ -0,0 +1,36 @@
+# frozen_string_literal: true
+
+# Copyright (c) 2008-2013 Michael Dvorkin and contributors.
+#
+# 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 'features/acceptance_helper'
+
+feature 'Devise Sign-up' do
+  scenario 'with valid credentials' do
+    visit "/users/sign_up"
+
+    fill_in "user[email]", with: "john@example.com"
+    fill_in "user[username]", with: "john"
+    fill_in "user[password]", with: "password"
+    fill_in "user[password_confirmation]", with: "password"
+    click_button("Sign Up")
+
+    expect(current_path).to eq "/users/sign_in"
+    expect(page).to have_content("A message with a confirmation link has been sent to your email address. Please follow the link to activate your account.")
+  end
+
+  scenario 'without credentials' do
+    visit "/users/sign_up"
+    click_button("Sign Up")
+
+    expect(page).to have_content("6 errors prohibited this User from being saved")
+    expect(page).to have_content("Please specify email address")
+    expect(page).to have_content("Email is too short (minimum is 3 characters)")
+    expect(page).to have_content("Email is invalid")
+    expect(page).to have_content("Please specify username")
+    expect(page).to have_content("Username is invalid")
+    expect(page).to have_content("Password can't be blank")
+  end
+end

data/spec/features/leads_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 'Leads', '
   In order to increase sales

data/spec/features/opportunities_overview_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 'Opportunities Overview', "
   In order to keep track of my team's responsibilities

data/spec/features/opportunities_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 'Opportunities', '
   In order to increase sales
@@ -120,13 +120,13 @@ feature 'Opportunities', '
     expect(find('#opportunities')).not_to have_content("Opportunity 1")
   end
 
-  scenario 'should add note to opportunity', js: true do
+  scenario 'should add comment to opportunity', js: true do
     opportunity = create(:opportunity, name: 'Awesome Opportunity')
     visit opportunities_page
     click_link 'Awesome Opportunity'
     find("#opportunity_#{opportunity.id}_post_new_note").click
     fill_in 'comment[comment]', with: 'Most awesome opportunity'
-    click_button 'Add Note'
+    click_button 'Add Comment'
     expect(page).to have_content('Most awesome opportunity')
   end
 end

data/spec/features/support/browser.rb

@@ -7,10 +7,11 @@
 #------------------------------------------------------------------------------
 Capaybara.app_host = ENV['APP_URL'] if ENV['APP_URL']
 Capybara.default_max_wait_time = 7
+Capybara.server = :webrick
 
 if ENV['BROWSER'] == 'chrome'
   Capybara.register_driver :selenium do |app|
-    capabilities = Selenium::WebDriver::Remote::Capabilities.chrome(chromeOptions: { args: ['no-sandbox', 'headless', 'disable-gpu'] })
+    capabilities = Selenium::WebDriver::Remote::Capabilities.chrome(chromeOptions: { args: %w[no-sandbox headless disable-gpu] })
     Capybara::Selenium::Driver.new(app, browser: :chrome, desired_capabilities: capabilities)
   end
 else

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