fat_free_crm 0.13.6 → 0.14.0

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

@@ -7,7 +7,7 @@ require File.expand_path(File.dirname(__FILE__) + '/../../../spec_helper')
 
 describe "admin/users/edit" do
   before do
-    login_and_assign(:admin => true)
+    login_and_assign(admin: true)
     assign(:user, @user = FactoryGirl.create(:user))
   end
 
@@ -15,30 +15,28 @@ describe "admin/users/edit" do
     params[:cancel] = "true"
     render
 
-    rendered.should include("$('#user_#{@user.id}').replaceWith")
+    expect(rendered).to include("$('#user_#{@user.id}').replaceWith")
   end
 
   it "edit hides previously open [Edit User] and replaces it with user partial" do
     assign(:previous, previous = FactoryGirl.create(:user))
     render
 
-    rendered.should include("user_#{previous.id}")
+    expect(rendered).to include("user_#{previous.id}")
   end
 
   it "edit removes previously open [Edit User] if it's no longer available" do
     assign(:previous, previous = 41)
     render
 
-    rendered.should include(%Q/crm.flick('user_#{previous}', 'remove');/)
+    expect(rendered).to include(%/crm.flick('user_#{previous}', 'remove');/)
   end
 
   it "edit turns off highlight, hides [Create User] form, and replaces current user with [Edit User] form" do
     render
 
-    rendered.should include(%Q/crm.highlight_off('user_#{@user.id}');/)
-    rendered.should include(%Q/crm.hide_form('create_user')/)
-    rendered.should include("user_#{@user.id}")
+    expect(rendered).to include(%/crm.highlight_off('user_#{@user.id}');/)
+    expect(rendered).to include(%/crm.hide_form('create_user')/)
+    expect(rendered).to include("user_#{@user.id}")
   end
-
 end
-

data/spec/views/admin/users/index.haml_spec.rb

@@ -7,15 +7,14 @@ require File.expand_path(File.dirname(__FILE__) + '/../../../spec_helper')
 
 describe "/admin/users/index" do
   before do
-    login_and_assign(:admin => true)
+    login_and_assign(admin: true)
   end
 
   it "renders a list of users" do
-    assign(:users, [ FactoryGirl.create(:user) ].paginate)
+    assign(:users, [FactoryGirl.create(:user)].paginate)
 
     render
-    view.should render_template(:partial => "_user")
-    view.should render_template(:partial => "shared/_paginate")
+    expect(view).to render_template(partial: "_user")
+    expect(view).to render_template(partial: "shared/_paginate")
   end
 end
-

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

@@ -13,14 +13,12 @@ describe "admin/users/index" do
   it "renders [admin/user] template with @users collection" do
     amy = FactoryGirl.create(:user)
     bob = FactoryGirl.create(:user)
-    assign(:users, [ amy, bob ].paginate)
+    assign(:users, [amy, bob].paginate)
 
-    render :template => 'admin/users/index', :formats => [:js]
-    
-    rendered.should include("id=\\'user_#{amy.id}\\'")
-    rendered.should include("id=\\'user_#{bob.id}\\'")
-    rendered.should include("$('#paginate')")
-  end
+    render template: 'admin/users/index', formats: [:js]
 
+    expect(rendered).to include("id=\\'user_#{amy.id}\\'")
+    expect(rendered).to include("id=\\'user_#{bob.id}\\'")
+    expect(rendered).to include("$('#paginate')")
+  end
 end
-

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

@@ -7,7 +7,7 @@ require 'spec_helper'
 
 describe "admin/users/new" do
   before do
-    login_and_assign(:admin => true)
+    login_and_assign(admin: true)
     assign(:user, User.new)
   end
 
@@ -16,7 +16,7 @@ describe "admin/users/new" do
       params[:cancel] = nil
       render
 
-      rendered.should include("$('#create_user').html")
+      expect(rendered).to include("$('#create_user').html")
     end
   end
 
@@ -25,10 +25,8 @@ describe "admin/users/new" do
       params[:cancel] = "true"
       render
 
-      rendered.should include("crm.set_title('create_user', 'Users');")
-      rendered.should include("crm.flip_form('create_user');")
+      expect(rendered).to include("crm.set_title('create_user', 'Users');")
+      expect(rendered).to include("crm.flip_form('create_user');")
     end
   end
-
 end
-

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

@@ -7,14 +7,14 @@ require File.expand_path(File.dirname(__FILE__) + '/../../../spec_helper')
 
 describe "admin/users/reactivate" do
   before do
-    login_and_assign(:admin => true)
-    assign(:user, @user = FactoryGirl.create(:user, :suspended_at => Time.now.yesterday))
+    login_and_assign(admin: true)
+    assign(:user, @user = FactoryGirl.create(:user, suspended_at: Time.now.yesterday))
   end
 
   it "reloads the requested user partial" do
     render
 
-    rendered.should include("user_#{@user.id}")
-    rendered.should include(%Q/$('#user_#{@user.id}').effect("highlight"/)
+    expect(rendered).to include("user_#{@user.id}")
+    expect(rendered).to include(%/$('#user_#{@user.id}').effect("highlight"/)
   end
 end

data/spec/views/admin/users/show.haml_spec.rb

@@ -14,4 +14,3 @@ describe "/admin/users/show" do
     render
   end
 end
-

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

@@ -7,14 +7,14 @@ require File.expand_path(File.dirname(__FILE__) + '/../../../spec_helper')
 
 describe "admin/users/suspend" do
   before do
-    login_and_assign(:admin => true)
-    assign(:user, @user = FactoryGirl.create(:user, :suspended_at => nil))
+    login_and_assign(admin: true)
+    assign(:user, @user = FactoryGirl.create(:user, suspended_at: nil))
   end
 
   it "reloads the requested user partial" do
     render
 
-    rendered.should include("user_#{@user.id}")
-    rendered.should include(%Q/$('#user_#{@user.id}').effect("highlight"/)
+    expect(rendered).to include("user_#{@user.id}")
+    expect(rendered).to include(%/$('#user_#{@user.id}').effect("highlight"/)
   end
 end

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

@@ -7,7 +7,7 @@ require 'spec_helper'
 
 describe "admin/users/update" do
   before do
-    login_and_assign(:admin => true)
+    login_and_assign(admin: true)
     assign(:user, @user = FactoryGirl.create(:user))
   end
 
@@ -15,8 +15,8 @@ describe "admin/users/update" do
     it "replaces [Edit User] form with user partial and highlights it" do
       render
 
-      rendered.should include("user_#{@user.id}")
-      rendered.should include(%Q/$('#user_#{@user.id}').effect("highlight"/)
+      expect(rendered).to include("user_#{@user.id}")
+      expect(rendered).to include(%/$('#user_#{@user.id}').effect("highlight"/)
     end
   end # no errors
 
@@ -28,10 +28,9 @@ describe "admin/users/update" do
     it "redraws [Edit User] form and shakes it" do
       render
 
-      rendered.should include("user_#{@user.id}")
-      rendered.should include(%Q/$('#user_#{@user.id}').effect("shake"/)
-      rendered.should include(%Q/$('#user_username').focus()/)
+      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 # errors
 end
-

data/spec/views/application/auto_complete.haml_spec.rb

@@ -12,23 +12,23 @@ describe "/application/_auto_complete" do
     login_and_assign
   end
 
-  [ :account, :campaign, :contact, :lead, :opportunity ].each do |model|
+  [:account, :campaign, :contact, :lead, :opportunity].each do |model|
     it "should render autocomplete list if #{model} matches found" do
       @auto_complete = if model == :lead
-        FactoryGirl.create(:lead, :first_name => "Billy", :last_name => "Bones", :company => "Hello, World!")
-      elsif model == :contact
-        FactoryGirl.create(:contact, :first_name => "Billy", :last_name => "Bones")
-      else
-        FactoryGirl.create(model, :name => "Hello, World!")
+                         FactoryGirl.create(:lead, first_name: "Billy", last_name: "Bones", company: "Hello, World!")
+                       elsif model == :contact
+                         FactoryGirl.create(:contact, first_name: "Billy", last_name: "Bones")
+                       else
+                         FactoryGirl.create(model, name: "Hello, World!")
       end
-      assign(:auto_complete, [ @auto_complete ])
+      assign(:auto_complete, [@auto_complete])
 
       render
-      rendered.should have_tag("ul", :count => 1) do |list|
+      expect(rendered).to have_tag("ul", count: 1) do |list|
         unless model == :lead
-          list.should have_tag("li", :id => @auto_complete.id.to_s, :text => @auto_complete.name)
+          expect(list).to have_tag("li", id: @auto_complete.id.to_s, text: @auto_complete.name)
         else
-          list.should have_tag("li", :id => @auto_complete.id.to_s, :text => "#{@auto_complete.name} (#{@auto_complete.company})")
+          expect(list).to have_tag("li", id: @auto_complete.id.to_s, text: "#{@auto_complete.name} (#{@auto_complete.company})")
         end
       end
     end
@@ -38,11 +38,9 @@ describe "/application/_auto_complete" do
       assign(:auto_complete, [])
 
       render
-      rendered.should have_tag("ul", :count => 1) do |list|
-        with_tag("li", :id => nil, :count => 1, :text => /^No/)
+      expect(rendered).to have_tag("ul", count: 1) do |_list|
+        with_tag("li", id: nil, count: 1, text: /^No/)
       end
     end
-
   end
 end
-

data/spec/views/authentications/new.haml_spec.rb

@@ -14,17 +14,16 @@ describe "/authentications/new" do
   end
 
   it "renders the login form without signup link" do
-    view.should_receive(:can_signup?).and_return(false)
+    expect(view).to receive(:can_signup?).and_return(false)
     render
-    rendered.should have_tag("form[action=#{authentication_path}][class=new_authentication]")
-    rendered.should_not have_tag("a[href=#{signup_path}]")
+    expect(rendered).to have_tag("form[action='#{authentication_path}'][class=new_authentication]")
+    expect(rendered).not_to have_tag("a[href='#{signup_path}']")
   end
 
   it "renders the login form with signup link" do
-    view.should_receive(:can_signup?).and_return(true)
+    expect(view).to receive(:can_signup?).and_return(true)
     render
-    rendered.should have_tag("form[action=#{authentication_path}][class=new_authentication]")
-    rendered.should have_tag("a[href=#{signup_path}]")
+    expect(rendered).to have_tag("form[action='#{authentication_path}'][class=new_authentication]")
+    expect(rendered).to have_tag("a[href='#{signup_path}']")
   end
 end
-

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

@@ -11,32 +11,32 @@ describe "/campaigns/_edit" do
   before do
     login_and_assign
     assign(:campaign, @campaign = FactoryGirl.create(:campaign))
-    assign(:users, [ current_user ])
+    assign(:users, [current_user])
   end
 
   it "should render [edit campaign] form" do
     render
 
-    view.should render_template(:partial => "campaigns/_top_section")
-    view.should render_template(:partial => "campaigns/_objectives")
-    view.should render_template(:partial => "_permissions")
+    expect(view).to render_template(partial: "campaigns/_top_section")
+    expect(view).to render_template(partial: "campaigns/_objectives")
+    expect(view).to render_template(partial: "_permissions")
 
-    view.should have_tag("form[class=edit_campaign]") do
-      with_tag "input[type=hidden][id=campaign_user_id][value=#{@campaign.user_id}]"
+    expect(view).to have_tag("form[class=edit_campaign]") do
+      with_tag "input[type=hidden][id=campaign_user_id][value='#{@campaign.user_id}']"
     end
   end
 
   it "should render background info field if settings require so" do
-    Setting.background_info = [ :campaign ]
+    Setting.background_info = [:campaign]
 
     render
-    rendered.should have_tag("textarea[id=campaign_background_info]")
+    expect(rendered).to have_tag("textarea[id=campaign_background_info]")
   end
 
   it "should not render background info field if settings do not require so" do
     Setting.background_info = []
 
     render
-    rendered.should_not have_tag("textarea[id=campaign_background_info]")
+    expect(rendered).not_to have_tag("textarea[id=campaign_background_info]")
   end
 end

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

@@ -11,29 +11,29 @@ describe "/campaigns/_new" do
   before do
     login_and_assign
     assign(:campaign, Campaign.new)
-    assign(:users, [ current_user ])
+    assign(:users, [current_user])
   end
 
   it "should render [create campaign] form" do
     render
-    view.should render_template(:partial => "campaigns/_top_section")
-    view.should render_template(:partial => "campaigns/_objectives")
-    view.should render_template(:partial => "_permissions")
+    expect(view).to render_template(partial: "campaigns/_top_section")
+    expect(view).to render_template(partial: "campaigns/_objectives")
+    expect(view).to render_template(partial: "_permissions")
 
-    rendered.should have_tag("form[class=new_campaign]")
+    expect(rendered).to have_tag("form[class=new_campaign]")
   end
 
   it "should render background info field if settings require so" do
-    Setting.background_info = [ :campaign ]
+    Setting.background_info = [:campaign]
 
     render
-    rendered.should have_tag("textarea[id=campaign_background_info]")
+    expect(rendered).to have_tag("textarea[id=campaign_background_info]")
   end
 
   it "should not render background info field if settings do not require so" do
     Setting.background_info = []
 
     render
-    rendered.should_not have_tag("textarea[id=campaign_background_info]")
+    expect(rendered).not_to have_tag("textarea[id=campaign_background_info]")
   end
 end

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

@@ -13,37 +13,36 @@ describe "/campaigns/create" do
   describe "create success" do
     before do
       assign(:campaign, @campaign = FactoryGirl.create(:campaign))
-      assign(:campaigns, [ @campaign ].paginate)
+      assign(:campaigns, [@campaign].paginate)
       assign(:campaign_status_total, Hash.new(1))
       render
     end
 
     it "should hide [Create Campaign] form and insert campaign partial" do
-      rendered.should include("$('#campaigns').prepend('<li class=\\'campaign highlight\\' id=\\'campaign_#{@campaign.id}\\'")
-      rendered.should include(%Q/$('#campaign_#{@campaign.id}').effect("highlight"/)
+      expect(rendered).to include("$('#campaigns').prepend('<li class=\\'campaign highlight\\' id=\\'campaign_#{@campaign.id}\\'")
+      expect(rendered).to include(%/$('#campaign_#{@campaign.id}').effect("highlight"/)
     end
 
     it "should update pagination" do
-      rendered.should include("#paginate")
+      expect(rendered).to include("#paginate")
     end
 
     it "should update Campaigns sidebar filters" do
-      rendered.should include("#sidebar")
-      rendered.should have_text("Campaign Statuses")
-      rendered.should have_text("Recent Items")
+      expect(rendered).to include("#sidebar")
+      expect(rendered).to have_text("Campaign Statuses")
+      expect(rendered).to have_text("Recent Items")
     end
   end
 
   describe "create failure" do
     it "should re-render [create] template in :create_campaign div" do
-      assign(:campaign, FactoryGirl.build(:campaign, :name => nil)) # make it invalid
-      assign(:users, [ FactoryGirl.create(:user) ])
+      assign(:campaign, FactoryGirl.build(:campaign, name: nil)) # make it invalid
+      assign(:users, [FactoryGirl.create(:user)])
 
       render
 
-      rendered.should include("$('#create_campaign').html")
-      rendered.should include(%Q/$('#create_campaign').effect("shake"/)
+      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

@@ -8,24 +8,23 @@ require 'spec_helper'
 describe "/campaigns/destroy" do
   before do
     login_and_assign
-    assign(:campaign, @campaign = FactoryGirl.create(:campaign, :user => current_user))
-    assign(:campaigns, [ @campaign ].paginate)
+    assign(:campaign, @campaign = FactoryGirl.create(:campaign, user: current_user))
+    assign(:campaigns, [@campaign].paginate)
     assign(:campaign_status_total, Hash.new(1))
     render
   end
 
   it "should blind up destroyed campaign partial" do
-    rendered.should include("slideUp")
+    expect(rendered).to include("slideUp")
   end
 
   it "should update Campaigns sidebar" do
-    rendered.should include("#sidebar")
-    rendered.should have_text("Recent Items")
-    rendered.should include(%Q/$('#filters').effect('shake'/)
+    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
-    rendered.should include("#paginate")
+    expect(rendered).to include("#paginate")
   end
-
 end

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

@@ -10,15 +10,15 @@ describe "/campaigns/edit" do
 
   before do
     login_and_assign
-    assign(:campaign, @campaign = FactoryGirl.create(:campaign, :user => current_user))
-    assign(:users, [ current_user ])
+    assign(:campaign, @campaign = FactoryGirl.create(:campaign, user: current_user))
+    assign(:users, [current_user])
   end
 
   it "cancel from campaign index page: should replace [Edit Campaign] form with campaign partial" do
     params[:cancel] = "true"
 
     render
-    rendered.should include("$('#campaign_#{@campaign.id}').replaceWith('<li class=\\'campaign highlight\\' id=\\'campaign_#{@campaign.id}\\'")
+    expect(rendered).to include("$('#campaign_#{@campaign.id}').replaceWith('<li class=\\'campaign highlight\\' id=\\'campaign_#{@campaign.id}\\'")
   end
 
   it "cancel from campaign landing page: should hide [Edit Campaign] form" do
@@ -26,15 +26,15 @@ describe "/campaigns/edit" do
     params[:cancel] = "true"
 
     render
-    rendered.should include("crm.flip_form('edit_campaign'")
+    expect(rendered).to include("crm.flip_form('edit_campaign'")
   end
 
   it "edit: should hide previously open [Edit Campaign] for and replace it with campaign partial" do
     params[:cancel] = nil
-    assign(:previous, previous = FactoryGirl.create(:campaign, :user => current_user))
+    assign(:previous, previous = FactoryGirl.create(:campaign, user: current_user))
 
     render
-    rendered.should include("$('#campaign_#{previous.id}').replaceWith('<li class=\\'campaign highlight\\' id=\\'campaign_#{previous.id}\\'")
+    expect(rendered).to include("$('#campaign_#{previous.id}').replaceWith('<li class=\\'campaign highlight\\' id=\\'campaign_#{previous.id}\\'")
   end
 
   it "edit: should remove previously open [Edit Campaign] if it's no longer available" do
@@ -42,31 +42,23 @@ describe "/campaigns/edit" do
     assign(:previous, previous = 41)
 
     render
-    rendered.should include(%Q/crm.flick('campaign_#{previous}', 'remove');/)
+    expect(rendered).to include(%/crm.flick('campaign_#{previous}', 'remove');/)
   end
 
   it "edit from campaigns index page: should turn off highlight, hide [Create Campaign], and replace current campaign with [Edit Campaign] form" do
     params[:cancel] = nil
 
     render
-    rendered.should include(%Q/crm.highlight_off('campaign_#{@campaign.id}');/)
-    rendered.should include("crm.hide_form('create_campaign')")
-    rendered.should include("$('#campaign_#{@campaign.id}').html")
+    expect(rendered).to include(%/crm.highlight_off('campaign_#{@campaign.id}');/)
+    expect(rendered).to include("crm.hide_form('create_campaign')")
+    expect(rendered).to include("$('#campaign_#{@campaign.id}').html")
   end
 
   it "edit from campaign landing page: should show [Edit Campaign] form" do
     params[:cancel] = "false"
 
     render
-    rendered.should include("$('#edit_campaign').html")
-    rendered.should include("crm.flip_form('edit_campaign')")
+    expect(rendered).to include("$('#edit_campaign').html")
+    expect(rendered).to include("crm.flip_form('edit_campaign')")
   end
-
-  it "should call JavaScript to set up popup Calendar" do
-    params[:cancel] = nil
-
-    render
-    rendered.should include('focus()')
-  end
-
 end