fat_free_crm 0.13.6 → 0.14.0

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

@@ -10,17 +10,17 @@ describe "/contacts/edit" do
 
   before do
     login_and_assign
-    assign(:contact, @contact = FactoryGirl.create(:contact, :user => current_user))
-    assign(:users, [ current_user ])
+    assign(:contact, @contact = FactoryGirl.create(:contact, user: current_user))
+    assign(:users, [current_user])
     assign(:account, @account = FactoryGirl.create(:account))
-    assign(:accounts, [ @account ])
+    assign(:accounts, [@account])
   end
 
   it "cancel from contact index page: should replace [Edit Contact] form with contact partial" do
     params[:cancel] = "true"
 
     render
-    rendered.should include("$('#contact_#{@contact.id}').replaceWith('<li class=\\'contact highlight\\' id=\\'contact_#{@contact.id}\\'")
+    expect(rendered).to include("$('#contact_#{@contact.id}').replaceWith('<li class=\\'contact highlight\\' id=\\'contact_#{@contact.id}\\'")
   end
 
   it "cancel from contact landing page: should hide [Edit Contact] form" do
@@ -28,15 +28,15 @@ describe "/contacts/edit" do
     params[:cancel] = "true"
 
     render
-    rendered.should include("crm.flip_form('edit_contact'")
+    expect(rendered).to include("crm.flip_form('edit_contact'")
   end
 
   it "edit: should hide previously open [Edit Contact] for and replace it with contact partial" do
     params[:cancel] = nil
-    assign(:previous, previous = FactoryGirl.create(:contact, :user => current_user))
+    assign(:previous, previous = FactoryGirl.create(:contact, user: current_user))
 
     render
-    rendered.should include("$('#contact_#{previous.id}').replaceWith")
+    expect(rendered).to include("$('#contact_#{previous.id}').replaceWith")
   end
 
   it "edit: should hide and remove previously open [Edit Contact] if it's no longer available" do
@@ -44,31 +44,29 @@ describe "/contacts/edit" do
     assign(:previous, previous = 41)
 
     render
-    rendered.should include("crm.flick('contact_#{previous}', 'remove');")
+    expect(rendered).to include("crm.flick('contact_#{previous}', 'remove');")
   end
 
   it "edit from contacts index page: should turn off highlight, hide [Create Contact] form, and replace current contact with [Edit Contact] form" do
     params[:cancel] = nil
 
     render
-    rendered.should include("crm.highlight_off('contact_#{@contact.id}');")
-    rendered.should include("crm.hide_form('create_contact')")
-    rendered.should include("$('#contact_#{@contact.id}').html")
-    rendered.should include("crm.create_or_select_account(false)")
+    expect(rendered).to include("crm.highlight_off('contact_#{@contact.id}');")
+    expect(rendered).to include("crm.hide_form('create_contact')")
+    expect(rendered).to include("$('#contact_#{@contact.id}').html")
+    expect(rendered).to include("crm.create_or_select_account(false)")
   end
 
   it "edit from contact landing page: should show [Edit Contact] form" do
     params[:cancel] = "false"
 
     render
-    rendered.should include("$('#edit_contact').html")
-    rendered.should include("crm.flip_form('edit_contact'")
+    expect(rendered).to include("$('#edit_contact').html")
+    expect(rendered).to include("crm.flip_form('edit_contact'")
   end
 
   it "should show handle new or existing account for the contact" do
-
     render
-    rendered.should include("crm.create_or_select_account(false)")
+    expect(rendered).to include("crm.create_or_select_account(false)")
   end
-
 end

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

@@ -17,20 +17,19 @@ describe "/contacts/index" do
   end
 
   it "should render a list of contacts if it's not empty" do
-    assign(:contacts, [ FactoryGirl.create(:contact) ].paginate)
+    assign(:contacts, [FactoryGirl.create(:contact)].paginate)
 
     render
-    view.should render_template(:partial => "_contact")
-    view.should render_template(:partial => "shared/_paginate_with_per_page")
+    expect(view).to render_template(partial: "_contact")
+    expect(view).to render_template(partial: "shared/_paginate_with_per_page")
   end
 
   it "should render a message if there're no contacts" do
     assign(:contacts, [].paginate)
 
     render
-    view.should_not render_template(:partial => "_contact")
-    view.should render_template(:partial => "shared/_empty")
-    view.should render_template(:partial => "shared/_paginate_with_per_page")
+    expect(view).not_to render_template(partial: "_contact")
+    expect(view).to render_template(partial: "shared/_empty")
+    expect(view).to render_template(partial: "shared/_paginate_with_per_page")
   end
-
 end

data/spec/views/contacts/index.js.html_spec.rb

@@ -13,21 +13,20 @@ describe "/contacts/index" do
   end
 
   it "should render [contact] template with @contacts collection if there are contacts" do
-    assign(:contacts, [ FactoryGirl.create(:contact, :id => 42) ].paginate)
+    assign(:contacts, [FactoryGirl.create(:contact, id: 42)].paginate)
 
-    render :template => 'contacts/index', :formats => [:js]
+    render template: 'contacts/index', formats: [:js]
 
-    rendered.should include("$('#contacts').html('<li class=\\'contact highlight\\' id=\\'contact_42\\'")
-    rendered.should include("#paginate")
+    expect(rendered).to include("$('#contacts').html('<li class=\\'contact highlight\\' id=\\'contact_42\\'")
+    expect(rendered).to include("#paginate")
   end
 
   it "should render [empty] template if @contacts collection if there are no contacts" do
     assign(:contacts, [].paginate)
 
-    render :template => 'contacts/index', :formats => [:js]
+    render template: 'contacts/index', formats: [:js]
 
-    rendered.should include("$('#contacts').html('<div id=\\'empty\\'>")
-    rendered.should include("#paginate")
+    expect(rendered).to include("$('#contacts').html('<div id=\\'empty\\'>")
+    expect(rendered).to include("#paginate")
   end
-
 end

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

@@ -11,16 +11,16 @@ describe "/contacts/new" do
   before do
     login_and_assign
     @account = FactoryGirl.create(:account)
-    assign(:contact, Contact.new(:user => current_user))
-    assign(:users, [ current_user ])
+    assign(:contact, Contact.new(user: current_user))
+    assign(:users, [current_user])
     assign(:account, @account)
-    assign(:accounts, [ @account ])
+    assign(:accounts, [@account])
   end
 
   it "should toggle empty message div if it exists" do
     render
 
-    rendered.should include("crm.flick('empty', 'toggle')")
+    expect(rendered).to include("crm.flick('empty', 'toggle')")
   end
 
   describe "new contact" do
@@ -28,8 +28,8 @@ describe "/contacts/new" do
       params[:cancel] = nil
       render
 
-      rendered.should include("$('#create_contact').html")
-      rendered.should include("crm.create_or_select_account(false)")
+      expect(rendered).to include("$('#create_contact').html")
+      expect(rendered).to include("crm.create_or_select_account(false)")
     end
   end
 
@@ -38,9 +38,8 @@ describe "/contacts/new" do
       params[:cancel] = "true"
       render
 
-      rendered.should_not include("$('#create_contact').html")
-      rendered.should include("crm.flip_form('create_contact');")
+      expect(rendered).not_to include("$('#create_contact').html")
+      expect(rendered).to include("crm.flip_form('create_contact');")
     end
   end
-
 end

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

@@ -10,22 +10,21 @@ describe "/contacts/show" do
 
   before do
     login_and_assign
-    @contact = FactoryGirl.create(:contact, :id => 42,
-      :opportunities => [ FactoryGirl.create(:opportunity) ])
+    @contact = FactoryGirl.create(:contact, id: 42,
+                                            opportunities: [FactoryGirl.create(:opportunity)])
     assign(:contact, @contact)
-    assign(:users, [ current_user ])
+    assign(:users, [current_user])
     assign(:comment, Comment.new)
-    assign(:timeline, [ FactoryGirl.create(:comment, :commentable => @contact) ])
+    assign(:timeline, [FactoryGirl.create(:comment, commentable: @contact)])
   end
 
   it "should render contact landing page" do
     render
-    view.should render_template(:partial => "comments/_new")
-    view.should render_template(:partial => "shared/_timeline")
-    view.should render_template(:partial => "shared/_tasks")
-    view.should render_template(:partial => "opportunities/_opportunity")
+    expect(view).to render_template(partial: "comments/_new")
+    expect(view).to render_template(partial: "shared/_timeline")
+    expect(view).to render_template(partial: "shared/_tasks")
+    expect(view).to render_template(partial: "opportunities/_opportunity")
 
-    rendered.should have_tag("div[id=edit_contact]")
+    expect(rendered).to have_tag("div[id=edit_contact]")
   end
-
 end

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

@@ -11,10 +11,10 @@ describe "/contacts/update" do
   before do
     login_and_assign
 
-    assign(:contact, @contact = FactoryGirl.create(:contact, :user => current_user))
-    assign(:users, [ current_user ])
+    assign(:contact, @contact = FactoryGirl.create(:contact, user: current_user))
+    assign(:users, [current_user])
     assign(:account, @account = FactoryGirl.create(:account))
-    assign(:accounts, [ @account ])
+    assign(:accounts, [@account])
   end
 
   describe "no errors:" do
@@ -25,14 +25,14 @@ describe "/contacts/update" do
 
       it "should flip [edit_contact] form" do
         render
-        rendered.should_not include("contact_#{@contact.id}")
+        expect(rendered).not_to include("contact_#{@contact.id}")
       end
 
       it "should update sidebar" do
         render
-        rendered.should include("#sidebar")
-        rendered.should have_text("Recent Items")
-        rendered.should include("$('#summary').effect('shake'")
+        expect(rendered).to include("#sidebar")
+        expect(rendered).to have_text("Recent Items")
+        expect(rendered).to include("$('#summary').effect('shake'")
       end
     end
 
@@ -45,14 +45,14 @@ describe "/contacts/update" do
         controller.request.env["HTTP_REFERER"] = "http://localhost/contacts"
 
         render
-        rendered.should include("$('#contact_#{@contact.id}').replaceWith('<li class=\\'contact highlight\\' id=\\'contact_#{@contact.id}\\'")
-        rendered.should include(%Q/$('#contact_#{@contact.id}').effect("highlight"/)
+        expect(rendered).to include("$('#contact_#{@contact.id}').replaceWith('<li class=\\'contact highlight\\' id=\\'contact_#{@contact.id}\\'")
+        expect(rendered).to include(%/$('#contact_#{@contact.id}').effect("highlight"/)
       end
 
       it "should update sidebar" do
         render
-        rendered.should include("#sidebar")
-        rendered.should have_text("Recent Items")
+        expect(rendered).to include("#sidebar")
+        expect(rendered).to have_text("Recent Items")
       end
     end
 
@@ -65,13 +65,13 @@ describe "/contacts/update" do
         controller.request.env["HTTP_REFERER"] = "http://localhost/contacts"
 
         render
-        rendered.should include("$('#contact_#{@contact.id}').replaceWith('<li class=\\'contact highlight\\' id=\\'contact_#{@contact.id}\\'")
-        rendered.should include(%Q/$('#contact_#{@contact.id}').effect("highlight"/)
+        expect(rendered).to include("$('#contact_#{@contact.id}').replaceWith('<li class=\\'contact highlight\\' id=\\'contact_#{@contact.id}\\'")
+        expect(rendered).to include(%/$('#contact_#{@contact.id}').effect("highlight"/)
       end
 
       it "should update recently viewed items" do
         render
-        rendered.should include("#recently")
+        expect(rendered).to include("#recently")
       end
     end
   end # no errors
@@ -88,10 +88,10 @@ describe "/contacts/update" do
 
       it "should redraw the [edit_contact] form and shake it" do
         render
-        rendered.should include("$('#edit_contact').html")
-        rendered.should include('crm.create_or_select_account(false)')
-        rendered.should include(%Q/$('#edit_contact').effect("shake"/)
-        rendered.should include('focus()')
+        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,10 +102,10 @@ describe "/contacts/update" do
 
       it "should redraw the [edit_contact] form and shake it" do
         render
-        rendered.should include("$('#contact_#{@contact.id}').html")
-        rendered.should include('crm.create_or_select_account(false)')
-        rendered.should include(%Q/$('#contact_#{@contact.id}').effect("shake"/)
-        rendered.should include('focus()')
+        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
 
@@ -116,14 +116,14 @@ describe "/contacts/update" do
 
       it "errors: should show disabled accounts dropdown" do
         render
-        rendered.should include("crm.create_or_select_account(#{@referer =~ /\/accounts\//})")
+        expect(rendered).to include("crm.create_or_select_account(#{@referer =~ /\/accounts\//})")
       end
 
       it "should redraw the [edit_contact] form and shake it" do
         render
-        rendered.should include("$('#contact_#{@contact.id}').html")
-        rendered.should include(%Q/$('#contact_#{@contact.id}').effect("shake"/)
-        rendered.should include('focus()')
+        expect(rendered).to include("$('#contact_#{@contact.id}').html")
+        expect(rendered).to include(%/$('#contact_#{@contact.id}').effect("shake"/)
+        expect(rendered).to include('focus()')
       end
     end
   end # errors

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

@@ -13,12 +13,12 @@ describe "/home/index" do
   end
 
   it "should render list of activities if it's not empty" do
-    assign(:activities, [ FactoryGirl.create(:version, :event => "update", :item => FactoryGirl.create(:account)) ])
+    assign(:activities, [FactoryGirl.create(:version, event: "update", item: FactoryGirl.create(:account))])
     assign(:my_tasks, [])
     assign(:my_opportunities, [])
     assign(:my_accounts, [])
     render
-    view.should render_template(:partial => "_activity")
+    expect(view).to render_template(partial: "_activity")
   end
 
   it "should render a message if there're no activities" do
@@ -27,9 +27,8 @@ describe "/home/index" do
     assign(:my_opportunities, [])
     assign(:my_accounts, [])
     render
-    view.should_not render_template(:partial => "_activity")
+    expect(view).not_to render_template(partial: "_activity")
 
-    rendered.should include("No activity records found.")
+    expect(rendered).to include("No activity records found.")
   end
 end
-

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

@@ -13,20 +13,19 @@ describe "/home/index" do
   end
 
   it "should render [activity] template with @activities collection" do
-    assign(:activities, [ FactoryGirl.create(:version, :id => 42, :event => "update", :item => FactoryGirl.create(:account), :whodunnit => current_user.id.to_s) ])
+    assign(:activities, [FactoryGirl.create(:version, id: 42, event: "update", item: FactoryGirl.create(:account), whodunnit: current_user.id.to_s)])
 
-    render :template => 'home/index', :formats => [:js]
+    render template: 'home/index', formats: [:js]
 
-    rendered.should include("$('#activities').html")
-    rendered.should include("li class=\\'version\\' id=\\'version_42\\'")
+    expect(rendered).to include("$('#activities').html")
+    expect(rendered).to include("li class=\\'version\\' id=\\'version_42\\'")
   end
 
   it "should render a message if there're no activities" do
     assign(:activities, [])
 
-    render :template => 'home/index', :formats => [:js]
+    render template: 'home/index', formats: [:js]
 
-    rendered.should include("No activity records found.")
+    expect(rendered).to include("No activity records found.")
   end
-
 end

data/spec/views/home/options.js.haml_spec.rb

@@ -17,14 +17,14 @@ describe "/home/options" do
     assign(:user, "all_users")
     assign(:action, "all_actions")
     assign(:duration, "two_days")
-    assign(:all_users, [ FactoryGirl.create(:user) ])
+    assign(:all_users, [FactoryGirl.create(:user)])
 
     render
 
-    rendered.should include("$('#options').html")
-    rendered.should include("$(\\'#asset\\').html(\\'campaign\\')")
-    rendered.should include("crm.flip_form('options')")
-    rendered.should include("crm.set_title('title', 'Recent Activity Options')")
+    expect(rendered).to include("$('#options').html")
+    expect(rendered).to include("$(\\'#asset\\').html(\\'campaign\\')")
+    expect(rendered).to include("crm.flip_form('options')")
+    expect(rendered).to include("crm.set_title('title', 'Recent Activity Options')")
   end
 
   it "should load :options partial with JavaScript code for menus" do
@@ -33,19 +33,19 @@ describe "/home/options" do
     assign(:action, "all_actions")
     assign(:user, "all_users")
     assign(:duration, "two_days")
-    assign(:all_users, [ FactoryGirl.create(:user) ])
+    assign(:all_users, [FactoryGirl.create(:user)])
 
     render
 
-    view.should render_template(:partial => "_options")
+    expect(view).to render_template(partial: "_options")
   end
 
   it "should hide options form on Cancel" do
     params[:cancel] = "true"
     render
 
-    rendered.should_not include("$('#options').html")
-    rendered.should include("crm.flip_form('options')")
-    rendered.should include("crm.set_title('title', 'Recent Activity')")
+    expect(rendered).not_to include("$('#options').html")
+    expect(rendered).to include("crm.flip_form('options')")
+    expect(rendered).to include("crm.set_title('title', 'Recent Activity')")
   end
 end

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

@@ -12,18 +12,17 @@ describe "/leads/_convert" do
     login_and_assign
     @account = FactoryGirl.create(:account)
     assign(:lead, FactoryGirl.create(:lead))
-    assign(:users, [ current_user ])
+    assign(:users, [current_user])
     assign(:account, @account)
-    assign(:accounts, [ @account ])
+    assign(:accounts, [@account])
     assign(:opportunity, FactoryGirl.create(:opportunity))
   end
 
   it "should render [convert lead] form" do
     render
-    view.should render_template(:partial => "leads/_opportunity")
-    view.should render_template(:partial => "leads/_convert_permissions")
+    expect(view).to render_template(partial: "leads/_opportunity")
+    expect(view).to render_template(partial: "leads/_convert_permissions")
 
-    rendered.should have_tag("form[class=edit_lead]")
+    expect(rendered).to have_tag("form[class=edit_lead]")
   end
-
 end