fat_free_crm 0.13.6 → 0.14.0

data/spec/helpers/accounts_helper_spec.rb

@@ -6,12 +6,9 @@
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe AccountsHelper do
-
-  #Delete this example and add some real ones or delete this file
+  # 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
-    included_modules.should include(AccountsHelper)
+    expect(included_modules).to include(AccountsHelper)
   end
-
 end
-

data/spec/helpers/admin/field_groups_helper_spec.rb

@@ -7,12 +7,12 @@ require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
 
 describe Admin::FieldGroupsHelper do
   it "should return the correct info text about tag restrictions and classes for groups" do
-    field_group = FactoryGirl.build(:field_group, :klass_name => "Contact", :label => "Test Field Group")
+    field_group = FactoryGirl.build(:field_group, klass_name: "Contact", label: "Test Field Group")
     html = helper.field_group_subtitle(field_group)
-    html.should include("Test Field Group")
-    html.should include("This field group applies to contacts tagged with")
+    expect(html).to include("Test Field Group")
+    expect(html).to include("This field group applies to contacts tagged with")
     field_group.tag = nil
     field_group.klass_name = "Account"
-    field_group_subtitle(field_group).should include("This field group applies to all accounts")
+    expect(field_group_subtitle(field_group)).to include("This field group applies to all accounts")
   end
 end

data/spec/helpers/admin/plugins_helper_spec.rb

@@ -7,4 +7,3 @@ require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
 
 describe Admin::PluginsHelper do
 end
-

data/spec/helpers/admin/settings_helper_spec.rb

@@ -7,4 +7,3 @@ require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
 
 describe Admin::SettingsHelper do
 end
-

data/spec/helpers/admin/users_helper_spec.rb

@@ -7,4 +7,3 @@ require File.expand_path(File.dirname(__FILE__) + '/../../spec_helper')
 
 describe Admin::UsersHelper do
 end
-

data/spec/helpers/application_helper_spec.rb

@@ -6,81 +6,78 @@
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe ApplicationHelper do
-
   it "should be included in the object returned by #helper" do
     included_modules = (class << helper; self; end).send :included_modules
-    included_modules.should include(ApplicationHelper)
+    expect(included_modules).to include(ApplicationHelper)
   end
 
   describe "link_to_emails" do
     it "should add Bcc: if dropbox address is set" do
-      Setting.stub(:email_dropbox).and_return({ :address => "drop@example.com" })
-      helper.link_to_email("hello@example.com").should == '<a href="mailto:hello@example.com?bcc=drop@example.com" title="hello@example.com">hello@example.com</a>'
+      allow(Setting).to receive(:email_dropbox).and_return(address: "drop@example.com")
+      expect(helper.link_to_email("hello@example.com")).to eq('<a title="hello@example.com" href="mailto:hello@example.com?bcc=drop@example.com">hello@example.com</a>')
     end
 
     it "should not add Bcc: if dropbox address is not set" do
-      Setting.stub(:email_dropbox).and_return({ :address => nil })
-      helper.link_to_email("hello@example.com").should == '<a href="mailto:hello@example.com" title="hello@example.com">hello@example.com</a>'
+      allow(Setting).to receive(:email_dropbox).and_return(address: nil)
+      expect(helper.link_to_email("hello@example.com")).to eq('<a title="hello@example.com" href="mailto:hello@example.com">hello@example.com</a>')
     end
 
     it "should truncate long emails" do
-      Setting.stub(:email_dropbox).and_return({ :address => nil })
-      helper.link_to_email("hello@example.com", 5).should == '<a href="mailto:hello@example.com" title="hello@example.com">he...</a>'
+      allow(Setting).to receive(:email_dropbox).and_return(address: nil)
+      expect(helper.link_to_email("hello@example.com", 5)).to eq('<a title="hello@example.com" href="mailto:hello@example.com">he...</a>')
     end
 
     it "should escape HTML entities" do
-      Setting.stub(:email_dropbox).and_return({ :address => 'dr&op@example.com' })
-      helper.link_to_email("hell&o@example.com").should == '<a href="mailto:hell&amp;o@example.com?bcc=dr&amp;op@example.com" title="hell&amp;o@example.com">hell&amp;o@example.com</a>'
+      allow(Setting).to receive(:email_dropbox).and_return(address: 'dr&op@example.com')
+      expect(helper.link_to_email("hell&o@example.com")).to eq('<a title="hell&amp;o@example.com" href="mailto:hell&amp;o@example.com?bcc=dr&amp;op@example.com">hell&amp;o@example.com</a>')
     end
   end
 
   it "link_to_discard" do
     lead = FactoryGirl.create(:lead)
-    controller.request.stub(:fullpath).and_return("http://www.example.com/leads/#{lead.id}")
+    allow(controller.request).to receive(:fullpath).and_return("http://www.example.com/leads/#{lead.id}")
 
     link = helper.link_to_discard(lead)
-    link.should =~ %r|leads/#{lead.id}/discard|
-    link.should =~ %r|attachment=Lead&amp;attachment_id=#{lead.id}|
+    expect(link).to match(%r{leads/#{lead.id}/discard})
+    expect(link).to match(%r{attachment=Lead&amp;attachment_id=#{lead.id}})
   end
 
   describe "shown_on_landing_page?" do
     it "should return true for Ajax request made from the asset landing page" do
-      controller.request.stub(:xhr?).and_return(true)
-      controller.request.stub(:referer).and_return("http://www.example.com/leads/123")
-      helper.shown_on_landing_page?.should == true
+      allow(controller.request).to receive(:xhr?).and_return(true)
+      allow(controller.request).to receive(:referer).and_return("http://www.example.com/leads/123")
+      expect(helper.shown_on_landing_page?).to eq(true)
     end
 
     it "should return true for regular request to display asset landing page" do
-      controller.request.stub(:xhr?).and_return(false)
-      controller.request.stub(:fullpath).and_return("http://www.example.com/leads/123")
-      helper.shown_on_landing_page?.should == true
+      allow(controller.request).to receive(:xhr?).and_return(false)
+      allow(controller.request).to receive(:fullpath).and_return("http://www.example.com/leads/123")
+      expect(helper.shown_on_landing_page?).to eq(true)
     end
 
     it "should return false for Ajax request made from page other than the asset landing page" do
-      controller.request.stub(:xhr?).and_return(true)
-      controller.request.stub(:referer).and_return("http://www.example.com/leads")
-      helper.shown_on_landing_page?.should == false
+      allow(controller.request).to receive(:xhr?).and_return(true)
+      allow(controller.request).to receive(:referer).and_return("http://www.example.com/leads")
+      expect(helper.shown_on_landing_page?).to eq(false)
     end
 
     it "should return false for regular request to display page other than asset landing page" do
-      controller.request.stub(:xhr?).and_return(false)
-      controller.request.stub(:fullpath).and_return("http://www.example.com/leads")
-      helper.shown_on_landing_page?.should == false
+      allow(controller.request).to receive(:xhr?).and_return(false)
+      allow(controller.request).to receive(:fullpath).and_return("http://www.example.com/leads")
+      expect(helper.shown_on_landing_page?).to eq(false)
     end
   end
-  
+
   describe "current_view_name" do
-  
     before(:each) do
       @user = mock_model(User)
-      helper.stub(:current_user).and_return(@user)
-      controller.stub(:params).and_return({'action' => 'show', 'controller' => 'contacts'})
+      allow(helper).to receive(:current_user).and_return(@user)
+      allow(controller).to receive(:params).and_return('action' => 'show', 'controller' => 'contacts')
     end
-  
+
     it "should return the contact 'show' outline stored in the user preferences" do
-      @user.should_receive(:pref).and_return({:contacts_show_view => 'long'})
-      helper.current_view_name.should == 'long'
+      expect(@user).to receive(:pref).and_return(contacts_show_view: 'long')
+      expect(helper.current_view_name).to eq('long')
     end
-  
   end
 end

data/spec/helpers/authentications_helper_spec.rb

@@ -6,12 +6,9 @@
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe AuthenticationsHelper do
-
-  #Delete this example and add some real ones or delete this file
+  # 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
-    included_modules.should include(AuthenticationsHelper)
+    expect(included_modules).to include(AuthenticationsHelper)
   end
-
 end
-

data/spec/helpers/campaigns_helper_spec.rb

@@ -6,12 +6,9 @@
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe CampaignsHelper do
-
-  #Delete this example and add some real ones or delete this file
+  # 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
-    included_modules.should include(CampaignsHelper)
+    expect(included_modules).to include(CampaignsHelper)
   end
-
 end
-

data/spec/helpers/comments_helper_spec.rb

@@ -6,12 +6,9 @@
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe CommentsHelper do
-
-  #Delete this example and add some real ones or delete this file
+  # 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
-    included_modules.should include(CommentsHelper)
+    expect(included_modules).to include(CommentsHelper)
   end
-
 end
-

data/spec/helpers/contacts_helper_spec.rb

@@ -6,12 +6,9 @@
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe ContactsHelper do
-
-  #Delete this example and add some real ones or delete this file
+  # 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
-    included_modules.should include(ContactsHelper)
+    expect(included_modules).to include(ContactsHelper)
   end
-
 end
-

data/spec/helpers/emails_helper_spec.rb

@@ -7,4 +7,3 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe EmailsHelper do # Helper methods can be called directly in the examples (it blocks)
 end
-

data/spec/helpers/fields_helper_spec.rb

@@ -8,4 +8,3 @@ include FieldsHelper
 
 describe FieldsHelper do
 end
-

data/spec/helpers/groups_helper_spec.rb

@@ -16,5 +16,4 @@ require 'spec_helper'
 #   end
 # end
 describe GroupsHelper do
-  
 end

data/spec/helpers/home_helper_spec.rb

@@ -6,12 +6,9 @@
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe HomeHelper do
-
-  #Delete this example and add some real ones or delete this file
+  # 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
-    included_modules.should include(HomeHelper)
+    expect(included_modules).to include(HomeHelper)
   end
-
 end
-

data/spec/helpers/leads_helper_spec.rb

@@ -6,12 +6,9 @@
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe LeadsHelper do
-
-  #Delete this example and add some real ones or delete this file
+  # 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
-    included_modules.should include(LeadsHelper)
+    expect(included_modules).to include(LeadsHelper)
   end
-
 end
-

data/spec/helpers/lists_helper_spec.rb

@@ -16,5 +16,4 @@ require 'spec_helper'
 #   end
 # end
 describe ListsHelper do
-  
 end

data/spec/helpers/opportunities_helper_spec.rb

@@ -6,12 +6,9 @@
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe OpportunitiesHelper do
-
-  #Delete this example and add some real ones or delete this file
+  # 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
-    included_modules.should include(OpportunitiesHelper)
+    expect(included_modules).to include(OpportunitiesHelper)
   end
-
 end
-

data/spec/helpers/passwords_helper_spec.rb

@@ -6,12 +6,9 @@
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe PasswordsHelper do
-
-  #Delete this example and add some real ones or delete this file
+  # 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
-    included_modules.should include(PasswordsHelper)
+    expect(included_modules).to include(PasswordsHelper)
   end
-
 end
-

data/spec/helpers/tasks_helper_spec.rb

@@ -6,17 +6,13 @@
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe TasksHelper do
-
   describe "responding with generated links" do
-
     before do
       @task = FactoryGirl.create(:task)
     end
 
     it "should render link to uncomplete of a task" do
-      link_to_task_uncomplete(@task, nil).should include(t(:task_uncomplete))
+      expect(link_to_task_uncomplete(@task, nil)).to include(t(:task_uncomplete))
     end
-
   end
 end
-

data/spec/helpers/users_helper_spec.rb

@@ -6,34 +6,32 @@
 require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe UsersHelper do
-
-  let(:myself) { FactoryGirl.create(:user, :id => 54)}
-  let(:user1) { FactoryGirl.create(:user,  :id => 60, :first_name => 'Bob', :last_name => "Hope") }
-  let(:user2) { FactoryGirl.create(:user,  :id => 75, :first_name => 'Billy', :last_name => "Joel") }
+  let(:myself) { FactoryGirl.create(:user, id: 54) }
+  let(:user1) { FactoryGirl.create(:user,  id: 60, first_name: 'Bob', last_name: "Hope") }
+  let(:user2) { FactoryGirl.create(:user,  id: 75, first_name: 'Billy', last_name: "Joel") }
 
   describe "user_options_for_select" do
     it "includes 'myself'" do
-      user_options_for_select([user1, user2], myself).should include(["Myself", 54])
+      expect(user_options_for_select([user1, user2], myself)).to include(["Myself", 54])
     end
 
     it "includes other users" do
-      user_options_for_select([user1, user2], myself).should include(["Bob Hope", 60], ["Billy Joel", 75])
+      expect(user_options_for_select([user1, user2], myself)).to include(["Bob Hope", 60], ["Billy Joel", 75])
     end
   end
 
   describe "user_select" do
     it "includes blank option" do
-      user_select(:lead, [user1, user2], myself).should match(/<option value="">Unassigned<\/option>/)
+      expect(user_select(:lead, [user1, user2], myself)).to match(/<option value="">Unassigned<\/option>/)
     end
 
     it "includes myself" do
-      user_select(:lead, [user1, user2], myself).should match(/<option value="54">Myself<\/option>/)
+      expect(user_select(:lead, [user1, user2], myself)).to match(/<option value="54">Myself<\/option>/)
     end
 
     it "includes other users" do
-      user_select(:lead, [user1, user2], myself).should match(/<option value="60">Bob Hope<\/option>/)
-      user_select(:lead, [user1, user2], myself).should match(/<option value="75">Billy Joel<\/option>/)
+      expect(user_select(:lead, [user1, user2], myself)).to match(/<option value="60">Bob Hope<\/option>/)
+      expect(user_select(:lead, [user1, user2], myself)).to match(/<option value="75">Billy Joel<\/option>/)
     end
   end
 end
-

data/spec/lib/comment_extensions_spec.rb

@@ -7,7 +7,7 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 
 describe FatFreeCRM::CommentExtensions do
   describe "add_comment_by_user" do
-    let(:user) { FactoryGirl.create(:user)}
+    let(:user) { FactoryGirl.create(:user) }
 
     before :each do
       build_model(:commentable_entity) do
@@ -22,13 +22,13 @@ describe FatFreeCRM::CommentExtensions do
     it "should create a comment for user" do
       entity = CommentableEntity.create
       entity.add_comment_by_user("I will handle this one", user)
-      entity.reload.comments.map(&:comment).should include("I will handle this one")
+      expect(entity.reload.comments.map(&:comment)).to include("I will handle this one")
     end
 
     it "should not create a comment if body is blank" do
       entity = CommentableEntity.create
       entity.add_comment_by_user("", user)
-      entity.reload.comments.should be_empty
+      expect(entity.reload.comments).to be_empty
     end
   end
 end

data/spec/lib/core_ext/string_spec.rb

@@ -16,6 +16,6 @@ describe "String" do
       ["Man Chi Lo", "Stephanie"]
     ]
     result = "Stephanie Man Chi Lo".name_permutations
-    result.sort.should == expected.sort
+    expect(result.sort).to eq(expected.sort)
   end
 end

data/spec/lib/errors_spec.rb

@@ -8,23 +8,23 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
 describe 'ActiveModel Validation Errors' do
   it 'should render explicit error message if it starts with a caret' do
     class Adam < User
-      validates_presence_of :title, :message => '^Missing title'
+      validates_presence_of :title, message: '^Missing title'
     end
 
-    adam = Adam.create(:username => 'adam', :email => 'adam@example.com')
-    adam.valid?.should == false
-    adam.errors[:title].should == [ '^Missing title' ]
-    adam.errors.full_messages[0].should == 'Missing title'
+    adam = Adam.create(username: 'adam', email: 'adam@example.com')
+    expect(adam.valid?).to eq(false)
+    expect(adam.errors[:title]).to eq(['^Missing title'])
+    expect(adam.errors.full_messages[0]).to eq('Missing title')
   end
 
   it 'should exhibit default behavior' do
     class Eve < User
-      validates_presence_of :title, :message => 'missing'
+      validates_presence_of :title, message: 'missing'
     end
 
-    eve = Eve.create(:username => 'eve', :email => 'eve@example.com')
-    eve.valid?.should == false
-    eve.errors[:title].should == [ 'missing' ]
-    eve.errors.full_messages[0].should == 'Title missing'
+    eve = Eve.create(username: 'eve', email: 'eve@example.com')
+    expect(eve.valid?).to eq(false)
+    expect(eve.errors[:title]).to eq(['missing'])
+    expect(eve.errors.full_messages[0]).to eq('Title missing')
   end
 end