fat_free_crm 0.19.2 → 0.20.0

data/spec/factories/user_factories.rb

@@ -7,7 +7,7 @@
 #------------------------------------------------------------------------------
 FactoryBot.define do
   factory :user do
-    username            { FactoryBot.generate(:username) }
+    username            { FFaker::InternetSE.user_name_variant_short }
     email               { FFaker::Internet.email }
     first_name          { FFaker::Name.first_name }
     last_name           { FFaker::Name.last_name }
@@ -34,8 +34,11 @@ FactoryBot.define do
     suspended_at        { nil }
     password            { "password" }
     password_confirmation { "password" }
-  end
 
+    # For unit tests, we dont need to enforce uniqueness
+    to_create { |instance| instance.save(validate: false) }
+  end
+  
   factory :admin do
     admin { true }
   end

data/spec/features/acceptance_helper.rb

@@ -8,4 +8,4 @@
 require 'spec_helper'
 
 # Put your acceptance spec helpers inside /spec/features/support
-Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
+Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].sort.each { |f| require f }

data/spec/features/accounts_spec.rb

@@ -31,8 +31,8 @@ feature 'Accounts', '
       click_link 'Create Account'
       expect(page).to have_selector('#account_name', visible: true)
       fill_in 'account_name', with: 'My new account'
-      select 'Affiliate', from: 'account_category'
-      select 'Myself', from: 'account_assigned_to'
+      select2 'Affiliate', from: 'Category:'
+      select2 'Myself', from: 'Assigned to:'
       click_link 'Contact Information'
       fill_in 'account_phone', with: '+1 2345 6789'
       fill_in 'account_website', with: 'http://www.example.com'

data/spec/features/admin/groups_spec.rb

@@ -23,7 +23,7 @@ feature 'Groups tab', '
     click_link 'create a new group'
     expect(page).to have_selector('#group_name', visible: true)
     fill_in 'group_name', with: 'The Enterprise Bridge'
-    select 'Mr Spock', from: 'group_user_ids'
+    select2 'Mr Spock', from: 'Users'
     click_button 'Create Group'
     expect(page).to have_content('The Enterprise Bridge')
     expect(page).to have_content('members: Mr Spock')

data/spec/features/admin/users_spec.rb

@@ -29,7 +29,7 @@ feature 'Users tab', '
     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'
+    select2 'Superheroes', from: 'Groups:'
 
     click_button 'Create User'
     expect(find('#users')).to have_content('Captain Thunder')

data/spec/features/campaigns_spec.rb

@@ -31,7 +31,7 @@ feature 'Campaigns', '
       click_link 'Create Campaign'
       expect(page).to have_selector('#campaign_name', visible: true)
       fill_in 'campaign_name', with: 'Cool Campaign'
-      select 'On Hold', from: 'campaign_status'
+      select2 'On Hold', from: 'Status:'
       click_link 'Comment'
       fill_in 'comment_body', with: 'This campaign is very important'
       click_button 'Create Campaign'
@@ -66,7 +66,7 @@ feature 'Campaigns', '
       click_link 'My Cool Campaign'
       click_link 'Edit'
       fill_in 'campaign_name', with: 'My Even Cooler Campaign'
-      select 'Started', from: 'campaign_status'
+      select2 'Started', from: 'Status:'
       click_button 'Save Campaign'
       expect(page).to have_content('My Even Cooler Campaign')
       expect(page).to have_content('My Even Cooler Campaign')

data/spec/features/contacts_spec.rb

@@ -77,7 +77,8 @@ feature 'Contacts', '
       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')
+      sleep(3) # TODO: A better ajax wait, or redirect on save
+      expect(find('#edit_contact_title')).to have_content('Test Subject')
 
       click_link 'Dashboard'
       expect(activities_element).to have_content("Bill Murray updated contact Test Subject")
@@ -115,10 +116,6 @@ feature 'Contacts', '
     find('#main')
   end
 
-  def summary_element
-    find('#summary')
-  end
-
   def menu_element
     find('#menu')
   end

data/spec/features/leads_spec.rb

@@ -36,13 +36,16 @@ feature 'Leads', '
       fill_in 'lead_email', with: 'mr_lead@example.com'
       fill_in 'lead_phone', with: '+44 1234 567890'
       click_link 'Status'
-      select 'Myself', from: 'lead_assigned_to'
-      select 'Contacted', from: 'lead_status'
-      select 'Campaign', from: 'lead_source'
+      select2 'Myself', from: 'Assigned to:'
+      select2 'Contacted', from: 'Status:'
+      select2 'Campaign', from: 'Source:'
       click_link 'Comment'
       fill_in 'comment_body', with: 'This is an important lead.'
-      click_link 'Status'
-      select 'Contacted', from: 'lead_status'
+
+      # TODO: Refactor to a page object
+      # This panel is already open, so clicking status again closed the div.
+      # click_link 'Status'
+      select2 'Contacted', from: 'Status:'
       click_button 'Create Lead'
       expect(leads_element).to have_content('Mr Lead')
 
@@ -79,9 +82,10 @@ feature 'Leads', '
       fill_in 'lead_first_name', with: 'Mrs'
       fill_in 'lead_phone', with: '+44 0987 654321'
       click_link('Status')
-      select 'Rejected', from: 'lead_status'
+      select2 'Rejected', from: 'Status:'
       click_button 'Save Lead'
-      expect(summary_element).to have_content('Mrs Lead')
+      sleep(3) # TODO: A better AJAX observing call, or just a redirect on save.
+      expect(find('#title')).to have_content('Mrs Lead')
 
       click_link "Dashboard"
       expect(activities_element).to have_content("Bill Murray updated lead Mrs Lead")

data/spec/features/opportunities_spec.rb

@@ -38,7 +38,7 @@ feature 'Opportunities', '
       sleep(1)
       find('li', text: 'Example Account').click
       expect(page).to have_content('Example Account')
-      select 'Prospecting', from: 'opportunity_stage'
+      select2 'Prospecting', from: 'Stage'
       click_link 'Comment'
       fill_in 'comment_body', with: 'This is a very important opportunity.'
       click_button 'Create Opportunity'
@@ -67,7 +67,7 @@ feature 'Opportunities', '
   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'
+    select2 'Prospecting', from: 'Stage:'
 
     click_link 'Comment'
     fill_in 'comment_body', with: 'This is a very important opportunity.'
@@ -85,8 +85,8 @@ feature 'Opportunities', '
       click_link 'A Cool Opportunity'
       click_link 'Edit'
       fill_in 'opportunity_name', with: 'An Even Cooler Opportunity'
-      select 'Other Example Account', from: 'account_id'
-      select 'Analysis', from: 'opportunity_stage'
+      select2 'Other Example Account', from: 'Account (create new or select existing):'
+      select2 'Analysis', from: 'Stage:'
       click_button 'Save Opportunity'
       expect(page).to have_content('An Even Cooler Opportunity')
       click_link "Dashboard"

data/spec/features/support/browser.rb

@@ -15,10 +15,14 @@ if ENV['BROWSER'] == 'chrome'
     Capybara::Selenium::Driver.new(app, browser: :chrome, desired_capabilities: capabilities)
   end
 else
+  # For local testing in an environment with a display or remote X server configured
+  # such as WSL2, use NO_HEADLESS=1 bundle exec rspec spec/features
+  #
+  # For modern firefox, use MARIONETTE=1 bundle exec rspec spec/features
   Capybara.register_driver :selenium do |app|
     options = Selenium::WebDriver::Firefox::Options.new
-    options.args << '--headless'
-    capabilities = Selenium::WebDriver::Remote::Capabilities.firefox(marionette: false)
+    options.args << '--headless' unless ENV['NO_HEADLESS'].present?
+    capabilities = Selenium::WebDriver::Remote::Capabilities.firefox(marionette: ENV['MARIONETTE'].present?)
     Capybara::Selenium::Driver.new(app, browser: :firefox, options: options, desired_capabilities: capabilities)
   end
 end

data/spec/features/support/selector_helpers.rb

@@ -7,7 +7,7 @@
 #------------------------------------------------------------------------------
 module SelectorHelpers
   def click_filter_tab(filter_name)
-    tab = find(:xpath, "//div[@class='filters']//td[contains(text(), '#{filter_name}')]")
+    tab = find(:xpath, "//div[@class='filters']//a[contains(text(), '#{filter_name}')]")
     tab.click
   end
 
@@ -22,6 +22,15 @@ module SelectorHelpers
       page.execute_script "$('#task_#{task_id} a')[1].click()"
     end
   end
+
+  # See github.com/goodwill/capybara-select2
+  def select2(value, options = {})
+    select2_container = find("div.label", text: options[:from]).find(:xpath, '..').find('.select2-container')
+
+    select2_container.find(".select2-selection").click
+    drop_container = ".select2-dropdown"
+    find(:xpath, "//body").find("#{drop_container} li.select2-results__option", text: value).click
+  end
 end
 
 RSpec.configuration.include SelectorHelpers, type: :feature

data/spec/features/tasks_spec.rb

@@ -33,9 +33,9 @@ feature 'Tasks', '
       click_link 'Create Task'
       expect(page).to have_selector('#task_name', visible: true)
       fill_in 'task_name', with: 'Task I Need To Do'
-      select 'Tomorrow', from: 'task_bucket'
-      select 'Myself', from: 'task_assigned_to'
-      select 'Call', from: 'task_category'
+      select2 'Tomorrow', from: 'Due:'
+      select2 'Myself', from: 'Assign to:'
+      select2 'Call', from: 'Category:'
       click_button 'Create Task'
       expect(page).to have_content('Task I Need To Do')
 
@@ -51,9 +51,9 @@ feature 'Tasks', '
       click_link 'Create Task'
       expect(page).to have_selector('#task_name', visible: true)
       fill_in 'task_name', with: 'Task For Someone Else'
-      select 'Tomorrow', from: 'task_bucket'
-      select 'Another User', from: 'task_assigned_to'
-      select 'Call', from: 'task_category'
+      select2 'Tomorrow', from: 'Due:'
+      select2 'Another User', from: 'Assign to:'
+      select2 'Call', from: 'Category:'
       click_button 'Create Task'
       expect(page).to have_content('The task has been created and assigned to Another User')
 

data/spec/helpers/accounts_helper_spec.rb

@@ -8,9 +8,66 @@
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe AccountsHelper do
+  let(:assignee) { create(:user) }
   # Delete this example and add some real ones or delete this file
   it "should be included in the object returned by #helper" do
     included_modules = (class << helper; self; end).send :included_modules
     expect(included_modules).to include(AccountsHelper)
   end
+  describe '#display_pipeline' do
+    context 'when the pipeline is zero' do
+      it 'returns "N/A"' do
+        expect(display_value(0)).to eq('N/A')
+      end
+    end
+    context 'when the pipeline is has 300' do
+      it 'returns "$300"' do
+        expect(display_value(300)).to eq('$300')
+      end
+    end
+  end
+  describe '#display_won' do
+    context 'when the won is zero' do
+      it 'returns "N/A"' do
+        expect(display_value(0)).to eq('N/A')
+      end
+    end
+    context 'when the won is has 300' do
+      it 'returns "$300"' do
+        expect(display_value(300)).to eq('$300')
+      end
+    end
+  end
+  describe '#display_lost' do
+    context 'when the lost is zero' do
+      it 'returns "N/A"' do
+        expect(display_value(0)).to eq('N/A')
+      end
+    end
+    context 'when the lost is has 300' do
+      it 'returns "$300"' do
+        expect(display_value(300)).to eq('$300')
+      end
+    end
+  end
+  describe '#display_assigned' do
+    context 'when the name is under 16 chars' do
+      it 'returns the name' do
+        @account = create(:account)
+        allow(@account).to receive(:assignee).and_return(assignee)
+        allow(assignee).to receive(:full_name).and_return('Abe Lincoln')
+        allow(@account).to receive(:assigned_to).and_return(1)
+        expect(display_assigned(@account)).to eq('Abe Lincoln')
+      end
+    end
+    context 'when the name is over 16 chars' do
+      it 'returns the truncated name' do
+        @account = create(:account)
+        allow(@account).to receive(:assignee).and_return(assignee)
+        allow(assignee).to receive(:full_name).and_return('Richard Milhouse Nixon')
+        allow(@account).to receive(:assigned_to).and_return(1)
+        expect(display_assigned(@account)).to eq('Richard Milho...')
+      end
+    end
+  end
 end

data/spec/models/entities/opportunity_spec.rb

@@ -113,14 +113,14 @@ describe Opportunity do
 
     it "should set the probability to 0% if opportunity has been lost" do
       opportunity = create(:opportunity, stage: "prospecting", probability: 25)
-      opportunity.update_attributes(stage: 'lost')
+      opportunity.update(stage: 'lost')
       opportunity.reload
       expect(opportunity.probability).to eq(0)
     end
 
     it "should set the probablility to 100% if opportunity has been won" do
       opportunity = create(:opportunity, stage: "prospecting", probability: 65)
-      opportunity.update_attributes(stage: 'won')
+      opportunity.update(stage: 'won')
       opportunity.reload
       expect(opportunity.probability).to eq(100)
     end

data/spec/models/fields/custom_field_pair_spec.rb

@@ -45,9 +45,9 @@ describe CustomFieldPair do
 
     it "should update the pair" do
       foo1 = double(required: true, disabled: 'false')
-      expect(foo1).to receive(:update_attributes).with(@field.merge(@pair1))
+      expect(foo1).to receive(:update).with(@field.merge(@pair1))
       foo2 = double
-      expect(foo2).to receive(:update_attributes).with(@field.merge(@pair2).merge('required' => true, 'disabled' => 'false'))
+      expect(foo2).to receive(:update).with(@field.merge(@pair2).merge('required' => true, 'disabled' => 'false'))
       expect(foo1).to receive(:paired_with).and_return(foo2)
       expect(CustomFieldPair).to receive(:find).with('3').and_return(foo1)
 

data/spec/models/observers/entity_observer_spec.rb

@@ -52,7 +52,7 @@ describe EntityObserver do
 
       it "notifies the new owner if the entity is re-assigned" do
         expect(UserMailer).to receive(:assigned_entity_notification).with(entity, assigner).and_return(mail)
-        entity.update_attributes(assignee: assignee)
+        entity.update(assignee: assignee)
       end
 
       it "does not notify the owner if the entity is not re-assigned" do
@@ -62,12 +62,12 @@ describe EntityObserver do
 
       it "does not notify anyone if the entity becomes unassigned" do
         expect(UserMailer).not_to receive(:assigned_entity_notification)
-        entity.update_attributes(assignee: nil)
+        entity.update(assignee: nil)
       end
 
       it "does not notify me if I re-assign an entity to myself" do
         expect(UserMailer).not_to receive(:assigned_entity_notification)
-        entity.update_attributes(assignee: assigner)
+        entity.update(assignee: assigner)
       end
     end
   end

data/spec/models/polymorphic/task_spec.rb

@@ -63,14 +63,14 @@ describe Task do
   describe "Task/Update" do
     it "should update task name" do
       task = create(:task, name: "Hello")
-      task.update_attributes(name: "World")
+      task.update(name: "World")
       expect(task.errors).to be_empty
       expect(task.name).to eq("World")
     end
 
     it "should update task category" do
       task = create(:task, category: "call")
-      task.update_attributes(category: "email")
+      task.update(category: "email")
       expect(task.errors).to be_empty
       expect(task.category).to eq("email")
     end
@@ -79,7 +79,7 @@ describe Task do
       him = create(:user)
       her = create(:user)
       task = create(:task, assigned_to: him.id)
-      task.update_attributes(assigned_to: her.id)
+      task.update(assigned_to: her.id)
       expect(task.errors).to be_empty
       expect(task.assigned_to).to eq(her.id)
       expect(task.assignee).to eq(her)
@@ -88,7 +88,7 @@ describe Task do
     it "should reassign the task from another person to myself" do
       him = create(:user)
       task = create(:task, assigned_to: him.id)
-      task.update_attributes(assigned_to: "")
+      task.update(assigned_to: "")
       expect(task.errors).to be_empty
       expect(task.assigned_to).to eq(nil)
       expect(task.assignee).to eq(nil)
@@ -101,7 +101,7 @@ describe Task do
 
       it "should update due date based on selected bucket within #{offset ? 'different' : 'current'} timezone" do
         task = create(:task, due_at: Time.now.midnight.tomorrow, bucket: "due_tomorrow")
-        task.update_attributes(bucket: "due_this_week")
+        task.update(bucket: "due_this_week")
         expect(task.errors).to be_empty
         expect(task.bucket).to eq("due_this_week")
         expect(task.due_at.change(usec: 0)).to eq(Time.zone.now.end_of_week.change(usec: 0))
@@ -109,7 +109,7 @@ describe Task do
 
       it "should update due date if specific calendar date selected within #{offset ? 'different' : 'current'} timezone" do
         task = create(:task, due_at: Time.now.midnight.tomorrow, bucket: "due_tomorrow")
-        task.update_attributes(bucket: "specific_time", calendar: "2020-03-20")
+        task.update(bucket: "specific_time", calendar: "2020-03-20")
         expect(task.errors).to be_empty
         expect(task.bucket).to eq("specific_time")
         expect(task.due_at.to_i).to eq(Time.parse("2020-03-20").to_i)
@@ -120,7 +120,7 @@ describe Task do
   describe "Task/Complete" do
     it "should complete a task that is overdue" do
       task = create(:task, due_at: 2.days.ago, bucket: "overdue")
-      task.update_attributes(completed_at: Time.now, completed_by: task.user.id)
+      task.update(completed_at: Time.now, completed_by: task.user.id)
 
       expect(task.errors).to be_empty
       expect(task.completed_at).not_to eq(nil)
@@ -129,7 +129,7 @@ describe Task do
 
     it "should complete a task due sometime in the future" do
       task = create(:task, due_at: Time.now.midnight.tomorrow, bucket: "due_tomorrow")
-      task.update_attributes(completed_at: Time.now, completed_by: task.user.id)
+      task.update(completed_at: Time.now, completed_by: task.user.id)
 
       expect(task.errors).to be_empty
       expect(task.completed_at).not_to eq(nil)
@@ -139,7 +139,7 @@ describe Task do
     it "should complete a task that is due on specific date in the future" do
       task = create(:task, calendar: "10/10/2022 12:00 AM", bucket: "specific_time")
       task.calendar = nil # Calendar is not saved in the database; we need it only to set the :due_at.
-      task.update_attributes(completed_at: Time.now, completed_by: task.user.id)
+      task.update(completed_at: Time.now, completed_by: task.user.id)
       expect(task.errors).to be_empty
       expect(task.completed_at).not_to eq(nil)
       expect(task.completor).to eq(task.user)
@@ -148,7 +148,7 @@ describe Task do
     it "should complete a task that is due on specific date in the past" do
       task = create(:task, calendar: "10/10/1992 12:00 AM", bucket: "specific_time")
       task.calendar = nil # Calendar is not saved in the database; we need it only to set the :due_at.
-      task.update_attributes(completed_at: Time.now, completed_by: task.user.id)
+      task.update(completed_at: Time.now, completed_by: task.user.id)
       expect(task.errors).to be_empty
       expect(task.completed_at).not_to eq(nil)
       expect(task.completor).to eq(task.user)
@@ -158,7 +158,7 @@ describe Task do
       due_at = Time.now - 42.days
       task = create(:task, due_at: due_at, bucket: "specific_time",
                            calendar: due_at.strftime('%Y-%m-%d %H:%M'))
-      task.update_attributes(completed_at: Time.now, completed_by: task.user.id, calendar: '')
+      task.update(completed_at: Time.now, completed_by: task.user.id, calendar: '')
 
       expect(task.completed?).to eq(true)
       expect(task.due_at).to eq(due_at.utc.strftime('%Y-%m-%d %H:%M'))

data/spec/models/polymorphic/version_spec.rb

@@ -82,9 +82,9 @@ describe Version, versioning: true do
 
       it "should add a version when updating existing #{item}" do
         if @item.respond_to?(:full_name)
-          @item.update_attributes(first_name: "Billy", last_name: "Bones")
+          @item.update(first_name: "Billy", last_name: "Bones")
         else
-          @item.update_attributes(name: "Billy Bones")
+          @item.update(name: "Billy Bones")
         end
         @version = Version.where(@conditions.merge(event: 'update')).first
 

data/spec/models/users/preference_spec.rb

@@ -22,7 +22,7 @@ require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
 describe Preference do
   before(:each) do
     @user = create(:user)
-    @magoody = Base64.encode64(Marshal.dump("magoody"))
+    @magoody = Base64.encode64("magoody".to_json)
   end
 
   it "should create a new instance given valid attributes" do

data/spec/views/accounts/_edit.haml_spec.rb

@@ -22,7 +22,7 @@ describe "/accounts/_edit" do
     expect(view).to render_template(partial: "_contact_info")
     expect(view).to render_template(partial: "_permissions")
 
-    expect(rendered).to have_tag("form[class=edit_account]") do |form|
+    expect(rendered).to have_tag('form[class="simple_form edit_account"]') do |form|
       expect(form).to have_tag "input[type=hidden][id=account_user_id][value='#{@account.user_id}']"
     end
   end

data/spec/views/accounts/_new.haml_spec.rb

@@ -23,7 +23,7 @@ describe "/accounts/_new" do
     expect(view).to render_template(partial: "_contact_info")
     expect(view).to render_template(partial: "_permissions")
 
-    expect(rendered).to have_tag("form[class=new_account]")
+    expect(rendered).to have_tag('form[class="simple_form new_account"]')
   end
 
   it "should render background info field if settings require so" do

data/spec/views/accounts/create.js.haml_spec.rb

@@ -47,7 +47,6 @@ describe "/accounts/create" do
       render
 
       expect(rendered).to include("#create_account")
-      expect(rendered).to include(%/$('#create_account').effect("shake"/)
     end
   end
 end

data/spec/views/accounts/update.js.haml_spec.rb

@@ -34,7 +34,6 @@ describe "/accounts/update" do
         render
         expect(rendered).to include("$('#sidebar').html")
         expect(rendered).to have_text("Recent Items")
-        expect(rendered).to include("$('#summary').effect('shake'")
       end
     end
 
@@ -70,11 +69,10 @@ describe "/accounts/update" do
         controller.request.env["HTTP_REFERER"] = "http://localhost/accounts/123"
       end
 
-      it "should redraw the [edit_account] form and shake it" do
+      it "should redraw the [edit_account] form" do
         render
 
         expect(rendered).to include("#edit_account")
-        expect(rendered).to include(%/$('#edit_account').effect("shake"/)
         expect(rendered).to include('focus()')
       end
     end
@@ -84,11 +82,10 @@ describe "/accounts/update" do
         controller.request.env["HTTP_REFERER"] = "http://localhost/accounts"
       end
 
-      it "should redraw the [edit_account] form and shake it" do
+      it "should redraw the [edit_account] form" do
         render
 
         expect(rendered).to include("account_#{@account.id}")
-        expect(rendered).to include(%/$('#account_#{@account.id}').effect("shake"/)
         expect(rendered).to include('focus()')
       end
     end

data/spec/views/admin/field_groups/create.js.haml_spec.rb

@@ -26,6 +26,5 @@ describe "admin/field_groups/create" do
     allow(field_group).to receive(:valid?).and_return(false)
     render
     expect(view).to render_template("admin/field_groups/create")
-    expect(rendered).to have_text("effect(\"shake\", { duration:250, distance: 6 });")
   end
 end

data/spec/views/admin/field_groups/update.js.haml_spec.rb

@@ -25,6 +25,5 @@ describe "admin/field_groups/update" do
   it "renders javascript for invalid field group" do
     allow(field_group.errors).to receive(:empty?).and_return(false)
     render
-    expect(rendered).to have_text("$('##{dom_id(field_group, :edit)}').effect('shake', { distance:5 }, 250);")
   end
 end

data/spec/views/admin/users/create.js.haml_spec.rb

@@ -36,7 +36,6 @@ describe "admin/users/create" do
       render
 
       expect(rendered).to include('Please specify username')
-      expect(rendered).to include(%/$('#create_user').effect("shake"/)
     end
   end
 end

data/spec/views/admin/users/destroy.js.haml_spec.rb

@@ -37,12 +37,6 @@ describe "admin/users/destroy" do
       expect(rendered).to include(%/crm.flick('#{dom_id(@user, :confirm)}', 'remove');/)
     end
 
-    it "should shake user partial" do
-      render
-
-      expect(rendered).to include(%/$('#user_#{@user.id}').effect('shake'/)
-    end
-
     it "should show flash message" do
       render
 

data/spec/views/admin/users/update.js.haml_spec.rb

@@ -27,11 +27,10 @@ describe "admin/users/update" do
       @user.errors.add(:name)
     end
 
-    it "redraws [Edit User] form and shakes it" do
+    it "redraws [Edit User] form" do
       render
 
       expect(rendered).to include("user_#{@user.id}")
-      expect(rendered).to include(%/$('#user_#{@user.id}').effect("shake"/)
       expect(rendered).to include(%/$('#user_username').focus()/)
     end
   end

data/spec/views/campaigns/_edit.haml_spec.rb

@@ -23,7 +23,7 @@ describe "/campaigns/_edit" do
     expect(view).to render_template(partial: "campaigns/_objectives")
     expect(view).to render_template(partial: "_permissions")
 
-    expect(view).to have_tag("form[class=edit_campaign]") do
+    expect(view).to have_tag('form[class="simple_form edit_campaign"]') do
       with_tag "input[type=hidden][id=campaign_user_id][value='#{@campaign.user_id}']"
     end
   end

data/spec/views/campaigns/_new.haml_spec.rb

@@ -22,7 +22,7 @@ describe "/campaigns/_new" do
     expect(view).to render_template(partial: "campaigns/_objectives")
     expect(view).to render_template(partial: "_permissions")
 
-    expect(rendered).to have_tag("form[class=new_campaign]")
+    expect(rendered).to have_tag('form[class="simple_form new_campaign"]')
   end
 
   it "should render background info field if settings require so" do

data/spec/views/campaigns/create.js.haml_spec.rb

@@ -44,7 +44,6 @@ describe "/campaigns/create" do
       render
 
       expect(rendered).to include("$('#create_campaign').html")
-      expect(rendered).to include(%/$('#create_campaign').effect("shake"/)
     end
   end
 end

data/spec/views/campaigns/destroy.js.haml_spec.rb

@@ -23,7 +23,6 @@ describe "/campaigns/destroy" do
   it "should update Campaigns sidebar" do
     expect(rendered).to include("#sidebar")
     expect(rendered).to have_text("Recent Items")
-    expect(rendered).to include(%/$('#filters').effect('shake'/)
   end
 
   it "should update pagination" do