fat_free_crm 0.13.6 → 0.14.0

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

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

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

@@ -10,14 +10,14 @@ describe "/accounts/new" do
 
   before do
     login_and_assign
-    assign(:account, Account.new(:user => current_user))
-    assign(:users, [ current_user ])
+    assign(:account, Account.new(user: current_user))
+    assign(:users, [current_user])
   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 account" do
@@ -25,8 +25,8 @@ describe "/accounts/new" do
       params[:cancel] = nil
       render
 
-      rendered.should include("#create_account")
-      rendered.should include("crm.flip_form('create_account');")
+      expect(rendered).to include("#create_account")
+      expect(rendered).to include("crm.flip_form('create_account');")
     end
   end
 
@@ -35,9 +35,8 @@ describe "/accounts/new" do
       params[:cancel] = "true"
       render
 
-      rendered.should_not include("#create_account")
-      rendered.should include("crm.flip_form('create_account');")
+      expect(rendered).not_to include("#create_account")
+      expect(rendered).to include("crm.flip_form('create_account');")
     end
   end
-
 end

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

@@ -10,25 +10,24 @@ describe "/accounts/show" do
 
   before do
     login_and_assign
-    @account = FactoryGirl.create(:account, :id => 42,
-      :contacts => [ FactoryGirl.create(:contact) ],
-      :opportunities => [ FactoryGirl.create(:opportunity) ])
+    @account = FactoryGirl.create(:account, id: 42,
+                                            contacts: [FactoryGirl.create(:contact)],
+                                            opportunities: [FactoryGirl.create(:opportunity)])
     assign(:account, @account)
-    assign(:users, [ current_user ])
+    assign(:users, [current_user])
     assign(:comment, Comment.new)
-    assign(:timeline, [ FactoryGirl.create(:comment, :commentable => @account) ])
+    assign(:timeline, [FactoryGirl.create(:comment, commentable: @account)])
   end
 
   it "should render account 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 => "contacts/_contact")
-    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: "contacts/_contact")
+    expect(view).to render_template(partial: "opportunities/_opportunity")
 
-    rendered.should have_tag("div[id=edit_account]")
+    expect(rendered).to have_tag("div[id=edit_account]")
   end
-
 end

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

@@ -11,8 +11,8 @@ describe "/accounts/update" do
   before do
     login_and_assign
 
-    assign(:account, @account = FactoryGirl.create(:account, :user => current_user))
-    assign(:users, [ current_user ])
+    assign(:account, @account = FactoryGirl.create(:account, user: current_user))
+    assign(:users, [current_user])
     assign(:account_category_total, Hash.new(1))
   end
 
@@ -24,15 +24,15 @@ describe "/accounts/update" do
 
       it "should flip [edit_account] form" do
         render
-        rendered.should_not include("account_#{@account.id}")
-        rendered.should include("crm.flip_form('edit_account'")
+        expect(rendered).not_to include("account_#{@account.id}")
+        expect(rendered).to include("crm.flip_form('edit_account'")
       end
 
       it "should update sidebar" do
         render
-        rendered.should include("$('#sidebar').html")
-        rendered.should have_text("Recent Items")
-        rendered.should include("$('#summary').effect('shake'")
+        expect(rendered).to include("$('#sidebar').html")
+        expect(rendered).to have_text("Recent Items")
+        expect(rendered).to include("$('#summary').effect('shake'")
       end
     end
 
@@ -43,17 +43,17 @@ describe "/accounts/update" do
 
       it "should update sidebar" do
         render
-        rendered.should include("#sidebar")
-        rendered.should have_text("Account Categories")
-        rendered.should have_text("Recent Items")
+        expect(rendered).to include("#sidebar")
+        expect(rendered).to have_text("Account Categories")
+        expect(rendered).to have_text("Recent Items")
       end
 
       it "should replace [edit_account] form with account partial and highlight it" do
         controller.request.env["HTTP_REFERER"] = "http://localhost/accounts"
         render
 
-        rendered.should include("#account_#{@account.id}")
-        rendered.should include(%Q/$('#account_#{@account.id}').effect("highlight"/)
+        expect(rendered).to include("#account_#{@account.id}")
+        expect(rendered).to include(%/$('#account_#{@account.id}').effect("highlight"/)
       end
     end
   end # no errors
@@ -71,9 +71,9 @@ describe "/accounts/update" do
       it "should redraw the [edit_account] form and shake it" do
         render
 
-        rendered.should include("#edit_account")
-        rendered.should include(%Q/$('#edit_account').effect("shake"/)
-        rendered.should include('focus()')
+        expect(rendered).to include("#edit_account")
+        expect(rendered).to include(%/$('#edit_account').effect("shake"/)
+        expect(rendered).to include('focus()')
       end
     end
 
@@ -85,9 +85,9 @@ describe "/accounts/update" do
       it "should redraw the [edit_account] form and shake it" do
         render
 
-        rendered.should include("account_#{@account.id}")
-        rendered.should include(%Q/$('#account_#{@account.id}').effect("shake"/)
-        rendered.should include('focus()')
+        expect(rendered).to include("account_#{@account.id}")
+        expect(rendered).to include(%/$('#account_#{@account.id}').effect("shake"/)
+        expect(rendered).to include('focus()')
       end
     end
   end # errors

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

@@ -6,26 +6,24 @@
 require 'spec_helper'
 
 describe "admin/field_groups/create" do
-
   before do
-    login_and_assign(:admin => true)
+    login_and_assign(admin: true)
     assign(:field_group, field_group)
   end
 
-  let(:field_group) { FactoryGirl.create(:field_group, :label => 'test') }
+  let(:field_group) { FactoryGirl.create(:field_group, label: 'test') }
 
   it "renders javascript" do
     render
-    view.should render_template("admin/field_groups/create")
-    rendered.should have_text("$('##{field_group.klass_name.downcase}_create_field_group_arrow')")
-    rendered.should have_text("$('##{dom_id(field_group)}').effect('highlight', { duration:1500 });")
+    expect(view).to render_template("admin/field_groups/create")
+    expect(rendered).to have_text("$('##{field_group.klass_name.downcase}_create_field_group_arrow')")
+    expect(rendered).to have_text("$('##{dom_id(field_group)}').effect('highlight', { duration:1500 });")
   end
 
   it "renders javascript for invalid field group" do
-    field_group.stub(:valid?).and_return(false)
+    allow(field_group).to receive(:valid?).and_return(false)
     render
-    view.should render_template("admin/field_groups/create")
-    rendered.should have_text("effect(\"shake\", { duration:250, distance: 6 });")
+    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/destroy.js.haml_spec.rb

@@ -6,26 +6,24 @@
 require 'spec_helper'
 
 describe "admin/field_groups/destroy" do
-
   before do
-    login_and_assign(:admin => true)
+    login_and_assign(admin: true)
     assign(:field_group, field_group)
   end
 
   let(:field_group) { FactoryGirl.build(:field_group) }
 
   it "renders destroy javascript" do
-    field_group.stub(:destroyed?).and_return(true)
+    allow(field_group).to receive(:destroyed?).and_return(true)
     render
-    view.should render_template("admin/field_groups/destroy")
-    rendered.should have_text("slideUp(250)")
+    expect(view).to render_template("admin/field_groups/destroy")
+    expect(rendered).to have_text("slideUp(250)")
   end
 
   it "renders 'not destroyed' javascript" do
     render
-    view.should render_template("admin/field_groups/destroy")
-    rendered.should have_text("Field Group could not be deleted")
-    rendered.should have_text("crm.flash('warning');")
+    expect(view).to render_template("admin/field_groups/destroy")
+    expect(rendered).to have_text("Field Group could not be deleted")
+    expect(rendered).to have_text("crm.flash('warning');")
   end
-
 end

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

@@ -6,19 +6,17 @@
 require 'spec_helper'
 
 describe "admin/field_groups/edit" do
-
   before do
-    login_and_assign(:admin => true)
+    login_and_assign(admin: true)
     assign(:field_group, field_group)
   end
 
-  let(:field_group) { FactoryGirl.create(:field_group, :label => 'test') }
+  let(:field_group) { FactoryGirl.create(:field_group, label: 'test') }
 
   it "renders javascript" do
     render
-    view.should render_template("admin/field_groups/edit")
-    rendered.should have_text("crm.show_form('#{dom_id(field_group, :edit)}')")
-    rendered.should have_text("$('##{dom_id(field_group, :edit)}').html")
+    expect(view).to render_template("admin/field_groups/edit")
+    expect(rendered).to have_text("crm.show_form('#{dom_id(field_group, :edit)}')")
+    expect(rendered).to have_text("$('##{dom_id(field_group, :edit)}').html")
   end
-
 end

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

@@ -6,20 +6,18 @@
 require 'spec_helper'
 
 describe "admin/field_groups/new" do
-
   before do
-    login_and_assign(:admin => true)
+    login_and_assign(admin: true)
     assign(:field_group, field_group)
   end
 
-  let(:field_group) { FactoryGirl.create(:field_group, :label => 'test') }
+  let(:field_group) { FactoryGirl.create(:field_group, label: 'test') }
 
   it "renders javascript" do
     render
-    view.should render_template("admin/field_groups/new")
-    rendered.should have_text("crm.flick('empty', 'toggle')")
-    rendered.should have_text("crm.flip_form('#{field_group.klass_name.downcase}_create_field_group')")
-    rendered.should have_text("$('##{field_group.klass_name.downcase}_create_field_group').html")
+    expect(view).to render_template("admin/field_groups/new")
+    expect(rendered).to have_text("crm.flick('empty', 'toggle')")
+    expect(rendered).to have_text("crm.flip_form('#{field_group.klass_name.downcase}_create_field_group')")
+    expect(rendered).to have_text("$('##{field_group.klass_name.downcase}_create_field_group').html")
   end
-
 end

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

@@ -6,25 +6,23 @@
 require 'spec_helper'
 
 describe "admin/field_groups/update" do
-
   before do
-    login_and_assign(:admin => true)
+    login_and_assign(admin: true)
     assign(:field_group, field_group)
   end
 
-  let(:field_group) { FactoryGirl.create(:field_group, :label => 'test') }
+  let(:field_group) { FactoryGirl.create(:field_group, label: 'test') }
 
   it "renders javascript" do
     render
-    view.should render_template("admin/field_groups/update")
-    rendered.should have_text("crm.flip_form('#{dom_id(field_group, :edit)}');")
-    rendered.should have_text("crm.set_title('#{dom_id(field_group)}'")
+    expect(view).to render_template("admin/field_groups/update")
+    expect(rendered).to have_text("crm.flip_form('#{dom_id(field_group, :edit)}');")
+    expect(rendered).to have_text("crm.set_title('#{dom_id(field_group)}'")
   end
 
   it "renders javascript for invalid field group" do
-    field_group.errors.stub(:empty?).and_return(false)
+    allow(field_group.errors).to receive(:empty?).and_return(false)
     render
-    rendered.should have_text("$('##{dom_id(field_group, :edit)}').effect('shake', { distance:5 }, 250);")
+    expect(rendered).to have_text("$('##{dom_id(field_group, :edit)}').effect('shake', { distance:5 }, 250);")
   end
-
 end

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

@@ -7,15 +7,15 @@ require 'spec_helper'
 
 describe "admin/users/_new" do
   before do
-    login_and_assign(:admin => true)
+    login_and_assign(admin: true)
     assign(:user, User.new)
-    assign(:users, [ current_user ])
+    assign(:users, [current_user])
   end
 
   it "renders [Create User] form" do
     render
-    view.should render_template(:partial => "admin/users/_profile")
+    expect(view).to render_template(partial: "admin/users/_profile")
 
-    rendered.should have_tag("form[class=new_user]")
+    expect(rendered).to have_tag("form[class=new_user]")
   end
 end

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

@@ -7,19 +7,19 @@ require File.expand_path(File.dirname(__FILE__) + '/../../../spec_helper')
 
 describe "admin/users/create" do
   before do
-    login_and_assign(:admin => true)
+    login_and_assign(admin: true)
   end
 
   describe "create success" do
     before do
       assign(:user, @user = FactoryGirl.create(:user))
-      assign(:users, [ @user ]) # .paginate
+      assign(:users, [@user]) # .paginate
     end
 
     it "should hide [Create User] form and insert user partial" do
       render
-      rendered.should include(@user.username)
-      rendered.should include(%Q/$('#user_#{@user.id}').effect("highlight"/)
+      expect(rendered).to include(@user.username)
+      expect(rendered).to include(%/$('#user_#{@user.id}').effect("highlight"/)
     end
 
     # it "should update pagination" do
@@ -29,13 +29,12 @@ describe "admin/users/create" do
 
   describe "create failure" do
     it "should re-render [create] template in :create_user div" do
-      assign(:user, FactoryGirl.build(:user, :username => nil)) # make it invalid
-      assign(:users, [ current_user ])
+      assign(:user, FactoryGirl.build(:user, username: nil)) # make it invalid
+      assign(:users, [current_user])
       render
 
-      rendered.should include('Please specify username')
-      rendered.should include(%Q/$('#create_user').effect("shake"/)
+      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

@@ -7,7 +7,7 @@ require 'spec_helper'
 
 describe "admin/users/destroy" do
   before do
-    login_and_assign(:admin => true)
+    login_and_assign(admin: true)
   end
 
   describe "user got deleted" do
@@ -20,7 +20,7 @@ describe "admin/users/destroy" do
     it "blinds up destroyed user partial" do
       render
 
-      rendered.should include('slideUp')
+      expect(rendered).to include('slideUp')
     end
   end
 
@@ -32,20 +32,20 @@ describe "admin/users/destroy" do
     it "should remove confirmation panel" do
       render
 
-      rendered.should include(%Q/crm.flick('#{dom_id(@user, :confirm)}', 'remove');/)
+      expect(rendered).to include(%/crm.flick('#{dom_id(@user, :confirm)}', 'remove');/)
     end
 
     it "should shake user partial" do
       render
 
-      rendered.should include(%Q/$('#user_#{@user.id}').effect('shake'/)
+      expect(rendered).to include(%/$('#user_#{@user.id}').effect('shake'/)
     end
 
     it "should show flash message" do
       render
 
-      rendered.should include('flash')
-      rendered.should include(%Q/crm.flash('warning')/)
+      expect(rendered).to include('flash')
+      expect(rendered).to include(%/crm.flash('warning')/)
     end
   end
 end