fat_free_crm 0.12.3 → 0.13.0

data/spec/controllers/applications_controller_spec.rb

@@ -22,8 +22,8 @@ describe ApplicationController do
     end
     
     it "should return [6, 9] when related is 'campaigns/7'" do
-      controller.stub!(:controller_name).and_return('opportunities')
-      campaign = mock(Campaign, :opportunities => [mock(:id => 6), mock(:id => 9)])
+      controller.stub(:controller_name).and_return('opportunities')
+      campaign = double(Campaign, :opportunities => [double(:id => 6), double(:id => 9)])
       Campaign.should_receive(:find_by_id).with('7').and_return(campaign)
       controller.send(:auto_complete_ids_to_exclude, 'campaigns/7').sort.should == [6, 9]
     end
@@ -34,8 +34,8 @@ describe ApplicationController do
     end
     
     it "should return [] when related object association is not found" do
-      controller.stub!(:controller_name).and_return('not_a_method_that_exists')
-      campaign = mock(Campaign)
+      controller.stub(:controller_name).and_return('not_a_method_that_exists')
+      campaign = double(Campaign)
       Campaign.should_receive(:find_by_id).with('7').and_return(campaign)
       controller.send(:auto_complete_ids_to_exclude, 'campaigns/7').should == []
     end

data/spec/controllers/authentications_controller_spec.rb

@@ -34,7 +34,7 @@ describe AuthenticationsController do
     describe "user must not be logged in" do
       before(:each) do
         @user = FactoryGirl.create(:user, :username => "user", :password => "pass", :password_confirmation => "pass")
-        @controller.stub!(:current_user).and_return(@user)
+        @controller.stub(:current_user).and_return(@user)
       end
 
       describe "GET authentication (login form)" do
@@ -63,18 +63,18 @@ describe AuthenticationsController do
   describe "POST authentications" do
     before(:each) do
       @login = { :username => "user", :password => "pass", :remember_me => "0" }
-      @authentication = mock(Authentication, @login)
+      @authentication = double(Authentication, @login)
     end
 
     describe "successful authentication " do
       before(:each) do
-        @authentication.stub!(:save).and_return(true)
-        Authentication.stub!(:new).and_return(@authentication)
+        @authentication.stub(:save).and_return(true)
+        Authentication.stub(:new).and_return(@authentication)
       end
 
       it "displays welcome message and redirects to the home page" do
         @user = FactoryGirl.create(:user, :username => "user", :password => "pass", :password_confirmation => "pass", :login_count => 0)
-        @authentication.stub!(:user).and_return(@user)
+        @authentication.stub(:user).and_return(@user)
 
         post :create, :authentication => @login
         flash[:notice].should_not == nil
@@ -84,7 +84,7 @@ describe AuthenticationsController do
 
       it "displays last login time if it's not the first login" do
         @user = FactoryGirl.create(:user, :username => "user", :password => "pass", :password_confirmation => "pass", :login_count => 42)
-        @authentication.stub!(:user).and_return(@user)
+        @authentication.stub(:user).and_return(@user)
 
         post :create, :authentication => @login
         flash[:notice].should =~ /last login/
@@ -96,9 +96,9 @@ describe AuthenticationsController do
       describe "user is not suspended" do
         it "redirects to login page if username or password are invalid" do
           @user = FactoryGirl.create(:user, :username => "user", :password => "pass", :password_confirmation => "pass")
-          @authentication.stub!(:user).and_return(@user)
-          @authentication.stub!(:save).and_return(false) # <--- Authentication failure.
-          Authentication.stub!(:new).and_return(@authentication)
+          @authentication.stub(:user).and_return(@user)
+          @authentication.stub(:save).and_return(false) # <--- Authentication failure.
+          Authentication.stub(:new).and_return(@authentication)
 
           post :create, :authentication => @login
           flash[:warning].should_not == nil
@@ -108,14 +108,14 @@ describe AuthenticationsController do
 
       describe "user has been suspended" do
         before(:each) do
-          @authentication.stub!(:save).and_return(true)
-          Authentication.stub!(:new).and_return(@authentication)
+          @authentication.stub(:save).and_return(true)
+          Authentication.stub(:new).and_return(@authentication)
         end
 
         # This tests :before_save update_info callback in Authentication model.
         it "keeps user login attributes intact" do
           @user = FactoryGirl.create(:user, :username => "user", :password => "pass", :password_confirmation => "pass", :suspended_at => Date.yesterday, :login_count => 0, :last_login_at => nil, :last_login_ip => nil)
-          @authentication.stub!(:user).and_return(@user)
+          @authentication.stub(:user).and_return(@user)
 
           post :create, :authentication => @login
           @authentication.user.login_count.should == 0
@@ -125,7 +125,7 @@ describe AuthenticationsController do
 
         it "redirects to login page if user is suspended" do
           @user = FactoryGirl.create(:user, :username => "user", :password => "pass", :password_confirmation => "pass", :suspended_at => Date.yesterday)
-          @authentication.stub!(:user).and_return(@user)
+          @authentication.stub(:user).and_return(@user)
 
           post :create, :authentication => @login
           flash[:warning].should_not == nil # Invalid username/password.
@@ -134,9 +134,9 @@ describe AuthenticationsController do
         end
 
         it "redirects to login page with the message if signup needs approval and user hasn't been activated yet" do
-          Setting.stub!(:user_signup).and_return(:needs_approval)
+          Setting.stub(:user_signup).and_return(:needs_approval)
           @user = FactoryGirl.create(:user, :username => "user", :password => "pass", :password_confirmation => "pass", :suspended_at => Date.yesterday, :login_count => 0)
-          @authentication.stub!(:user).and_return(@user)
+          @authentication.stub(:user).and_return(@user)
 
           post :create, :authentication => @login
           flash[:warning].should == nil     # Invalid username/password.

data/spec/controllers/comments_controller_spec.rb

@@ -3,7 +3,7 @@
 # Fat Free CRM is freely distributable under the terms of MIT license.
 # See MIT-LICENSE file or http://www.opensource.org/licenses/mit-license.php
 #------------------------------------------------------------------------------
-require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+require 'spec_helper'
 
 describe CommentsController do
 
@@ -76,84 +76,6 @@ describe CommentsController do
 
   end
 
-  # GET /comments/1
-  # GET /comments/1.xml                                         not implemented
-  #----------------------------------------------------------------------------
-  # describe "responding to GET show" do
-  #
-  #   it "should expose the requested comment as @comment" do
-  #     Comment.should_receive(:find).with("37").and_return(mock_comment)
-  #     get :show, :id => "37"
-  #     assigns[:comment].should equal(mock_comment)
-  #   end
-  #
-  #   describe "with mime type of xml" do
-  #     it "should render the requested comment as xml" do
-  #       request.env["HTTP_ACCEPT"] = "application/xml"
-  #       Comment.should_receive(:find).with("37").and_return(mock_comment)
-  #       mock_comment.should_receive(:to_xml).and_return("generated XML")
-  #       get :show, :id => "37"
-  #       response.body.should == "generated XML"
-  #     end
-  #   end
-  #
-  # end
-
-  # GET /comments/new
-  # GET /comments/new.xml                                                  AJAX
-  #----------------------------------------------------------------------------
-  describe "responding to GET new" do
-
-    COMMENTABLE.each do |asset|
-      it "should expose a new comment as @comment for #{asset}" do
-        @asset = FactoryGirl.create(asset)
-        @comment = Comment.new
-
-        xhr :get, :new, "#{asset}_id".to_sym => @asset.id
-        assigns[:comment].attributes.should == @comment.attributes
-        assigns[:commentable].should == asset.to_s
-        response.should render_template("comments/new")
-      end
-
-      it "should save the fact that a comment gets added to #{asset}" do
-        @asset = FactoryGirl.create(asset)
-        @comment = Comment.new
-
-        xhr :get, :new, "#{asset}_id".to_sym => @asset.id
-        session["#{asset}_new_comment"].should == true
-      end
-
-      it "should clear the session if user cancels a comment for #{asset}" do
-        @asset = FactoryGirl.create(asset)
-        @comment = Comment.new
-
-        xhr :get, :new, "#{asset}_id".to_sym => @asset.id, :cancel => "true"
-        session["#{asset}_new_comment"].should == nil
-      end
-
-      it "should redirect to #{asset}'s index page with the message if the #{asset} got deleted" do
-        @asset = FactoryGirl.create(asset)
-        @asset.destroy
-        @comment = Comment.new
-
-        xhr :get, :new, "#{asset}_id".to_sym => @asset.id
-        flash[:warning].should_not == nil
-        response.body.should =~ %r(window.location.href)m
-        response.body.should =~ %r(#{asset.to_s.pluralize})m
-      end
-
-      it "should redirect to #{asset}'s index page with the message if the #{asset} got protected" do
-        @asset = FactoryGirl.create(asset, :access => "Private")
-        @comment = Comment.new
-
-        xhr :get, :new, "#{asset}_id".to_sym => @asset.id
-        flash[:warning].should_not == nil
-        response.body.should =~ %r(window.location.href)m
-        response.body.should =~ %r(#{asset.to_s.pluralize})m
-      end
-    end
-  end
-
   # GET /comments/1/edit                                                   AJAX
   #----------------------------------------------------------------------------
   describe "responding to GET edit" do
@@ -162,7 +84,7 @@ describe CommentsController do
       it "should expose the requested comment as @commment and render [edit] template" do
         @asset = FactoryGirl.create(asset)
         @comment = FactoryGirl.create(:comment, :id => 42, :commentable => @asset, :user => current_user)
-        Comment.stub!(:new).and_return(@comment)
+        Comment.stub(:new).and_return(@comment)
 
         xhr :get, :edit, :id => 42
         assigns[:comment].should == @comment
@@ -182,7 +104,7 @@ describe CommentsController do
         it "should expose a newly created comment as @comment for the #{asset}" do
           @asset = FactoryGirl.create(asset)
           @comment = FactoryGirl.build(:comment, :commentable => @asset, :user => current_user)
-          Comment.stub!(:new).and_return(@comment)
+          Comment.stub(:new).and_return(@comment)
 
           xhr :post, :create, :comment => { :commentable_type => asset.to_s.classify, :commentable_id => @asset.id, :user_id => current_user.id, :comment => "Hello" }
           assigns[:comment].should == @comment
@@ -196,7 +118,7 @@ describe CommentsController do
         it "should expose a newly created but unsaved comment as @comment for #{asset}" do
           @asset = FactoryGirl.create(asset)
           @comment = FactoryGirl.build(:comment, :commentable => @asset, :user => current_user)
-          Comment.stub!(:new).and_return(@comment)
+          Comment.stub(:new).and_return(@comment)
 
           xhr :post, :create, :comment => {}
           assigns[:comment].should == @comment
@@ -220,13 +142,13 @@ describe CommentsController do
   #     end
   #
   #     it "should expose the requested comment as @comment" do
-  #       Comment.stub!(:find).and_return(mock_comment(:update_attributes => true))
+  #       Comment.stub(:find).and_return(mock_comment(:update_attributes => true))
   #       put :update, :id => "1"
   #       assigns(:comment).should equal(mock_comment)
   #     end
   #
   #     it "should redirect to the comment" do
-  #       Comment.stub!(:find).and_return(mock_comment(:update_attributes => true))
+  #       Comment.stub(:find).and_return(mock_comment(:update_attributes => true))
   #       put :update, :id => "1"
   #       response.should redirect_to(comment_path(mock_comment))
   #     end
@@ -240,13 +162,13 @@ describe CommentsController do
   #     end
   #
   #     it "should expose the comment as @comment" do
-  #       Comment.stub!(:find).and_return(mock_comment(:update_attributes => false))
+  #       Comment.stub(:find).and_return(mock_comment(:update_attributes => false))
   #       put :update, :id => "1"
   #       assigns(:comment).should equal(mock_comment)
   #     end
   #
   #     it "should re-render the 'edit' template" do
-  #       Comment.stub!(:find).and_return(mock_comment(:update_attributes => false))
+  #       Comment.stub(:find).and_return(mock_comment(:update_attributes => false))
   #       put :update, :id => "1"
   #       response.should render_template('edit')
   #     end
@@ -264,7 +186,7 @@ describe CommentsController do
           it "should destroy the requested comment and render [destroy] template" do
             @asset = FactoryGirl.create(asset)
             @comment = FactoryGirl.create(:comment, :commentable => @asset, :user => current_user)
-            Comment.stub!(:new).and_return(@comment)
+            Comment.stub(:new).and_return(@comment)
 
             xhr :delete, :destroy, :id => @comment.id
             lambda { Comment.find(@comment) }.should raise_error(ActiveRecord::RecordNotFound)

data/spec/controllers/emails_controller_spec.rb

@@ -22,7 +22,7 @@ describe EmailsController, "handling GET /emails" do
           it "should destroy the requested email and render [destroy] template" do
             @asset = FactoryGirl.create(asset)
             @email = FactoryGirl.create(:email, :mediator => @asset, :user => current_user)
-            Email.stub!(:new).and_return(@email)
+            Email.stub(:new).and_return(@email)
 
             xhr :delete, :destroy, :id => @email.id
             lambda { Email.find(@email) }.should raise_error(ActiveRecord::RecordNotFound)

data/spec/controllers/entities/accounts_controller_spec.rb

@@ -96,7 +96,7 @@ describe AccountsController do
 
     describe "with mime type of JSON" do
       it "should render all accounts as json" do
-        @controller.should_receive(:get_accounts).and_return(accounts = mock("Array of Accounts"))
+        @controller.should_receive(:get_accounts).and_return(accounts = double("Array of Accounts"))
         accounts.should_receive(:to_json).and_return("generated JSON")
 
         request.env["HTTP_ACCEPT"] = "application/json"
@@ -107,7 +107,7 @@ describe AccountsController do
 
     describe "with mime type of XML" do
       it "should render all accounts as xml" do
-        @controller.should_receive(:get_accounts).and_return(accounts = mock("Array of Accounts"))
+        @controller.should_receive(:get_accounts).and_return(accounts = double("Array of Accounts"))
         accounts.should_receive(:to_xml).and_return("generated XML")
 
         request.env["HTTP_ACCEPT"] = "application/xml"
@@ -304,7 +304,7 @@ describe AccountsController do
 
       it "should expose a newly created account as @account and render [create] template" do
         @account = FactoryGirl.build(:account, :name => "Hello world", :user => current_user)
-        Account.stub!(:new).and_return(@account)
+        Account.stub(:new).and_return(@account)
 
         xhr :post, :create, :account => { :name => "Hello world" }
         assigns(:account).should == @account
@@ -314,7 +314,7 @@ describe AccountsController do
       # Note: [Create Account] is shown only on Accounts index page.
       it "should reload accounts to update pagination" do
         @account = FactoryGirl.build(:account, :user => current_user)
-        Account.stub!(:new).and_return(@account)
+        Account.stub(:new).and_return(@account)
 
         xhr :post, :create, :account => { :name => "Hello" }
         assigns[:accounts].should == [ @account ]
@@ -322,7 +322,7 @@ describe AccountsController do
 
       it "should get data to update account sidebar" do
         @account = FactoryGirl.build(:account, :name => "Hello", :user => current_user)
-        Campaign.stub!(:new).and_return(@account)
+        Campaign.stub(:new).and_return(@account)
 
         xhr :post, :create, :account => { :name => "Hello" }
         assigns[:account_category_total].should be_instance_of(HashWithIndifferentAccess)
@@ -330,7 +330,7 @@ describe AccountsController do
 
       it "should add a new comment to the newly created account when specified" do
         @account = FactoryGirl.build(:account, :name => "Hello world", :user => current_user)
-        Account.stub!(:new).and_return(@account)
+        Account.stub(:new).and_return(@account)
 
         xhr :post, :create, :account => { :name => "Hello world" }, :comment_body => "Awesome comment is awesome"
         assigns[:account].comments.map(&:comment).should include("Awesome comment is awesome")
@@ -340,7 +340,7 @@ describe AccountsController do
     describe "with invalid params" do
       it "should expose a newly created but unsaved account as @account and still render [create] template" do
         @account = FactoryGirl.build(:account, :name => nil, :user => nil)
-        Account.stub!(:new).and_return(@account)
+        Account.stub(:new).and_return(@account)
 
         xhr :post, :create, :account => {}
         assigns(:account).should == @account

data/spec/controllers/entities/campaigns_controller_spec.rb

@@ -306,7 +306,7 @@ describe CampaignsController do
 
       it "should expose a newly created campaign as @campaign and render [create] template" do
         @campaign = FactoryGirl.build(:campaign, :name => "Hello", :user => current_user)
-        Campaign.stub!(:new).and_return(@campaign)
+        Campaign.stub(:new).and_return(@campaign)
 
         xhr :post, :create, :campaign => { :name => "Hello" }
         assigns(:campaign).should == @campaign
@@ -315,7 +315,7 @@ describe CampaignsController do
 
       it "should get data to update campaign sidebar" do
         @campaign = FactoryGirl.build(:campaign, :name => "Hello", :user => current_user)
-        Campaign.stub!(:new).and_return(@campaign)
+        Campaign.stub(:new).and_return(@campaign)
 
         xhr :post, :create, :campaign => { :name => "Hello" }
         assigns[:campaign_status_total].should be_instance_of(HashWithIndifferentAccess)
@@ -323,7 +323,7 @@ describe CampaignsController do
 
       it "should reload campaigns to update pagination" do
         @campaign = FactoryGirl.build(:campaign, :user => current_user)
-        Campaign.stub!(:new).and_return(@campaign)
+        Campaign.stub(:new).and_return(@campaign)
 
         xhr :post, :create, :campaign => { :name => "Hello" }
         assigns[:campaigns].should == [ @campaign ]
@@ -331,7 +331,7 @@ describe CampaignsController do
 
       it "should add a new comment to the newly created campaign when specified" do
         @campaign = FactoryGirl.build(:campaign, :name => "Hello world", :user => current_user)
-        Campaign.stub!(:new).and_return(@campaign)
+        Campaign.stub(:new).and_return(@campaign)
 
         xhr :post, :create, :campaign => { :name => "Hello world" }, :comment_body => "Awesome comment is awesome"
         @campaign.reload.comments.map(&:comment).should include("Awesome comment is awesome")
@@ -342,7 +342,7 @@ describe CampaignsController do
 
       it "should expose a newly created but unsaved campaign as @campaign and still render [create] template" do
         @campaign = FactoryGirl.build(:campaign, :id => nil, :name => nil, :user => current_user)
-        Campaign.stub!(:new).and_return(@campaign)
+        Campaign.stub(:new).and_return(@campaign)
 
         xhr :post, :create, :campaign => nil
         assigns(:campaign).should == @campaign

data/spec/controllers/entities/contacts_controller_spec.rb

@@ -70,7 +70,7 @@ describe ContactsController do
 
     describe "with mime type of JSON" do
       it "should render all contacts as JSON" do
-        @controller.should_receive(:get_contacts).and_return(contacts = mock("Array of Contacts"))
+        @controller.should_receive(:get_contacts).and_return(contacts = double("Array of Contacts"))
         contacts.should_receive(:to_json).and_return("generated JSON")
 
         request.env["HTTP_ACCEPT"] = "application/json"
@@ -81,7 +81,7 @@ describe ContactsController do
 
     describe "with mime type of XML" do
       it "should render all contacts as xml" do
-        @controller.should_receive(:get_contacts).and_return(contacts = mock("Array of Contacts"))
+        @controller.should_receive(:get_contacts).and_return(contacts = double("Array of Contacts"))
         contacts.should_receive(:to_xml).and_return("generated XML")
 
         request.env["HTTP_ACCEPT"] = "application/xml"
@@ -303,7 +303,7 @@ describe ContactsController do
 
       it "should expose a newly created contact as @contact and render [create] template" do
         @contact = FactoryGirl.build(:contact, :first_name => "Billy", :last_name => "Bones")
-        Contact.stub!(:new).and_return(@contact)
+        Contact.stub(:new).and_return(@contact)
 
         xhr :post, :create, :contact => { :first_name => "Billy", :last_name => "Bones" }, :account => { :name => "Hello world" }
         assigns(:contact).should == @contact
@@ -314,7 +314,7 @@ describe ContactsController do
       it "should be able to associate newly created contact with the opportunity" do
         @opportunity = FactoryGirl.create(:opportunity, :id => 987);
         @contact = FactoryGirl.build(:contact)
-        Contact.stub!(:new).and_return(@contact)
+        Contact.stub(:new).and_return(@contact)
 
         xhr :post, :create, :contact => { :first_name => "Billy"}, :account => {}, :opportunity => 987
         assigns(:contact).opportunities.should include(@opportunity)
@@ -323,7 +323,7 @@ describe ContactsController do
 
       it "should reload contacts to update pagination if called from contacts index" do
         @contact = FactoryGirl.build(:contact, :user => current_user)
-        Contact.stub!(:new).and_return(@contact)
+        Contact.stub(:new).and_return(@contact)
 
         request.env["HTTP_REFERER"] = "http://localhost/contacts"
         xhr :post, :create, :contact => { :first_name => "Billy", :last_name => "Bones" }, :account => {}
@@ -332,7 +332,7 @@ describe ContactsController do
 
       it "should add a new comment to the newly created contact when specified" do
         @contact = FactoryGirl.build(:contact, :user => current_user)
-        Contact.stub!(:new).and_return(@contact)
+        Contact.stub(:new).and_return(@contact)
 
         xhr :post, :create, :contact => { :first_name => "Testy", :last_name => "McTest" }, :account => { :name => "Hello world" }, :comment_body => "Awesome comment is awesome"
         assigns[:contact].comments.map(&:comment).should include("Awesome comment is awesome")
@@ -343,7 +343,7 @@ describe ContactsController do
 
       before(:each) do
         @contact = FactoryGirl.build(:contact, :first_name => nil, :user => current_user, :lead => nil)
-        Contact.stub!(:new).and_return(@contact)
+        Contact.stub(:new).and_return(@contact)
       end
 
       # Redraw [create] form with selected account.

data/spec/controllers/entities/leads_controller_spec.rb

@@ -95,7 +95,7 @@ describe LeadsController do
 
     describe "with mime type of JSON" do
       it "should render all leads as JSON" do
-        @controller.should_receive(:get_leads).and_return(leads = mock("Array of Leads"))
+        @controller.should_receive(:get_leads).and_return(leads = double("Array of Leads"))
         leads.should_receive(:to_json).and_return("generated JSON")
 
         request.env["HTTP_ACCEPT"] = "application/json"
@@ -106,7 +106,7 @@ describe LeadsController do
 
     describe "with mime type of XML" do
       it "should render all leads as xml" do
-        @controller.should_receive(:get_leads).and_return(leads = mock("Array of Leads"))
+        @controller.should_receive(:get_leads).and_return(leads = double("Array of Leads"))
         leads.should_receive(:to_xml).and_return("generated XML")
 
         request.env["HTTP_ACCEPT"] = "application/xml"
@@ -210,7 +210,7 @@ describe LeadsController do
 
     it "should expose a new lead as @lead and render [new] template" do
       @lead = FactoryGirl.build(:lead, :user => current_user, :campaign => nil)
-      Lead.stub!(:new).and_return(@lead)
+      Lead.stub(:new).and_return(@lead)
       @campaigns = [ FactoryGirl.create(:campaign, :user => current_user) ]
 
       xhr :get, :new
@@ -322,7 +322,7 @@ describe LeadsController do
 
       it "should expose a newly created lead as @lead and render [create] template" do
         @lead = FactoryGirl.build(:lead, :user => current_user, :campaign => nil)
-        Lead.stub!(:new).and_return(@lead)
+        Lead.stub(:new).and_return(@lead)
         @campaigns = [ FactoryGirl.create(:campaign, :user => current_user) ]
 
         xhr :post, :create, :lead => { :first_name => "Billy", :last_name => "Bones" }
@@ -341,7 +341,7 @@ describe LeadsController do
         @campaign.save
 
         @lead = FactoryGirl.build(:lead, :campaign => @campaign, :user => current_user, :access => "Shared")
-        Lead.stub!(:new).and_return(@lead)
+        Lead.stub(:new).and_return(@lead)
 
         xhr :post, :create, :lead => { :first_name => "Billy", :last_name => "Bones", :access => "Campaign", :user_ids => %w(7 8) }, :campaign => @campaign.id
         assigns(:lead).should == @lead
@@ -353,7 +353,7 @@ describe LeadsController do
 
       it "should get the data to update leads sidebar if called from leads index" do
         @lead = FactoryGirl.build(:lead, :user => current_user, :campaign => nil)
-        Lead.stub!(:new).and_return(@lead)
+        Lead.stub(:new).and_return(@lead)
 
         request.env["HTTP_REFERER"] = "http://localhost/leads"
         xhr :post, :create, :lead => { :first_name => "Billy", :last_name => "Bones" }
@@ -362,7 +362,7 @@ describe LeadsController do
 
       it "should reload leads to update pagination if called from leads index" do
         @lead = FactoryGirl.build(:lead, :user => current_user, :campaign => nil)
-        Lead.stub!(:new).and_return(@lead)
+        Lead.stub(:new).and_return(@lead)
 
         request.env["HTTP_REFERER"] = "http://localhost/leads"
         xhr :post, :create, :lead => { :first_name => "Billy", :last_name => "Bones" }
@@ -380,7 +380,7 @@ describe LeadsController do
       
       it "should add a new comment to the newly created lead when specified" do
         @lead = FactoryGirl.create(:lead)
-        Lead.stub!(:new).and_return(@lead)
+        Lead.stub(:new).and_return(@lead)
         xhr :post, :create, :lead => { :first_name => "Test", :last_name => "Lead" }, :comment_body => "This is an important lead."
         @lead.reload.comments.map(&:comment).should include("This is an important lead.")
       end
@@ -390,7 +390,7 @@ describe LeadsController do
 
       it "should expose a newly created but unsaved lead as @lead and still render [create] template" do
         @lead = FactoryGirl.build(:lead, :user => current_user, :first_name => nil, :campaign => nil)
-        Lead.stub!(:new).and_return(@lead)
+        Lead.stub(:new).and_return(@lead)
         @campaigns = [ FactoryGirl.create(:campaign, :user => current_user) ]
 
         xhr :post, :create, :lead => { :first_name => nil }
@@ -730,9 +730,9 @@ describe LeadsController do
       @account = FactoryGirl.create(:account, :id => 123, :user => current_user)
       @opportunity = FactoryGirl.build(:opportunity, :user => current_user, :campaign => @lead.campaign,
                                    :account => @account)
-      Opportunity.stub!(:new).and_return(@opportunity)
+      Opportunity.stub(:new).and_return(@opportunity)
       @contact = FactoryGirl.build(:contact, :user => current_user, :lead => @lead)
-      Contact.stub!(:new).and_return(@contact)
+      Contact.stub(:new).and_return(@contact)
 
       xhr :put, :promote, :id => 42, :account => { :id => 123 }, :opportunity => { :name => "Hello" }
       @lead.reload.status.should == "converted"
@@ -755,11 +755,11 @@ describe LeadsController do
       @account = FactoryGirl.build(:account, :user => current_user, :access => "Shared")
       @account.permissions << FactoryGirl.create(:permission, :user => he,  :asset => @account)
       @account.permissions << FactoryGirl.create(:permission, :user => she, :asset => @account)
-      @account.stub!(:new).and_return(@account)
+      @account.stub(:new).and_return(@account)
       @opportunity = FactoryGirl.build(:opportunity, :user => current_user, :access => "Shared")
       @opportunity.permissions << FactoryGirl.create(:permission, :user => he,  :asset => @opportunity)
       @opportunity.permissions << FactoryGirl.create(:permission, :user => she, :asset => @opportunity)
-      @opportunity.stub!(:new).and_return(@opportunity)
+      @opportunity.stub(:new).and_return(@opportunity)
 
       xhr :put, :promote, :id => @lead.id, :access => "Lead", :account => { :name => "Hello", :access => "Lead", :user_id => current_user.id }, :opportunity => { :name => "World", :access => "Lead", :user_id => current_user.id }
       @account.access.should == "Shared"
@@ -809,7 +809,7 @@ describe LeadsController do
       @lead = FactoryGirl.create(:lead, :id => 42, :user => current_user, :status => "new")
       @account = FactoryGirl.create(:account, :id => 123, :user => current_user)
       @contact = FactoryGirl.build(:contact, :first_name => nil) # make it fail
-      Contact.stub!(:new).and_return(@contact)
+      Contact.stub(:new).and_return(@contact)
 
       xhr :put, :promote, :id => 42, :account => { :id => 123 }
       @lead.reload.status.should == "new"