fat_free_crm 0.13.6 → 0.14.0

data/spec/features/opportunities_overview_spec.rb

@@ -5,12 +5,12 @@
 #------------------------------------------------------------------------------
 require File.expand_path("../acceptance_helper.rb", __FILE__)
 
-feature 'Opportunities Overview', %q{
+feature 'Opportunities Overview', "
   In order to keep track of my team's responsibilities
   As a user
   I want to see an overview of opportunities broken down by user
-} do
 
+" do
   background do
     @me = FactoryGirl.create(:user)
 
@@ -23,65 +23,65 @@ feature 'Opportunities Overview', %q{
       click_link "Team"
     end
 
-    current_path.should == opportunity_overview_page
+    expect(current_path).to eq(opportunity_overview_page)
   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 = 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)
 
-    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 = 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)
 
-    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 = FactoryGirl.create(:user, first_name: "Chris", last_name: 'Jarvis')
+    FactoryGirl.create(:opportunity, stage: 'won', assignee: user3)
+    FactoryGirl.create(:opportunity, stage: 'lost', assignee: user3)
 
     visit opportunity_overview_page
 
     within "#user_#{user1.id}" do
-      page.should have_selector('.title', :text => 'Brian Doyle-Murray')
-      page.should have_content('Acting')
-      page.should_not have_content('Directing')
+      expect(page).to have_selector('.title', text: 'Brian Doyle-Murray')
+      expect(page).to have_content('Acting')
+      expect(page).not_to have_content('Directing')
     end
 
     within "#user_#{user2.id}" do
-      page.should have_selector('.title', :text => 'Dean Stockwell')
-      page.should have_content('Leaping from Quantum Leap')
-      page.should have_content('Return Home from Quantum Leap')
+      expect(page).to have_selector('.title', text: 'Dean Stockwell')
+      expect(page).to have_content('Leaping from Quantum Leap')
+      expect(page).to have_content('Return Home from Quantum Leap')
     end
 
-    page.should_not have_selector("#user_#{user3.id}")
+    expect(page).not_to have_selector("#user_#{user3.id}")
 
-    page.should_not have_selector('#unassigned')
+    expect(page).not_to have_selector('#unassigned')
   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)
+    FactoryGirl.create(:opportunity, name: "Acting", stage: 'prospecting', assignee: nil)
+    FactoryGirl.create(:opportunity, name: "Presenting", stage: 'won', assignee: nil)
 
     visit opportunity_overview_page
 
     within "#unassigned" do
-      page.should have_selector('.title', :text => 'Unassigned Opportunities')
-      page.should have_content('Acting')
-      page.should_not have_content('Presenting')
+      expect(page).to have_selector('.title', text: 'Unassigned Opportunities')
+      expect(page).to have_content('Acting')
+      expect(page).not_to have_content('Presenting')
     end
   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)
+    FactoryGirl.create(:opportunity, name: "Presenting", stage: 'lost', assignee: FactoryGirl.create(:user))
+    FactoryGirl.create(:opportunity, name: "Eating", stage: 'won', assignee: nil)
 
     visit opportunity_overview_page
 
-    page.should have_content('There are currently no outstanding opportunities.')
+    expect(page).to have_content('There are currently no outstanding opportunities.')
     within "#main" do
-      page.should_not have_content("Presenting")
-      page.should_not have_content("Eating")
+      expect(page).not_to have_content("Presenting")
+      expect(page).not_to have_content("Eating")
     end
   end
 end

data/spec/features/opportunities_spec.rb

@@ -5,97 +5,101 @@
 #------------------------------------------------------------------------------
 require File.expand_path("../acceptance_helper.rb", __FILE__)
 
-feature 'Opportunities', %q{
+feature 'Opportunities', '
   In order to increase sales
   As a user
   I want to manage opportunities
-} do
 
+' do
   before :each do
-    do_login_if_not_already(:first_name => 'Bill', :last_name => 'Murray')
+    do_login_if_not_already(first_name: 'Bill', last_name: 'Murray')
   end
 
   scenario 'should view a list of opportunities' do
-    3.times { |i| FactoryGirl.create(:opportunity, :name => "Opportunity #{i}") }
+    3.times { |i| FactoryGirl.create(:opportunity, name: "Opportunity #{i}") }
     visit opportunities_page
-    page.should have_content('Opportunity 0')
-    page.should have_content('Opportunity 1')
-    page.should have_content('Opportunity 2')
-    page.should have_content('Create Opportunity')
+    expect(page).to have_content('Opportunity 0')
+    expect(page).to have_content('Opportunity 1')
+    expect(page).to have_content('Opportunity 2')
+    expect(page).to have_content('Create Opportunity')
   end
 
-  scenario 'should create a new opportunity', :js => true do
-    FactoryGirl.create(:account, :name => 'Example Account')
-    visit opportunities_page
-    click_link 'Create Opportunity'
-    page.should have_selector('#opportunity_name', :visible => true)
-    fill_in 'opportunity_name', :with => 'My Awesome Opportunity'
-    fill_in 'account_name', :with => 'Example Account'
-    select 'Prospecting', :from => 'opportunity_stage'
-    click_link 'Comment'
-    fill_in 'comment_body', :with => 'This is a very important opportunity.'
-    click_button 'Create Opportunity'
-    page.should have_content('My Awesome Opportunity')
+  scenario 'should create a new opportunity', js: true do
+    FactoryGirl.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'
+      select 'Prospecting', from: 'opportunity_stage'
+      click_link 'Comment'
+      fill_in 'comment_body', with: 'This is a very important opportunity.'
+      click_button 'Create Opportunity'
+      expect(page).to have_content('My Awesome Opportunity')
 
-    find('div#opportunities').click_link('My Awesome Opportunity')
-    page.should have_content('This is a very important opportunity.')
+      find('div#opportunities').click_link('My Awesome Opportunity')
+      expect(page).to have_content('This is a very important opportunity.')
 
-    click_link "Dashboard"
-    page.should have_content("Bill Murray created opportunity My Awesome Opportunity")
-    page.should have_content("Bill Murray created comment on My Awesome Opportunity")
+      click_link "Dashboard"
+      expect(page).to have_content("Bill Murray created opportunity My Awesome Opportunity")
+      expect(page).to have_content("Bill Murray created comment on My Awesome Opportunity")
+    end
   end
 
-  scenario "remembers the comment field when the creation was unsuccessful", :js => true do
+  scenario "remembers the comment field when the creation was unsuccessful", js: true do
     visit opportunities_page
     click_link 'Create Opportunity'
-    select 'Prospecting', :from => 'opportunity_stage'
+    select 'Prospecting', from: 'opportunity_stage'
 
     click_link 'Comment'
-    fill_in 'comment_body', :with => 'This is a very important opportunity.'
+    fill_in 'comment_body', with: 'This is a very important opportunity.'
     click_button 'Create Opportunity'
 
-    page.should have_field('comment_body', :with => 'This is a very important opportunity.')
+    expect(page).to have_field('comment_body', with: 'This is a very important opportunity.')
   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')
-    visit opportunities_page
-    click_link 'A Cool Opportunity'
-    click_link 'Edit'
-    fill_in 'opportunity_name', :with => 'An Even Cooler Opportunity'
-    chosen_select('Other Example Account', :from => 'account_id')
-    select 'Analysis', :from => 'opportunity_stage'
-    click_button 'Save Opportunity'
-    page.should have_content('An Even Cooler Opportunity')
-    click_link "Dashboard"
-    page.should have_content("Bill Murray updated opportunity An Even Cooler Opportunity")
+  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')
+    with_versioning do
+      visit opportunities_page
+      click_link 'A Cool Opportunity'
+      click_link 'Edit'
+      fill_in 'opportunity_name', with: 'An Even Cooler Opportunity'
+      chosen_select('Other Example Account', from: 'account_id')
+      select 'Analysis', from: 'opportunity_stage'
+      click_button 'Save Opportunity'
+      expect(page).to have_content('An Even Cooler Opportunity')
+      click_link "Dashboard"
+      expect(page).to have_content("Bill Murray updated opportunity An Even Cooler Opportunity")
+    end
   end
 
-  scenario 'should delete an opportunity', :js => true do
-    FactoryGirl.create(:opportunity, :name => 'Outdated Opportunity')
+  scenario 'should delete an opportunity', js: true do
+    FactoryGirl.create(:opportunity, name: 'Outdated Opportunity')
     visit opportunities_page
     click_link 'Outdated Opportunity'
     click_link 'Delete?'
-    page.should have_content('Are you sure you want to delete this opportunity?')
+    expect(page).to have_content('Are you sure you want to delete this opportunity?')
     click_link 'Yes'
-    page.should have_content('Outdated Opportunity has been deleted.')
+    expect(page).to have_content('Outdated Opportunity has been deleted.')
   end
 
-  scenario 'should search for an opportunity', :js => true do
-    2.times { |i| FactoryGirl.create(:opportunity, :name => "Opportunity #{i}") }
+  scenario 'should search for an opportunity', js: true do
+    2.times { |i| FactoryGirl.create(:opportunity, name: "Opportunity #{i}") }
     visit opportunities_page
-    find('#opportunities').should have_content("Opportunity 0")
-    find('#opportunities').should have_content("Opportunity 1")
-    fill_in 'query', :with => "Opportunity 0"
-    find('#opportunities').should have_content("Opportunity 0")
-    find('#opportunities').should_not have_content("Opportunity 1")
-    fill_in 'query', :with => "Opportunity"
-    find('#opportunities').should have_content("Opportunity 0")
-    find('#opportunities').should have_content("Opportunity 1")
-    fill_in 'query', :with => "Non-existant opportunity"
-    find('#opportunities').should_not have_content("Opportunity 0")
-    find('#opportunities').should_not have_content("Opportunity 1")
+    expect(find('#opportunities')).to have_content("Opportunity 0")
+    expect(find('#opportunities')).to have_content("Opportunity 1")
+    fill_in 'query', with: "Opportunity 0"
+    expect(find('#opportunities')).to have_content("Opportunity 0")
+    expect(find('#opportunities')).not_to have_content("Opportunity 1")
+    fill_in 'query', with: "Opportunity"
+    expect(find('#opportunities')).to have_content("Opportunity 0")
+    expect(find('#opportunities')).to have_content("Opportunity 1")
+    fill_in 'query', with: "Non-existant opportunity"
+    expect(find('#opportunities')).not_to have_content("Opportunity 0")
+    expect(find('#opportunities')).not_to have_content("Opportunity 1")
   end
 end

data/spec/features/support/browser.rb

@@ -8,11 +8,11 @@
 #
 if ENV['BROWSER'] == 'chrome'
   Capybara.register_driver :selenium do |app|
-    Capybara::Selenium::Driver.new(app, :browser => :chrome)
+    Capybara::Selenium::Driver.new(app, browser: :chrome)
   end
 end
 
 #
 # Default timeout for extended for AJAX based application
 #
-Capybara.default_wait_time = 7
+Capybara.default_max_wait_time = 7

data/spec/features/support/headless.rb

@@ -8,7 +8,7 @@
 # Useful for CI and travis tests
 #
 
-if ENV['HEADLESS'] == 'true' or ENV["CI"] == "true"
+if ENV['HEADLESS'] == 'true' || ENV["CI"] == "true"
   require 'headless'
   headless = Headless.new
   headless.start

data/spec/features/support/helpers.rb

@@ -9,15 +9,15 @@ module HelperMethods
   def do_login(options = {})
     @user = FactoryGirl.create(:user, options)
     visit '/login'
-    fill_in "authentication_username", :with => @user.username
-    fill_in "authentication_password", :with => @user.password
+    fill_in "authentication_username", with: @user.username
+    fill_in "authentication_password", with: @user.password
     click_button "Login"
   end
 
   def login_as_user(user)
     visit '/login'
-    fill_in "authentication_username", :with => user.username
-    fill_in "authentication_password", :with => user.password
+    fill_in "authentication_username", with: user.username
+    fill_in "authentication_password", with: user.password
     click_button "Login"
   end
 
@@ -25,7 +25,6 @@ module HelperMethods
   def do_login_if_not_already(options = {})
     do_login(options) unless @user.present?
   end
-
 end
 
-RSpec.configuration.include HelperMethods, :type => :feature
+RSpec.configuration.include HelperMethods, type: :feature

data/spec/features/support/paths.rb

@@ -41,7 +41,6 @@ module NavigationHelpers
   def opportunity_overview_page
     opportunities_overview_users_path
   end
-
 end
 
-RSpec.configuration.include NavigationHelpers, :type => :feature
+RSpec.configuration.include NavigationHelpers, type: :feature

data/spec/features/support/selector_helpers.rb

@@ -5,7 +5,7 @@
 #------------------------------------------------------------------------------
 module SelectorHelpers
   def chosen_select(item_text, options)
-    field_id = find_field(options[:from], :visible => false)[:id]
+    field_id = find_field(options[:from], visible: false)[:id]
     option_value = page.evaluate_script("$(\"##{field_id} option:contains('#{item_text}')\").val()")
     page.execute_script("$('##{field_id}').val('#{option_value}')")
   end
@@ -28,4 +28,4 @@ module SelectorHelpers
   end
 end
 
-RSpec.configuration.include SelectorHelpers, :type => :feature
+RSpec.configuration.include SelectorHelpers, type: :feature

data/spec/features/tasks_spec.rb

@@ -5,83 +5,89 @@
 #------------------------------------------------------------------------------
 require File.expand_path("../acceptance_helper.rb", __FILE__)
 
-feature 'Tasks', %q{
+feature 'Tasks', '
   In order to increase keep track of things
   As a user
   I want to manage tasks
-} do
 
+' do
   before :each do
-    do_login_if_not_already(:first_name => 'Bill', :last_name => 'Murray')
+    do_login_if_not_already(first_name: 'Bill', last_name: 'Murray')
   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| FactoryGirl.create(:task, name: "Task #{i}", user: @user) }
     visit tasks_page
-    page.should have_content('Task 0')
-    page.should have_content('Task 1')
-    page.should have_content('Task 2')
-    page.should have_content('Task 3')
-    page.should have_content('Create Task')
+    expect(page).to have_content('Task 0')
+    expect(page).to have_content('Task 1')
+    expect(page).to have_content('Task 2')
+    expect(page).to have_content('Task 3')
+    expect(page).to have_content('Create Task')
   end
 
-  scenario 'should create a new task', :js => true do
-    visit tasks_page
-    page.should have_content('Create Task')
-    click_link 'Create Task'
-    page.should have_selector('#task_name', :visible => true)
-    fill_in 'task_name', :with => 'Task I Need To Do'
-    chosen_select('Tomorrow', :from => 'task_bucket')
-    chosen_select('Myself', :from => 'task_assigned_to')
-    chosen_select('Call', :from => 'task_category')
-    click_button 'Create Task'
-    page.should have_content('Task I Need To Do')
+  scenario 'should create a new task', js: true do
+    with_versioning do
+      visit tasks_page
+      expect(page).to have_content('Create Task')
+      click_link 'Create Task'
+      expect(page).to have_selector('#task_name', visible: true)
+      fill_in 'task_name', with: 'Task I Need To Do'
+      chosen_select('Tomorrow', from: 'task_bucket')
+      chosen_select('Myself', from: 'task_assigned_to')
+      chosen_select('Call', from: 'task_category')
+      click_button 'Create Task'
+      expect(page).to have_content('Task I Need To Do')
 
-    click_link 'Dashboard'
-    page.should have_content('Bill Murray created task Task I Need To Do')
+      click_link 'Dashboard'
+      expect(page).to have_content('Bill Murray created task Task I Need To Do')
+    end
   end
 
-  scenario 'creating a task for another user', :js => true do
-    FactoryGirl.create(:user, :first_name => 'Another', :last_name => 'User')
-    visit tasks_page
-    click_link 'Create Task'
-    page.should have_selector('#task_name', :visible => true)
-    fill_in 'task_name', :with => 'Task For Someone Else'
-    chosen_select('Tomorrow', :from => 'task_bucket')
-    chosen_select('Another User', :from => 'task_assigned_to')
-    chosen_select('Call', :from => 'task_category')
-    click_button 'Create Task'
-    page.should have_content('The task has been created and assigned to Another User')
+  scenario 'creating a task for another user', js: true do
+    FactoryGirl.create(:user, first_name: 'Another', last_name: 'User')
+    with_versioning do
+      visit tasks_page
+      click_link 'Create Task'
+      expect(page).to have_selector('#task_name', visible: true)
+      fill_in 'task_name', with: 'Task For Someone Else'
+      chosen_select('Tomorrow', from: 'task_bucket')
+      chosen_select('Another User', from: 'task_assigned_to')
+      chosen_select('Call', from: 'task_category')
+      click_button 'Create Task'
+      expect(page).to have_content('The task has been created and assigned to Another User')
 
-    click_link 'Tasks'
-    page.uncheck('filters_due_tomorrow')
-    page.should_not have_content('Task For Someone Else')
+      click_link 'Tasks'
+      page.uncheck('filters_due_tomorrow')
+      expect(page).not_to have_content('Task For Someone Else')
 
-    click_filter_tab('Assigned')
-    page.check('filters_due_tomorrow')
-    find('#main').should have_content('Task For Someone Else')
-    find('#main').should have_content('Another User')
+      click_filter_tab('Assigned')
+      page.check('filters_due_tomorrow')
+      expect(find('#main')).to have_content('Task For Someone Else')
+      expect(find('#main')).to have_content('Another User')
 
-    click_link 'Dashboard'
-    page.should have_content('Bill Murray created task Task For Someone Else')
+      click_link 'Dashboard'
+      expect(page).to have_content('Bill Murray created task Task For Someone Else')
+    end
   end
 
-  scenario 'should view and edit a task', :js => true do
-    FactoryGirl.create(:task, :id => 42, :name => 'Example Task', :user => @user)
-    visit tasks_page
-    click_edit_for_task_id(42)
-    fill_in 'task_name', :with => 'Updated Task'
-    click_button 'Save Task'
-    page.should have_content('Updated Task')
-    click_link 'Dashboard'
-    page.should have_content('Bill Murray updated task Updated Task')
+  scenario 'should view and edit a task', js: true do
+    FactoryGirl.create(:task, id: 42, name: 'Example Task', user: @user)
+    with_versioning do
+      visit tasks_page
+      click_edit_for_task_id(42)
+      fill_in 'task_name', with: 'Updated Task'
+      click_button 'Save Task'
+      expect(page).to have_content('Updated Task')
+      click_link 'Dashboard'
+      expect(page).to have_content('Bill Murray updated task Updated Task')
+    end
   end
 
-  scenario 'should delete a task', :js => true do
-    FactoryGirl.create(:task, :id => 42, :name => 'Outdated Task', :user => @user)
+  scenario 'should delete a task', js: true do
+    FactoryGirl.create(:task, id: 42, name: 'Outdated Task', user: @user)
     visit tasks_page
     click_delete_for_task_id(42)
     click_link 'Tasks'
-    page.should_not have_content('Outdated Task')
+    expect(page).not_to have_content('Outdated Task')
   end
 end