fat_free_crm 0.13.6 → 0.14.0

data/spec/features/contacts_spec.rb

@@ -5,94 +5,125 @@
 #------------------------------------------------------------------------------
 require File.expand_path("../acceptance_helper.rb", __FILE__)
 
-feature 'Contacts', %q{
+feature 'Contacts', '
   In order to increase customer satisfaction
   As a user
   I want to manage contacts
-} 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 contacts' do
-    4.times { |i| FactoryGirl.create(:contact, :first_name => "Test", :last_name => "Subject \##{i}") }
+    4.times { |i| FactoryGirl.create(:contact, first_name: "Test", last_name: "Subject \##{i}") }
     visit contacts_page
-    page.should have_content('Test Subject #0')
-    page.should have_content('Test Subject #1')
-    page.should have_content('Test Subject #2')
-    page.should have_content('Test Subject #3')
-    page.should have_content('Create Contact')
+    expect(contacts_element).to have_content('Test Subject #0')
+    expect(contacts_element).to have_content('Test Subject #1')
+    expect(contacts_element).to have_content('Test Subject #2')
+    expect(contacts_element).to have_content('Test Subject #3')
+    expect(page).to have_content('Create Contact')
   end
 
-  scenario 'should create a contact', :js => true do
-    visit contacts_page
-    click_link 'Create Contact'
-    page.should have_selector('#contact_first_name', :visible => true)
-    fill_in 'contact_first_name', :with => 'Testy'
-    fill_in 'contact_last_name', :with => 'McTest'
-    fill_in 'contact_email', :with => "testy.mctest@example.com"
-    fill_in 'contact_phone', :with => '+44 1234 567890'
-    click_link 'Comment'
-    fill_in 'comment_body', :with => 'This is a very important person.'
-    click_button 'Create Contact'
-    find('div#contacts').should have_content('Testy McTest')
-    find('div#contacts').click_link 'Testy McTest'
-    page.should have_content('This is a very important person.')
-    click_link "Dashboard"
-    page.should have_content('Bill Murray created contact Testy McTest')
-    page.should have_content('Bill Murray created comment on Testy McTest')
+  scenario 'should create a contact', js: true do
+    with_versioning do
+      visit contacts_page
+      click_link 'Create Contact'
+      expect(page).to have_selector('#contact_first_name', visible: true)
+      fill_in 'contact_first_name', with: 'Testy'
+      fill_in 'contact_last_name', with: 'McTest'
+      fill_in 'contact_email', with: "testy.mctest@example.com"
+      fill_in 'contact_phone', with: '+44 1234 567890'
+      click_link 'Comment'
+      fill_in 'comment_body', with: 'This is a very important person.'
+      click_button 'Create Contact'
+      expect(contacts_element).to have_content('Testy McTest')
+
+      contacts_element.click_link 'Testy McTest'
+      expect(main_element).to have_content('This is a very important person.')
+
+      click_link "Dashboard"
+      expect(activities_element).to have_content('Bill Murray created contact Testy McTest')
+      expect(activities_element).to have_content('Bill Murray created comment on Testy McTest')
+    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 contacts_page
     click_link 'Create Contact'
 
     click_link 'Comment'
-    fill_in 'comment_body', :with => 'This is a very important person.'
+    fill_in 'comment_body', with: 'This is a very important person.'
     click_button 'Create Contact'
 
-    page.should have_field("comment_body", :with => 'This is a very important person.')
+    expect(page).to have_field("comment_body", with: 'This is a very important person.')
   end
 
-  scenario 'should view and edit a contact', :js => true do
-    FactoryGirl.create(:contact, :first_name => "Testy", :last_name => "McTest")
-    visit contacts_page
-    click_link 'Testy McTest'
-    click_link 'Edit'
-    fill_in 'contact_first_name', :with => 'Test'
-    fill_in 'contact_last_name', :with => 'Subject'
-    fill_in 'contact_email', :with => "test.subject@example.com"
-    click_button 'Save Contact'
-    page.should have_content('Test Subject')
-    click_link 'Dashboard'
-    page.should have_content("Bill Murray updated contact Test Subject")
+  scenario 'should view and edit a contact', js: true do
+    FactoryGirl.create(:contact, first_name: "Testy", last_name: "McTest")
+    with_versioning do
+      visit contacts_page
+      click_link 'Testy McTest'
+      click_link 'Edit'
+      fill_in 'contact_first_name', with: 'Test'
+      fill_in 'contact_last_name', with: 'Subject'
+      fill_in 'contact_email', with: "test.subject@example.com"
+      click_button 'Save Contact'
+      expect(summary_element).to have_content('Test Subject')
+
+      click_link 'Dashboard'
+      expect(activities_element).to have_content("Bill Murray updated contact Test Subject")
+    end
   end
 
-  scenario 'should delete a contact', :js => true do
-    FactoryGirl.create(:contact, :first_name => "Test", :last_name => "Subject")
+  scenario 'should delete a contact', js: true do
+    FactoryGirl.create(:contact, first_name: "Test", last_name: "Subject")
     visit contacts_page
     click_link 'Test Subject'
     click_link 'Delete?'
-    page.should have_content('Are you sure you want to delete this contact?')
+    expect(menu_element).to have_content('Are you sure you want to delete this contact?')
     click_link 'Yes'
-    page.should have_content('Test Subject has been deleted.')
-    page.should_not have_content('Test Subject')
+    expect(flash_element).to have_content('Test Subject has been deleted.')
+    expect(contacts_element).not_to have_content('Test Subject')
   end
 
-  scenario 'should search for a contact', :js => true do
-    2.times { |i| FactoryGirl.create(:contact, :first_name => "Test", :last_name => "Subject \##{i}") }
+  scenario 'should search for a contact', js: true do
+    2.times { |i| FactoryGirl.create(:contact, first_name: "Test", last_name: "Subject \##{i}") }
     visit contacts_page
-    find('#contacts').should have_content('Test Subject #0')
-    find('#contacts').should have_content('Test Subject #1')
-    fill_in 'query', :with => 'Test Subject #1'
-    find('#contacts').should have_content('Test Subject #1')
-    find('#contacts').should_not have_content('Test Subject #0')
-    fill_in 'query', :with => 'Test Subject'
-    find('#contacts').should have_content('Test Subject #0')
-    find('#contacts').should have_content('Test Subject #1')
-    fill_in 'query', :with => "Fake contact"
-    find('#contacts').should_not have_content('Test Subject #0')
-    find('#contacts').should_not have_content('Test Subject #1')
+    expect(contacts_element).to have_content('Test Subject #0')
+    expect(contacts_element).to have_content('Test Subject #1')
+    fill_in 'query', with: 'Test Subject #1'
+    expect(contacts_element).to have_content('Test Subject #1')
+    expect(contacts_element).not_to have_content('Test Subject #0')
+    fill_in 'query', with: 'Test Subject'
+    expect(contacts_element).to have_content('Test Subject #0')
+    expect(contacts_element).to have_content('Test Subject #1')
+    fill_in 'query', with: "Fake contact"
+    expect(contacts_element).not_to have_content('Test Subject #0')
+    expect(contacts_element).not_to have_content('Test Subject #1')
+  end
+
+  def main_element
+    find('#main')
+  end
+
+  def summary_element
+    find('#summary')
+  end
+
+  def menu_element
+    find('#menu')
+  end
+
+  def flash_element
+    find('#flash')
+  end
+
+  def contacts_element
+    find('#contacts')
+  end
+
+  def activities_element
+    find('#activities')
   end
 end

data/spec/features/dashboard_spec.rb

@@ -5,63 +5,62 @@
 #------------------------------------------------------------------------------
 require File.expand_path("../acceptance_helper.rb", __FILE__)
 
-feature 'Dashboard', %q{
+feature 'Dashboard', '
   In order to monitor activity
   As a user
   I want to see a dashboard
-} do
 
+' do
   background do
     @me = FactoryGirl.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)
+    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)
   end
 
   scenario "Viewing my dashboard" do
     visit homepage
 
-    #My Tasks
+    # My Tasks
     within "#tasks" do
-      page.should have_content("Do your homework!")
+      expect(page).to have_content("Do your homework!")
     end
 
-    #My Opportunities
+    # My Opportunities
     within "#opportunities" do
-      page.should have_content("Work with the Dolphins")
+      expect(page).to have_content("Work with the Dolphins")
     end
 
-    #My Accounts
+    # My Accounts
     within "#accounts" do
-      page.should have_content("Dolphin Manufacturer")
+      expect(page).to have_content("Dolphin Manufacturer")
     end
   end
 
   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)
+      FactoryGirl.create(:task, assignee: @me)
+      FactoryGirl.create(:opportunity, assignee: @me, stage: 'proposal')
+      FactoryGirl.create(:account, assignee: @me)
     end
 
     visit homepage
 
-    #My Tasks
+    # My Tasks
     within "#tasks" do
-      page.should have_content("Not showing 1 hidden task.")
+      expect(page).to have_content("Not showing 1 hidden task.")
     end
 
-    #My Opportunities
+    # My Opportunities
     within "#opportunities" do
-      page.should have_content("Not showing 1 hidden opportunity.")
+      expect(page).to have_content("Not showing 1 hidden opportunity.")
     end
 
-    #My Accounts
+    # My Accounts
     within "#accounts" do
-      page.should have_content("Not showing 1 hidden account.")
+      expect(page).to have_content("Not showing 1 hidden account.")
     end
-
   end
 end

data/spec/features/leads_spec.rb

@@ -5,104 +5,125 @@
 #------------------------------------------------------------------------------
 require File.expand_path("../acceptance_helper.rb", __FILE__)
 
-feature 'Leads', %q{
+feature 'Leads', '
   In order to increase sales
   As a user
   I want to manage leads
-} 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 leads' do
-    4.times { |i| FactoryGirl.create(:lead, :first_name => "L", :last_name => "Ead #{i}") }
+    4.times { |i| FactoryGirl.create(:lead, first_name: "L", last_name: "Ead #{i}") }
     visit leads_page
-    page.should have_content('L Ead 0')
-    page.should have_content('L Ead 1')
-    page.should have_content('L Ead 2')
-    page.should have_content('L Ead 3')
-    page.should have_content('Create Lead')
+    expect(leads_element).to have_content('L Ead 0')
+    expect(leads_element).to have_content('L Ead 1')
+    expect(leads_element).to have_content('L Ead 2')
+    expect(leads_element).to have_content('L Ead 3')
+    expect(page).to have_content('Create Lead')
   end
 
-  scenario 'should create a new lead', :js => true do
-    visit leads_page
-    click_link 'Create Lead'
-    page.should have_selector('#lead_first_name', :visible => true)
-    fill_in 'lead_first_name', :with => 'Mr'
-    fill_in 'lead_last_name', :with => 'Lead'
-    fill_in 'lead_email', :with => 'mr_lead@example.com'
-    fill_in 'lead_phone', :with => '+44 1234 567890'
-    click_link 'Comment'
-    fill_in 'comment_body', :with => 'This is an important lead.'
-    click_link('Status')
-    select 'Contacted', :from => 'lead_status'
-    click_button 'Create Lead'
-    page.should have_content('Mr Lead')
+  scenario 'should create a new lead', js: true do
+    with_versioning do
+      visit leads_page
+      click_link 'Create Lead'
+      expect(page).to have_selector('#lead_first_name', visible: true)
+      fill_in 'lead_first_name', with: 'Mr'
+      fill_in 'lead_last_name', with: 'Lead'
+      fill_in 'lead_email', with: 'mr_lead@example.com'
+      fill_in 'lead_phone', with: '+44 1234 567890'
+      click_link 'Comment'
+      fill_in 'comment_body', with: 'This is an important lead.'
+      click_link('Status')
+      select 'Contacted', from: 'lead_status'
+      click_button 'Create Lead'
+      expect(leads_element).to have_content('Mr Lead')
 
-    find('#leads').click_link('Mr Lead')
-    page.should have_content('Contacted')
-    page.should have_content('mr_lead@example.com')
-    page.should have_content('+44 1234 567890')
-    page.should have_content('This is an important lead.')
+      leads_element.click_link('Mr Lead')
+      expect(summary_element).to have_content('Contacted')
+      expect(summary_element).to have_content('mr_lead@example.com')
+      expect(summary_element).to have_content('+44 1234 567890')
+      expect(main_element).to have_content('This is an important lead.')
 
-    click_link "Dashboard"
-    page.should have_content("Bill Murray created lead Mr Lead")
-    page.should have_content("Bill Murray created comment on Mr Lead")
+      click_link "Dashboard"
+      expect(activities_element).to have_content("Bill Murray created lead Mr Lead")
+      expect(activities_element).to have_content("Bill Murray created comment on Mr Lead")
+    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 leads_page
     click_link 'Create Lead'
 
     click_link 'Comment'
-    fill_in 'comment_body', :with => 'This is an important lead.'
+    fill_in 'comment_body', with: 'This is an important lead.'
     click_button 'Create Lead'
 
-    page.should have_field('comment_body', :with => 'This is an important lead.')
+    expect(page).to have_field('comment_body', with: 'This is an important lead.')
   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")
-    visit leads_page
-    click_link 'Mr Lead'
-    page.should have_content('Mr Lead')
-    click_link('Edit')
-    fill_in 'lead_first_name', :with => 'Mrs'
-    fill_in 'lead_phone', :with => '+44 0987 654321'
-    click_link('Status')
-    select 'Rejected', :from => 'lead_status'
-    click_button 'Save Lead'
-    find('#title').should have_content('Mrs Lead')
-    click_link "Dashboard"
-    page.should have_content("Bill Murray updated lead Mrs Lead")
+  scenario 'should view and edit a lead', js: true do
+    FactoryGirl.create(:lead, first_name: "Mr", last_name: "Lead", email: "mr_lead@example.com")
+    with_versioning do
+      visit leads_page
+      click_link 'Mr Lead'
+      expect(page).to have_content('Mr Lead')
+      click_link('Edit')
+      fill_in 'lead_first_name', with: 'Mrs'
+      fill_in 'lead_phone', with: '+44 0987 654321'
+      click_link('Status')
+      select 'Rejected', from: 'lead_status'
+      click_button 'Save Lead'
+      expect(summary_element).to have_content('Mrs Lead')
+
+      click_link "Dashboard"
+      expect(activities_element).to have_content("Bill Murray updated lead Mrs Lead")
+    end
   end
 
-  scenario 'should delete a lead', :js => true do
-    FactoryGirl.create(:lead, :first_name => "Mr", :last_name => "Lead", :email => "mr_lead@example.com")
+  scenario 'should delete a lead', js: true do
+    FactoryGirl.create(:lead, first_name: "Mr", last_name: "Lead", email: "mr_lead@example.com")
     visit leads_page
     click_link 'Mr Lead'
     click_link 'Delete?'
-    page.should have_content('Are you sure you want to delete this lead?')
+    expect(page).to have_content('Are you sure you want to delete this lead?')
     click_link 'Yes'
-    page.should have_content('Mr Lead has been deleted.')
-    page.should_not have_content('Mr Lead')
-    page.should_not have_content('mr_lead@example.com')
+    expect(page).to have_content('Mr Lead has been deleted.')
+    expect(page).not_to have_content('Mr Lead')
+    expect(page).not_to have_content('mr_lead@example.com')
   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") }
+  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") }
     visit leads_page
-    find('#leads').should have_content('Lead #0')
-    find('#leads').should have_content('Lead #1')
-    fill_in 'query', :with => 'Lead #0'
-    find('#leads').should have_content('Lead #0')
-    find('#leads').should_not have_content('Lead #1')
-    fill_in 'query', :with => 'Lead'
-    find('#leads').should have_content('Lead #0')
-    find('#leads').should have_content('Lead #1')
-    fill_in 'query', :with => 'Non-existant lead'
-    find('#leads').should_not have_content('Lead #0')
-    find('#leads').should_not have_content('Lead #1')
+    expect(leads_element).to have_content('Lead #0')
+    expect(leads_element).to have_content('Lead #1')
+    fill_in 'query', with: 'Lead #0'
+    expect(leads_element).to have_content('Lead #0')
+    expect(leads_element).not_to have_content('Lead #1')
+    fill_in 'query', with: 'Lead'
+    expect(leads_element).to have_content('Lead #0')
+    expect(leads_element).to have_content('Lead #1')
+    fill_in 'query', with: 'Non-existant lead'
+    expect(leads_element).not_to have_content('Lead #0')
+    expect(leads_element).not_to have_content('Lead #1')
+  end
+
+  def main_element
+    find('#main')
+  end
+
+  def summary_element
+    find('#summary')
+  end
+
+  def leads_element
+    find('#leads')
+  end
+
+  def activities_element
+    find('#activities')
   end
 end