fat_free_crm 0.19.2 → 0.20.0

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

@@ -31,9 +31,7 @@ describe "/campaigns/update" do
       it "should update sidebar" do
         render
         expect(rendered).to include("#sidebar")
-        expect(rendered).to have_text("Campaign Summary")
         expect(rendered).to have_text("Recent Items")
-        expect(rendered).to include("$('#summary').effect('shake'")
       end
     end
 
@@ -57,10 +55,9 @@ describe "/campaigns/update" do
         controller.request.env["HTTP_REFERER"] = "http://localhost/campaigns/123"
       end
 
-      it "should redraw the [edit_campaign] form and shake it" do
+      it "should redraw the [edit_campaign] form" do
         render
         expect(rendered).to include("$('#edit_campaign').html")
-        expect(rendered).to include(%/$('#edit_campaign').effect("shake"/)
         expect(rendered).to include('focus()')
       end
     end
@@ -71,10 +68,9 @@ describe "/campaigns/update" do
         controller.request.env["HTTP_REFERER"] = "http://localhost/campaigns"
       end
 
-      it "should redraw the [edit_campaign] form and shake it" do
+      it "should redraw the [edit_campaign] form" do
         render
         expect(rendered).to include("$('#campaign_#{@campaign.id}').html")
-        expect(rendered).to include(%/$('#campaign_#{@campaign.id}').effect("shake"/)
         expect(rendered).to include('focus()')
       end
     end

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

@@ -26,7 +26,7 @@ describe "/contacts/_edit" do
     expect(view).to render_template(partial: "contacts/_web")
     expect(view).to render_template(partial: "_permissions")
 
-    expect(rendered).to have_tag("form[class=edit_contact]") do
+    expect(rendered).to have_tag('form[class="simple_form edit_contact"]') do
       with_tag "input[type=hidden][id=contact_user_id][value='#{@contact.user_id}']"
     end
   end

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

@@ -26,7 +26,7 @@ describe "/contacts/_new" do
     expect(view).to render_template(partial: "contacts/_web")
     expect(view).to render_template(partial: "entities/_permissions")
 
-    expect(rendered).to have_tag("form[class=new_contact]")
+    expect(rendered).to have_tag('form[class="simple_form new_contact"]')
   end
 
   it "should pick default assignee (Myself)" do

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

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

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

@@ -34,7 +34,6 @@ describe "/contacts/update" do
         render
         expect(rendered).to include("#sidebar")
         expect(rendered).to have_text("Recent Items")
-        expect(rendered).to include("$('#summary').effect('shake'")
       end
     end
 
@@ -88,11 +87,10 @@ describe "/contacts/update" do
         controller.request.env["HTTP_REFERER"] = "http://localhost/contacts/123"
       end
 
-      it "should redraw the [edit_contact] form and shake it" do
+      it "should redraw the [edit_contact] form" do
         render
         expect(rendered).to include("$('#edit_contact').html")
         expect(rendered).to include('crm.create_or_select_account(false)')
-        expect(rendered).to include(%/$('#edit_contact').effect("shake"/)
         expect(rendered).to include('focus()')
       end
     end
@@ -102,11 +100,10 @@ describe "/contacts/update" do
         controller.request.env["HTTP_REFERER"] = "http://localhost/contacts"
       end
 
-      it "should redraw the [edit_contact] form and shake it" do
+      it "should redraw the [edit_contact] form" do
         render
         expect(rendered).to include("$('#contact_#{@contact.id}').html")
         expect(rendered).to include('crm.create_or_select_account(false)')
-        expect(rendered).to include(%/$('#contact_#{@contact.id}').effect("shake"/)
         expect(rendered).to include('focus()')
       end
     end
@@ -121,10 +118,9 @@ describe "/contacts/update" do
         expect(rendered).to include("crm.create_or_select_account(#{@referer =~ %r{/accounts/}})")
       end
 
-      it "should redraw the [edit_contact] form and shake it" do
+      it "should redraw the [edit_contact] form" do
         render
         expect(rendered).to include("$('#contact_#{@contact.id}').html")
-        expect(rendered).to include(%/$('#contact_#{@contact.id}').effect("shake"/)
         expect(rendered).to include('focus()')
       end
     end

data/spec/views/home/index.haml_spec.rb

@@ -19,7 +19,7 @@ describe "/home/index" do
     assign(:my_tasks, [])
     assign(:my_opportunities, [])
     assign(:my_accounts, [])
-    render
+    render template: 'home/index', formats: [:html]
     expect(view).to render_template(partial: "_activity")
   end
 
@@ -28,7 +28,7 @@ describe "/home/index" do
     assign(:my_tasks, [])
     assign(:my_opportunities, [])
     assign(:my_accounts, [])
-    render
+    render template: 'home/index', formats: [:html]
     expect(view).not_to render_template(partial: "_activity")
 
     expect(rendered).to include("No activity records found.")

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

@@ -26,7 +26,7 @@ describe "/leads/_edit" do
     expect(view).to render_template(partial: "leads/_web")
     expect(view).to render_template(partial: "entities/_permissions")
 
-    expect(rendered).to have_tag("form[class=edit_lead]") do
+    expect(rendered).to have_tag('form[class="simple_form edit_lead"]') do
       with_tag "input[type=hidden][id=lead_user_id][value='#{@lead.user_id}']"
     end
   end

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

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

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

@@ -35,7 +35,6 @@ describe "/leads/create" do
       expect(rendered).to include("#sidebar")
       expect(rendered).to have_text("Lead Statuses")
       expect(rendered).to include("Recent Items")
-      expect(rendered).to include("$('#filters').effect('shake'")
     end
 
     it "should update pagination when called from leads index" do
@@ -51,7 +50,6 @@ describe "/leads/create" do
       render
 
       expect(rendered).to include("#sidebar")
-      expect(rendered).to have_text("Campaign Summary")
       expect(rendered).to have_text("Recent Items")
     end
   end
@@ -64,7 +62,6 @@ describe "/leads/create" do
       render
 
       expect(rendered).to include("$('#create_lead').html")
-      expect(rendered).to include(%/$('#create_lead').effect("shake"/)
     end
   end
 end

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

@@ -26,7 +26,6 @@ describe "/leads/destroy" 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 when called from leads index" do
@@ -43,7 +42,6 @@ describe "/leads/destroy" do
     render
 
     expect(rendered).to include("#sidebar")
-    expect(rendered).to have_text("Campaign Summary")
     expect(rendered).to have_text("Recent Items")
   end
 end

data/spec/views/leads/promote.js.haml_spec.rb

@@ -37,9 +37,7 @@ describe "/leads/promote" do
       it "should update sidebar" do
         render
         expect(rendered).to include("#sidebar")
-        expect(rendered).to have_text("Lead Summary")
         expect(rendered).to have_text("Recent Items")
-        expect(rendered).to include("$('#summary').effect('shake'")
       end
     end
 
@@ -51,7 +49,6 @@ describe "/leads/promote" do
       it "should replace [Convert Lead] with lead partial and highlight it" do
         render
         expect(rendered).to include("$('#lead_#{@lead.id}').replaceWith('<li class=\\'highlight lead\\' id=\\'lead_#{@lead.id}\\'")
-        expect(rendered).to include("$('#filters').effect('shake'")
       end
 
       it "should update sidebar" do
@@ -59,7 +56,6 @@ describe "/leads/promote" do
         expect(rendered).to include("#sidebar")
         expect(rendered).to have_text("Lead Status")
         expect(rendered).to have_text("Recent Items")
-        expect(rendered).to include("$('#filters').effect('shake'")
       end
     end
 
@@ -81,7 +77,6 @@ describe "/leads/promote" do
         render
 
         expect(rendered).to include("#sidebar")
-        expect(rendered).to have_text("Summary")
         expect(rendered).to have_text("Recent Items")
       end
 
@@ -103,10 +98,9 @@ describe "/leads/promote" do
         controller.request.env["HTTP_REFERER"] = "http://localhost/leads/123"
       end
 
-      it "should redraw the [Convert Lead] form and shake it" do
+      it "should redraw the [Convert Lead] form" do
         render
         expect(rendered).to include("$('#convert_lead').html")
-        expect(rendered).to include(%/$('#convert_lead').effect("shake"/)
       end
     end
 
@@ -115,10 +109,9 @@ describe "/leads/promote" do
         controller.request.env["HTTP_REFERER"] = "http://localhost/leads"
       end
 
-      it "should redraw the [Convert Lead] form and shake it" do
+      it "should redraw the [Convert Lead] form" do
         render
         expect(rendered).to include("$('#lead_#{@lead.id}').html")
-        expect(rendered).to include(%/$('#lead_#{@lead.id}').effect("shake"/)
       end
     end
 
@@ -127,10 +120,9 @@ describe "/leads/promote" do
         controller.request.env["HTTP_REFERER"] = "http://localhost/campaigns/123"
       end
 
-      it "should redraw the [Convert Lead] form and shake it" do
+      it "should redraw the [Convert Lead] form" do
         render
         expect(rendered).to include("$('#lead_#{@lead.id}').html")
-        expect(rendered).to include(%/$('#lead_#{@lead.id}').effect("shake"/)
       end
     end
 

data/spec/views/leads/reject.js.haml_spec.rb

@@ -26,14 +26,12 @@ describe "/leads/reject" do
     render
 
     expect(rendered).to include("$('#sidebar').html")
-    expect(rendered).to include("$('#filters').effect('shake'")
   end
 
   it "should update sidebar summary when called from landing page" do
     render
 
     expect(rendered).to include("$('#sidebar').html")
-    expect(rendered).to include("$('#summary').effect('shake'")
   end
 
   it "should update campaign sidebar if called from campaign landing page" do
@@ -42,7 +40,6 @@ describe "/leads/reject" do
     render
 
     expect(rendered).to include("#sidebar")
-    expect(rendered).to have_text("Summary")
     expect(rendered).to have_text("Recent Items")
   end
 end

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

@@ -31,8 +31,6 @@ describe "/leads/update" do
       it "should update sidebar" do
         render
         expect(rendered).to include("#sidebar")
-        expect(rendered).to have_text("Lead Summary")
-        expect(rendered).to include("$('#summary').effect('shake'")
       end
     end
 
@@ -44,7 +42,6 @@ describe "/leads/update" do
       it "should replace [Edit Lead] with lead partial and highlight it" do
         render
         expect(rendered).to include("$('#lead_#{@lead.id}').replaceWith('<li class=\\'highlight lead\\' id=\\'lead_#{@lead.id}\\'")
-        expect(rendered).to include("$('#filters').effect('shake'")
       end
 
       it "should update sidebar" do
@@ -52,7 +49,6 @@ describe "/leads/update" do
         expect(rendered).to include("#sidebar")
         expect(rendered).to have_text("Lead Statuses")
         expect(rendered).to have_text("Recent Items")
-        expect(rendered).to include("$('#filters').effect('shake'")
       end
     end
 
@@ -73,7 +69,6 @@ describe "/leads/update" do
         render
 
         expect(rendered).to include("sidebar")
-        expect(rendered).to have_text("Campaign Summary")
         expect(rendered).to have_text("Recent Items")
       end
     end
@@ -89,10 +84,9 @@ describe "/leads/update" do
         controller.request.env["HTTP_REFERER"] = "http://localhost/leads/123"
       end
 
-      it "should redraw the [edit_lead] form and shake it" do
+      it "should redraw the [edit_lead] form" do
         render
         expect(rendered).to include("#edit_lead")
-        expect(rendered).to include(%/$('#edit_lead').effect("shake"/)
         expect(rendered).to include('focus()')
       end
     end
@@ -102,10 +96,9 @@ describe "/leads/update" do
         controller.request.env["HTTP_REFERER"] = "http://localhost/leads"
       end
 
-      it "should redraw the [edit_lead] form and shake it" do
+      it "should redraw the [edit_lead] form" do
         render
         expect(rendered).to include("$('#lead_#{@lead.id}').html")
-        expect(rendered).to include(%/$('#lead_#{@lead.id}').effect("shake"/)
         expect(rendered).to include('focus()')
       end
     end
@@ -115,10 +108,9 @@ describe "/leads/update" do
         controller.request.env["HTTP_REFERER"] = "http://localhost/campaigns/123"
       end
 
-      it "should redraw the [edit_lead] form and shake it" do
+      it "should redraw the [edit_lead] form" do
         render
         expect(rendered).to include("$('#lead_#{@lead.id}').html")
-        expect(rendered).to include(%/$('#lead_#{@lead.id}').effect("shake"/)
         expect(rendered).to include('focus()')
       end
     end

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

@@ -22,7 +22,7 @@ describe "/opportunities/_edit" do
     assign(:opportunity, @opportunity = build_stubbed(:opportunity, campaign: @campaign = build_stubbed(:campaign)))
     render
 
-    expect(rendered).to have_tag("form[class=edit_opportunity]") do
+    expect(rendered).to have_tag('form[class="simple_form edit_opportunity"]') do
       with_tag "input[type=hidden][id=opportunity_user_id][value='#{@opportunity.user_id}']"
       with_tag "input[type=hidden][id=opportunity_campaign_id][value='#{@opportunity.campaign_id}']"
     end

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

@@ -25,7 +25,7 @@ describe "/opportunities/_new" do
     expect(view).to render_template(partial: "opportunities/_top_section")
     expect(view).to render_template(partial: "entities/_permissions")
 
-    expect(rendered).to have_tag("form[class=new_opportunity]")
+    expect(rendered).to have_tag('form[class="simple_form new_opportunity"]')
   end
 
   it "should pick default assignee (Myself)" do

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

@@ -58,7 +58,6 @@ describe "/opportunities/create" do
       render
 
       expect(rendered).to include("#sidebar")
-      expect(rendered).to have_text("Campaign Summary")
       expect(rendered).to have_text("Recent Items")
     end
 
@@ -81,7 +80,6 @@ describe "/opportunities/create" do
       render
 
       expect(rendered).to include("$('#create_opportunity').html")
-      expect(rendered).to include(%/$('#create_opportunity').effect("shake"/)
       expect(rendered).to include("crm.create_or_select_account(false)")
     end
   end

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

@@ -27,7 +27,6 @@ describe "/opportunities/destroy" 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 when called from opportunities index" do
@@ -44,7 +43,6 @@ describe "/opportunities/destroy" do
     render
 
     expect(rendered).to include("#sidebar")
-    expect(rendered).to have_text("Account Summary")
     expect(rendered).to have_text("Recent Items")
   end
 
@@ -54,7 +52,6 @@ describe "/opportunities/destroy" do
     render
 
     expect(rendered).to include("#sidebar")
-    expect(rendered).to have_text("Campaign Summary")
     expect(rendered).to have_text("Recent Items")
   end
 

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

@@ -34,9 +34,7 @@ describe "/opportunities/update" do
       it "should update sidebar" do
         render
         expect(rendered).to include("#sidebar")
-        expect(rendered).to have_text("Opportunity At a Glance")
         expect(rendered).to have_text("Recent Items")
-        expect(rendered).to include("$('#summary').effect('shake'")
       end
     end
 
@@ -56,7 +54,6 @@ describe "/opportunities/update" do
         expect(rendered).to include("sidebar")
         expect(rendered).to have_text("Opportunity Stages")
         expect(rendered).to have_text("Recent Items")
-        expect(rendered).to include("$('#filters').effect('shake'")
       end
     end
 
@@ -67,7 +64,6 @@ describe "/opportunities/update" do
         render
 
         expect(rendered).to include("#sidebar")
-        expect(rendered).to have_text("Account Summary")
         expect(rendered).to have_text("Recent Items")
       end
 
@@ -77,7 +73,6 @@ describe "/opportunities/update" do
         render
 
         expect(rendered).to include("#sidebar")
-        expect(rendered).to have_text("Campaign Summary")
         expect(rendered).to have_text("Recent Items")
       end
 
@@ -107,11 +102,10 @@ describe "/opportunities/update" do
         controller.request.env["HTTP_REFERER"] = "http://localhost/opportunities/123"
       end
 
-      it "should redraw the [edit_opportunity] form and shake it" do
+      it "should redraw the [edit_opportunity] form" do
         render
         expect(rendered).to include("$('#edit_opportunity').html")
         expect(rendered).to include('crm.create_or_select_account(false)')
-        expect(rendered).to include(%/$('#edit_opportunity').effect("shake"/)
         expect(rendered).to include('focus()')
       end
     end
@@ -121,11 +115,10 @@ describe "/opportunities/update" do
         controller.request.env["HTTP_REFERER"] = "http://localhost/opportunities"
       end
 
-      it "should redraw the [edit_opportunity] form and shake it" do
+      it "should redraw the [edit_opportunity] form" do
         render
         expect(rendered).to include("$('#opportunity_#{@opportunity.id}').html")
         expect(rendered).to include('crm.create_or_select_account(false)')
-        expect(rendered).to include(%/$('#opportunity_#{@opportunity.id}').effect("shake"/)
         expect(rendered).to include('focus()')
       end
     end
@@ -140,10 +133,9 @@ describe "/opportunities/update" do
         expect(rendered).to include("crm.create_or_select_account(#{@referer =~ %r{/accounts/}})")
       end
 
-      it "should redraw the [edit_opportunity] form and shake it" do
+      it "should redraw the [edit_opportunity] form" do
         render
         expect(rendered).to include("$('#opportunity_#{@opportunity.id}').html")
-        expect(rendered).to include(%/$('#opportunity_#{@opportunity.id}').effect("shake"/)
         expect(rendered).to include('focus()')
       end
     end

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

@@ -23,7 +23,7 @@ describe "/tasks/_edit" do
 
     expect(view).to render_template(partial: "tasks/_top_section")
 
-    expect(rendered).to have_tag("form[class=edit_task]")
+    expect(rendered).to have_tag('form[class="simple_form edit_task"]')
   end
 
   ["As Soon As Possible", "Today", "Tomorrow", "This Week", "Next Week", "Sometime Later"].each do |day|

data/spec/views/tasks/complete.js.haml_spec.rb

@@ -42,7 +42,6 @@ describe "/tasks/complete" do
       expect(rendered).to include("$('#sidebar').html")
       expect(rendered).to have_text("Assigned")
       expect(rendered).to have_text("Recent Items")
-      expect(rendered).to include("$('#filters').effect('shake'")
     end
   end
 

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

@@ -41,7 +41,6 @@ describe "/tasks/create" do
         expect(rendered).to include("$('#sidebar').html")
         expect(rendered).to have_text("Recent Items")
         expect(rendered).to have_text("Sometime Later")
-        expect(rendered).to include("$('#filters').effect('shake'")
       end
     end
   end
@@ -115,7 +114,6 @@ describe "/tasks/create" do
     assign(:task, build(:task, name: nil)) # make it invalid
     render
 
-    expect(rendered).to include(%/$('#create_task').effect("shake"/)
     expect(rendered).to include(%/$('#new_task input[type=submit]').enable()/)
   end
 end

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

@@ -39,7 +39,6 @@ describe "/tasks/destroy" do
         expect(rendered).to include("$('#sidebar').html")
         expect(rendered).to have_text("Recent Items")
         expect(rendered).to have_text("Completed")
-        expect(rendered).to include("$('#filters').effect('shake'")
       end
     end
   end

data/spec/views/tasks/uncomplete.js.haml_spec.rb

@@ -40,7 +40,6 @@ describe "/tasks/uncomplete" do
       expect(rendered).to include("$('#sidebar').html")
       expect(rendered).to have_text("Assigned")
       expect(rendered).to have_text("Recent Items")
-      expect(rendered).to include("$('#filters').effect('shake'")
     end
   end
 end

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

@@ -44,7 +44,6 @@ describe "/tasks/update" do
       expect(rendered).to include("$('#due_tomorrow').prepend('<li class=\\'highlight task\\' id=\\'task_#{@task.id}\\'")
       expect(rendered).to have_text("Assigned")
       expect(rendered).to have_text("Recent Items")
-      expect(rendered).to include("$('#filters').effect('shake'")
     end
 
     it "from asset page: should update task partial in place" do
@@ -111,7 +110,6 @@ describe "/tasks/update" do
       expect(rendered).to include("$('#sidebar').html")
       expect(rendered).to have_text("Recent Items")
       expect(rendered).to have_text("Assigned")
-      expect(rendered).to include("$('#filters').effect('shake'")
     end
 
     it "from asset page: should should re-render task partial" do
@@ -131,13 +129,12 @@ describe "/tasks/update" do
     end
   end
 
-  it "error: should re-disiplay [Edit Task] form and shake it" do
+  it "error: should re-disiplay [Edit Task] form" do
     assign(:task_before_update, build_stubbed(:task))
     assign(:task, @task = build_stubbed(:task))
     @task.errors.add(:name)
 
     render
-    expect(rendered).to include(%/$('#task_#{@task.id}').effect("shake"/)
     expect(rendered).to include("$('#task_submit').enable()")
   end
 end

data/spec/views/users/change_password.js.haml_spec.rb

@@ -33,12 +33,11 @@ describe "/users/change_password" do
   end
 
   describe "validation errors:" do
-    it "should redraw the [Change Password] form and shake it" do
+    it "should redraw the [Change Password] form" do
       @user.errors.add(:current_password, "error")
       render
 
       expect(rendered).to include("$('#change_password').html")
-      expect(rendered).to include(%/$('#change_password').effect("shake"/)
       expect(rendered).to include("$('#current_password').focus();")
     end
 

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

@@ -37,10 +37,9 @@ describe "/users/update" do
       @user.errors.add(:first_name)
     end
 
-    it "should redraw the [Edit Profile] form and shake it" do
+    it "should redraw the [Edit Profile] form" do
       render
       expect(rendered).to include("$('#edit_profile').html")
-      expect(rendered).to include(%/$('#edit_profile').effect("shake"/)
       expect(rendered).to include("$('#user_email').focus();")
     end
   end

data/spec/views/users/upload_avatar.js.haml_spec.rb

@@ -37,10 +37,9 @@ describe "/users/upload_avatar" do
       assign(:user, @user = current_user)
     end
 
-    it "should redraw the [Upload Avatar] form and shake it" do
+    it "should redraw the [Upload Avatar] form" do
       render
       expect(rendered).to include("$('#upload_avatar').html")
-      expect(rendered).to include(%/$('#upload_avatar').effect("shake"/)
     end
   end
 end