fat_free_crm 0.17.3 → 0.18.0

data/spec/features/admin/groups_spec.rb

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

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

data/spec/features/campaigns_spec.rb

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

data/spec/features/contacts_spec.rb

@@ -17,7 +17,7 @@ feature 'Contacts', '
   end
 
   scenario 'should view a list of contacts' do
-    4.times { |i| FactoryGirl.create(:contact, first_name: "Test", last_name: "Subject \##{i}") }
+    4.times { |i| create(:contact, first_name: "Test", last_name: "Subject \##{i}") }
     visit contacts_page
     expect(contacts_element).to have_content('Test Subject #0')
     expect(contacts_element).to have_content('Test Subject #1')
@@ -30,6 +30,9 @@ feature 'Contacts', '
     with_versioning do
       visit contacts_page
       click_link 'Create Contact'
+      select = find('#account_name', visible: true)
+      expect(select).to have_text("")
+      expect(page).to have_selector('#select2-account_id-container', visible: false)
       expect(page).to have_selector('#contact_first_name', visible: true)
       fill_in 'contact_first_name', with: 'Testy'
       fill_in 'contact_last_name', with: 'McTest'
@@ -62,11 +65,14 @@ feature 'Contacts', '
   end
 
   scenario 'should view and edit a contact', js: true do
-    FactoryGirl.create(:contact, first_name: "Testy", last_name: "McTest")
+    create(:contact, first_name: "Testy", last_name: "McTest", account: create(:account, name: "Toast"))
     with_versioning do
       visit contacts_page
       click_link 'Testy McTest'
       click_link 'Edit'
+      select = find('#select2-account_id-container', visible: true)
+      expect(select).to have_text("Toast")
+      expect(page).to have_selector('#account_name', visible: false)
       fill_in 'contact_first_name', with: 'Test'
       fill_in 'contact_last_name', with: 'Subject'
       fill_in 'contact_email', with: "test.subject@example.com"
@@ -79,7 +85,7 @@ feature 'Contacts', '
   end
 
   scenario 'should delete a contact', js: true do
-    FactoryGirl.create(:contact, first_name: "Test", last_name: "Subject")
+    create(:contact, first_name: "Test", last_name: "Subject")
     visit contacts_page
     click_link 'Test Subject'
     click_link 'Delete?'
@@ -90,7 +96,7 @@ feature 'Contacts', '
   end
 
   scenario 'should search for a contact', js: true do
-    2.times { |i| FactoryGirl.create(:contact, first_name: "Test", last_name: "Subject \##{i}") }
+    2.times { |i| create(:contact, first_name: "Test", last_name: "Subject \##{i}") }
     visit contacts_page
     expect(contacts_element).to have_content('Test Subject #0')
     expect(contacts_element).to have_content('Test Subject #1')

data/spec/features/dashboard_spec.rb

@@ -13,12 +13,12 @@ feature 'Dashboard', '
   I want to see a dashboard
 ' do
   background do
-    @me = FactoryGirl.create(:user)
+    @me = create(:user)
     login_as_user(@me)
 
-    FactoryGirl.create(:task, name: 'Do your homework!', assignee: @me)
-    FactoryGirl.create(:opportunity, name: 'Work with the Dolphins', assignee: @me, stage: 'proposal')
-    FactoryGirl.create(:account, name: 'Dolphin Manufacturer', assignee: @me)
+    create(:task, name: 'Do your homework!', assignee: @me)
+    create(:opportunity, name: 'Work with the Dolphins', assignee: @me, stage: 'proposal')
+    create(:account, name: 'Dolphin Manufacturer', assignee: @me)
   end
 
   scenario "Viewing my dashboard" do
@@ -42,9 +42,9 @@ feature 'Dashboard', '
 
   scenario "Only show a maximum of 10 entities" do
     10.times do
-      FactoryGirl.create(:task, assignee: @me)
-      FactoryGirl.create(:opportunity, assignee: @me, stage: 'proposal')
-      FactoryGirl.create(:account, assignee: @me)
+      create(:task, assignee: @me)
+      create(:opportunity, assignee: @me, stage: 'proposal')
+      create(:account, assignee: @me)
     end
 
     visit homepage

data/spec/features/leads_spec.rb

@@ -17,7 +17,7 @@ feature 'Leads', '
   end
 
   scenario 'should view a list of leads' do
-    4.times { |i| FactoryGirl.create(:lead, first_name: "L", last_name: "Ead #{i}") }
+    4.times { |i| create(:lead, first_name: "L", last_name: "Ead #{i}") }
     visit leads_page
     expect(leads_element).to have_content('L Ead 0')
     expect(leads_element).to have_content('L Ead 1')
@@ -70,7 +70,7 @@ feature 'Leads', '
   end
 
   scenario 'should view and edit a lead', js: true do
-    FactoryGirl.create(:lead, first_name: "Mr", last_name: "Lead", email: "mr_lead@example.com")
+    create(:lead, first_name: "Mr", last_name: "Lead", email: "mr_lead@example.com")
     with_versioning do
       visit leads_page
       click_link 'Mr Lead'
@@ -89,7 +89,7 @@ feature 'Leads', '
   end
 
   scenario 'should delete a lead', js: true do
-    FactoryGirl.create(:lead, first_name: "Mr", last_name: "Lead", email: "mr_lead@example.com")
+    create(:lead, first_name: "Mr", last_name: "Lead", email: "mr_lead@example.com")
     visit leads_page
     click_link 'Mr Lead'
     click_link 'Delete?'
@@ -101,7 +101,7 @@ feature 'Leads', '
   end
 
   scenario 'should search for a lead', js: true do
-    2.times { |i| FactoryGirl.create(:lead, first_name: "Lead", last_name: "\##{i}", email: "lead#{i}@example.com") }
+    2.times { |i| create(:lead, first_name: "Lead", last_name: "\##{i}", email: "lead#{i}@example.com") }
     visit leads_page
     expect(leads_element).to have_content('Lead #0')
     expect(leads_element).to have_content('Lead #1')

data/spec/features/opportunities_overview_spec.rb

@@ -13,7 +13,7 @@ feature 'Opportunities Overview', "
   I want to see an overview of opportunities broken down by user
 " do
   background do
-    @me = FactoryGirl.create(:user)
+    @me = create(:user)
 
     login_as_user(@me)
   end
@@ -28,18 +28,18 @@ feature 'Opportunities Overview', "
   end
 
   scenario "Viewing Opportunity Overview when all opportunities have been assigned" do
-    user1 = FactoryGirl.create(:user, first_name: "Brian", last_name: 'Doyle-Murray')
-    FactoryGirl.create(:opportunity, name: "Acting", stage: 'prospecting', assignee: user1)
-    FactoryGirl.create(:opportunity, name: "Directing", stage: 'won', assignee: user1)
+    user1 = create(:user, first_name: "Brian", last_name: 'Doyle-Murray')
+    create(:opportunity, name: "Acting", stage: 'prospecting', assignee: user1)
+    create(:opportunity, name: "Directing", stage: 'won', assignee: user1)
 
-    user2 = FactoryGirl.create(:user, first_name: "Dean", last_name: 'Stockwell')
-    account1 = FactoryGirl.create(:account, name: 'Quantum Leap')
-    FactoryGirl.create(:opportunity, name: "Leaping", stage: 'prospecting', account: account1, assignee: user2)
-    FactoryGirl.create(:opportunity, name: "Return Home", stage: 'prospecting', account: account1, assignee: user2)
+    user2 = create(:user, first_name: "Dean", last_name: 'Stockwell')
+    account1 = create(:account, name: 'Quantum Leap')
+    create(:opportunity, name: "Leaping", stage: 'prospecting', account: account1, assignee: user2)
+    create(:opportunity, name: "Return Home", stage: 'prospecting', account: account1, assignee: user2)
 
-    user3 = FactoryGirl.create(:user, first_name: "Chris", last_name: 'Jarvis')
-    FactoryGirl.create(:opportunity, stage: 'won', assignee: user3)
-    FactoryGirl.create(:opportunity, stage: 'lost', assignee: user3)
+    user3 = create(:user, first_name: "Chris", last_name: 'Jarvis')
+    create(:opportunity, stage: 'won', assignee: user3)
+    create(:opportunity, stage: 'lost', assignee: user3)
 
     visit opportunity_overview_page
 
@@ -61,8 +61,8 @@ feature 'Opportunities Overview', "
   end
 
   scenario "Viewing Opportunity Overview when all opportunities are unassigned" do
-    FactoryGirl.create(:opportunity, name: "Acting", stage: 'prospecting', assignee: nil)
-    FactoryGirl.create(:opportunity, name: "Presenting", stage: 'won', assignee: nil)
+    create(:opportunity, name: "Acting", stage: 'prospecting', assignee: nil)
+    create(:opportunity, name: "Presenting", stage: 'won', assignee: nil)
 
     visit opportunity_overview_page
 
@@ -74,8 +74,8 @@ feature 'Opportunities Overview', "
   end
 
   scenario "Viewing Opportunity Overview when there are no opportunities in the pipeline" do
-    FactoryGirl.create(:opportunity, name: "Presenting", stage: 'lost', assignee: FactoryGirl.create(:user))
-    FactoryGirl.create(:opportunity, name: "Eating", stage: 'won', assignee: nil)
+    create(:opportunity, name: "Presenting", stage: 'lost', assignee: create(:user))
+    create(:opportunity, name: "Eating", stage: 'won', assignee: nil)
 
     visit opportunity_overview_page
 

data/spec/features/opportunities_spec.rb

@@ -17,7 +17,7 @@ feature 'Opportunities', '
   end
 
   scenario 'should view a list of opportunities' do
-    3.times { |i| FactoryGirl.create(:opportunity, name: "Opportunity #{i}") }
+    3.times { |i| create(:opportunity, name: "Opportunity #{i}") }
     visit opportunities_page
     expect(page).to have_content('Opportunity 0')
     expect(page).to have_content('Opportunity 1')
@@ -26,13 +26,18 @@ feature 'Opportunities', '
   end
 
   scenario 'should create a new opportunity', js: true do
-    FactoryGirl.create(:account, name: 'Example Account')
+    create(:account, name: 'Example Account')
     with_versioning do
       visit opportunities_page
       click_link 'Create Opportunity'
       expect(page).to have_selector('#opportunity_name', visible: true)
       fill_in 'opportunity_name', with: 'My Awesome Opportunity'
-      fill_in 'account_name', with: 'Example Account'
+      click_link 'select existing'
+      find('#select2-account_id-container').click
+      find('.select2-search--dropdown').find('input').set('Example Account')
+      sleep(1)
+      find('li', text: 'Example Account').click
+      expect(page).to have_content('Example Account')
       select 'Prospecting', from: 'opportunity_stage'
       click_link 'Comment'
       fill_in 'comment_body', with: 'This is a very important opportunity.'
@@ -48,6 +53,17 @@ feature 'Opportunities', '
     end
   end
 
+  scenario 'should not display ammount with zero value', js: true do
+    with_amount = create(:opportunity, name: 'With Amount', amount: 3000, probability: 90, discount: nil, stage: 'proposal')
+    without_amount = create(:opportunity, name: 'Without Amount', amount: nil, probability: nil, discount: nil, stage: 'proposal')
+    with_versioning do
+      visit opportunities_page
+      click_link 'Long format'
+      expect(find("#opportunity_#{with_amount.id}")).to have_content('$3,000 | Probability 90%')
+      expect(find("#opportunity_#{without_amount.id}")).not_to have_content('$0 | Discount $0 | Probability 0%')
+    end
+  end
+
   scenario "remembers the comment field when the creation was unsuccessful", js: true do
     visit opportunities_page
     click_link 'Create Opportunity'
@@ -61,9 +77,9 @@ feature 'Opportunities', '
   end
 
   scenario 'should view and edit an opportunity', js: true do
-    FactoryGirl.create(:account, name: 'Example Account')
-    FactoryGirl.create(:account, name: 'Other Example Account')
-    FactoryGirl.create(:opportunity, name: 'A Cool Opportunity')
+    create(:account, name: 'Example Account')
+    create(:account, name: 'Other Example Account')
+    create(:opportunity, name: 'A Cool Opportunity')
     with_versioning do
       visit opportunities_page
       click_link 'A Cool Opportunity'
@@ -79,7 +95,7 @@ feature 'Opportunities', '
   end
 
   scenario 'should delete an opportunity', js: true do
-    FactoryGirl.create(:opportunity, name: 'Outdated Opportunity')
+    create(:opportunity, name: 'Outdated Opportunity')
     visit opportunities_page
     click_link 'Outdated Opportunity'
     click_link 'Delete?'
@@ -89,7 +105,7 @@ feature 'Opportunities', '
   end
 
   scenario 'should search for an opportunity', js: true do
-    2.times { |i| FactoryGirl.create(:opportunity, name: "Opportunity #{i}") }
+    2.times { |i| create(:opportunity, name: "Opportunity #{i}") }
     visit opportunities_page
     expect(find('#opportunities')).to have_content("Opportunity 0")
     expect(find('#opportunities')).to have_content("Opportunity 1")
@@ -103,4 +119,14 @@ feature 'Opportunities', '
     expect(find('#opportunities')).not_to have_content("Opportunity 0")
     expect(find('#opportunities')).not_to have_content("Opportunity 1")
   end
+
+  scenario 'should add note 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'
+    expect(page).to have_content('Most awesome opportunity')
+  end
 end

data/spec/features/support/autocomlete_helper.rb

@@ -0,0 +1,17 @@
+# 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
+#------------------------------------------------------------------------------
+def fill_autocomplete(field, options = {})
+  fill_in field, with: options[:with]
+  page.execute_script %{ $('##{field}').trigger('focus') }
+  page.execute_script %{ $('##{field}').trigger('keydown') }
+
+  selector = %{ul.ui-autocomplete li.ui-menu-item a:contains("#{options[:select]}")}
+  sleep(1)
+  expect(page).to have_selector('ul.ui-autocomplete li.ui-menu-item a')
+  page.execute_script %{ $('#{selector}').trigger('mouseenter').click() }
+end

data/spec/features/support/browser.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
 #------------------------------------------------------------------------------
-#
-# Allow tests to run in Chrome browser
-#
+Capaybara.app_host = ENV['APP_URL'] if ENV['APP_URL']
+Capybara.default_max_wait_time = 7
+
 if ENV['BROWSER'] == 'chrome'
   Capybara.register_driver :selenium do |app|
     capabilities = Selenium::WebDriver::Remote::Capabilities.chrome(chromeOptions: { args: ['no-sandbox', 'headless', 'disable-gpu'] })
@@ -21,8 +21,3 @@ else
     Capybara::Selenium::Driver.new(app, browser: :firefox, options: options, desired_capabilities: capabilities)
   end
 end
-
-#
-# Default timeout for extended for AJAX based application
-#
-Capybara.default_max_wait_time = 7

data/spec/features/support/helpers.rb

@@ -9,7 +9,7 @@ module HelperMethods
   # Put helper methods you need to be available in all acceptance specs here.
 
   def do_login(options = {})
-    @user = FactoryGirl.create(:user, options)
+    @user = create(:user, options)
     visit '/login'
     fill_in "authentication_username", with: @user.username
     fill_in "authentication_password", with: @user.password

data/spec/features/tasks_spec.rb

@@ -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 = build(: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