fat_free_crm 0.15.0.beta.2 → 0.15.0

data/spec/controllers/entities/campaigns_controller_spec.rb

@@ -51,14 +51,14 @@ describe CampaignsController do
       get :index
       # Note: can't compare campaigns directly because of BigDecimal objects.
       expect(assigns[:campaigns].size).to eq(2)
-      expect(assigns[:campaigns].map(&:status).sort).to eq(%w(planned started))
+      expect(assigns[:campaigns].map(&:status).sort).to eq(%w[planned started])
     end
 
     it "should perform lookup using query string" do
       @first  = FactoryGirl.create(:campaign, user: current_user, name: "Hello, world!")
       @second = FactoryGirl.create(:campaign, user: current_user, name: "Hello again")
 
-      get :index, query: "again"
+      get :index, params: { query: "again" }
       expect(assigns[:campaigns]).to eq([@second])
       expect(assigns[:current_query]).to eq("again")
       expect(session[:campaigns_current_query]).to eq("again")
@@ -67,7 +67,7 @@ describe CampaignsController do
     describe "AJAX pagination" do
       it "should pick up page number from params" do
         @campaigns = [FactoryGirl.create(:campaign, user: current_user)]
-        xhr :get, :index, page: 42
+        get :index, params: { page: 42 }, xhr: true
 
         expect(assigns[:current_page].to_i).to eq(42)
         expect(assigns[:campaigns]).to eq([]) # page #42 should be empty if there's only one campaign ;-)
@@ -78,7 +78,7 @@ describe CampaignsController do
       it "should pick up saved page number from session" do
         session[:campaigns_current_page] = 42
         @campaigns = [FactoryGirl.create(:campaign, user: current_user)]
-        xhr :get, :index
+        get :index, xhr: true
 
         expect(assigns[:current_page]).to eq(42)
         expect(assigns[:campaigns]).to eq([])
@@ -89,7 +89,7 @@ describe CampaignsController do
         session[:campaigns_current_page] = 42
         session[:campaigns_current_query] = "bill"
         @campaigns = [FactoryGirl.create(:campaign, user: current_user)]
-        xhr :get, :index
+        get :index, xhr: true
 
         expect(assigns[:current_page]).to eq(1)
         expect(assigns[:campaigns]).to eq(@campaigns)
@@ -132,7 +132,7 @@ describe CampaignsController do
       end
 
       it "should expose the requested campaign as @campaign and render [show] template" do
-        get :show, id: 42
+        get :show, params: { id: 42 }
         expect(assigns[:campaign]).to eq(@campaign)
         expect(assigns[:stage]).to eq(@stage)
         expect(assigns[:comment].attributes).to eq(@comment.attributes)
@@ -140,7 +140,7 @@ describe CampaignsController do
       end
 
       it "should update an activity when viewing the campaign" do
-        get :show, id: @campaign.id
+        get :show, params: { id: @campaign.id }
         expect(@campaign.versions.last.event).to eq('view')
       end
     end
@@ -152,7 +152,7 @@ describe CampaignsController do
         expect(@campaign).to receive(:to_json).and_return("generated JSON")
 
         request.env["HTTP_ACCEPT"] = "application/json"
-        get :show, id: 42
+        get :show, params: { id: 42 }
         expect(response.body).to eq("generated JSON")
       end
     end
@@ -164,7 +164,7 @@ describe CampaignsController do
         expect(@campaign).to receive(:to_xml).and_return("generated XML")
 
         request.env["HTTP_ACCEPT"] = "application/xml"
-        get :show, id: 42
+        get :show, params: { id: 42 }
         expect(response.body).to eq("generated XML")
       end
     end
@@ -174,7 +174,7 @@ describe CampaignsController do
         @campaign = FactoryGirl.create(:campaign, user: current_user)
         @campaign.destroy
 
-        get :show, id: @campaign.id
+        get :show, params: { id: @campaign.id }
         expect(flash[:warning]).not_to eq(nil)
         expect(response).to redirect_to(campaigns_path)
       end
@@ -182,7 +182,7 @@ describe CampaignsController do
       it "should redirect to campaign index if the campaign is protected" do
         @campaign = FactoryGirl.create(:campaign, user: FactoryGirl.create(:user), access: "Private")
 
-        get :show, id: @campaign.id
+        get :show, params: { id: @campaign.id }
         expect(flash[:warning]).not_to eq(nil)
         expect(response).to redirect_to(campaigns_path)
       end
@@ -192,7 +192,7 @@ describe CampaignsController do
         @campaign.destroy
         request.env["HTTP_ACCEPT"] = "application/json"
 
-        get :show, id: @campaign.id
+        get :show, params: { id: @campaign.id }
         expect(response.code).to eq("404") # :not_found
       end
 
@@ -201,7 +201,7 @@ describe CampaignsController do
         @campaign.destroy
         request.env["HTTP_ACCEPT"] = "application/xml"
 
-        get :show, id: @campaign.id
+        get :show, params: { id: @campaign.id }
         expect(response.code).to eq("404") # :not_found
       end
     end
@@ -214,7 +214,7 @@ describe CampaignsController do
     it "should expose a new campaign as @campaign" do
       @campaign = Campaign.new(user: current_user,
                                access: Setting.default_access)
-      xhr :get, :new
+      get :new, xhr: true
       expect(assigns[:campaign].attributes).to eq(@campaign.attributes)
       expect(response).to render_template("campaigns/new")
     end
@@ -222,7 +222,7 @@ describe CampaignsController do
     it "should create related object when necessary" do
       @lead = FactoryGirl.create(:lead, id: 42)
 
-      xhr :get, :new, related: "lead_42"
+      get :new, params: { related: "lead_42" }, xhr: true
       expect(assigns[:lead]).to eq(@lead)
     end
   end
@@ -233,7 +233,7 @@ describe CampaignsController do
     it "should expose the requested campaign as @campaign and render [edit] template" do
       @campaign = FactoryGirl.create(:campaign, id: 42, user: current_user)
 
-      xhr :get, :edit, id: 42
+      get :edit, params: { id: 42 }, xhr: true
       expect(assigns[:campaign]).to eq(@campaign)
       expect(response).to render_template("campaigns/edit")
     end
@@ -242,7 +242,7 @@ describe CampaignsController do
       @campaign = FactoryGirl.create(:campaign, id: 42)
       @previous = FactoryGirl.create(:campaign, id: 99)
 
-      xhr :get, :edit, id: 42, previous: 99
+      get :edit, params: { id: 42, previous: 99 }, xhr: true
       expect(assigns[:campaign]).to eq(@campaign)
       expect(assigns[:previous]).to eq(@previous)
     end
@@ -252,7 +252,7 @@ describe CampaignsController do
         @campaign = FactoryGirl.create(:campaign, user: current_user)
         @campaign.destroy
 
-        xhr :get, :edit, id: @campaign.id
+        get :edit, params: { id: @campaign.id }, xhr: true
         expect(flash[:warning]).not_to eq(nil)
         expect(response.body).to eq("window.location.reload();")
       end
@@ -260,7 +260,7 @@ describe CampaignsController do
       it "should reload current page with the flash message if the campaign is protected" do
         @private = FactoryGirl.create(:campaign, user: FactoryGirl.create(:user), access: "Private")
 
-        xhr :get, :edit, id: @private.id
+        get :edit, params: { id: @private.id }, xhr: true
         expect(flash[:warning]).not_to eq(nil)
         expect(response.body).to eq("window.location.reload();")
       end
@@ -275,7 +275,7 @@ describe CampaignsController do
       it "should notify the view if previous campaign got deleted" do
         @previous.destroy
 
-        xhr :get, :edit, id: @campaign.id, previous: @previous.id
+        get :edit, params: { id: @campaign.id, previous: @previous.id }, xhr: true
         expect(flash[:warning]).to eq(nil) # no warning, just silently remove the div
         expect(assigns[:previous]).to eq(@previous.id)
         expect(response).to render_template("campaigns/edit")
@@ -284,7 +284,7 @@ describe CampaignsController do
       it "should notify the view if previous campaign got protected" do
         @previous.update_attribute(:access, "Private")
 
-        xhr :get, :edit, id: @campaign.id, previous: @previous.id
+        get :edit, params: { id: @campaign.id, previous: @previous.id }, xhr: true
         expect(flash[:warning]).to eq(nil)
         expect(assigns[:previous]).to eq(@previous.id)
         expect(response).to render_template("campaigns/edit")
@@ -301,7 +301,7 @@ describe CampaignsController do
         @campaign = FactoryGirl.build(:campaign, name: "Hello", user: current_user)
         allow(Campaign).to receive(:new).and_return(@campaign)
 
-        xhr :post, :create, campaign: { name: "Hello" }
+        post :create, params: { campaign: { name: "Hello" } }, xhr: true
         expect(assigns(:campaign)).to eq(@campaign)
         expect(response).to render_template("campaigns/create")
       end
@@ -310,7 +310,7 @@ describe CampaignsController do
         @campaign = FactoryGirl.build(:campaign, name: "Hello", user: current_user)
         allow(Campaign).to receive(:new).and_return(@campaign)
 
-        xhr :post, :create, campaign: { name: "Hello" }
+        post :create, params: { campaign: { name: "Hello" } }, xhr: true
         expect(assigns[:campaign_status_total]).to be_instance_of(HashWithIndifferentAccess)
       end
 
@@ -318,7 +318,7 @@ describe CampaignsController do
         @campaign = FactoryGirl.build(:campaign, user: current_user)
         allow(Campaign).to receive(:new).and_return(@campaign)
 
-        xhr :post, :create, campaign: { name: "Hello" }
+        post :create, params: { campaign: { name: "Hello" } }, xhr: true
         expect(assigns[:campaigns]).to eq([@campaign])
       end
 
@@ -326,7 +326,7 @@ describe CampaignsController do
         @campaign = FactoryGirl.build(:campaign, name: "Hello world", user: current_user)
         allow(Campaign).to receive(:new).and_return(@campaign)
 
-        xhr :post, :create, campaign: { name: "Hello world" }, comment_body: "Awesome comment is awesome"
+        post :create, params: { campaign: { name: "Hello world" }, comment_body: "Awesome comment is awesome" }, xhr: true
         expect(@campaign.reload.comments.map(&:comment)).to include("Awesome comment is awesome")
       end
     end
@@ -336,7 +336,7 @@ describe CampaignsController do
         @campaign = FactoryGirl.build(:campaign, id: nil, name: nil, user: current_user)
         allow(Campaign).to receive(:new).and_return(@campaign)
 
-        xhr :post, :create, campaign: {}
+        post :create, params: { campaign: {} }, xhr: true
         expect(assigns(:campaign)).to eq(@campaign)
         expect(response).to render_template("campaigns/create")
       end
@@ -351,7 +351,7 @@ describe CampaignsController do
       it "should update the requested campaign and render [update] template" do
         @campaign = FactoryGirl.create(:campaign, id: 42, name: "Bye")
 
-        xhr :put, :update, id: 42, campaign: { name: "Hello" }
+        put :update, params: { id: 42, campaign: { name: "Hello" } }, xhr: true
         expect(@campaign.reload.name).to eq("Hello")
         expect(assigns(:campaign)).to eq(@campaign)
         expect(response).to render_template("campaigns/update")
@@ -361,7 +361,7 @@ describe CampaignsController do
         @campaign = FactoryGirl.create(:campaign, id: 42)
         request.env["HTTP_REFERER"] = "http://localhost/campaigns"
 
-        xhr :put, :update, id: 42, campaign: { name: "Hello" }
+        put :update, params: { id: 42, campaign: { name: "Hello" } }, xhr: true
         expect(assigns(:campaign)).to eq(@campaign)
         expect(assigns[:campaign_status_total]).to be_instance_of(HashWithIndifferentAccess)
       end
@@ -371,7 +371,7 @@ describe CampaignsController do
         he  = FactoryGirl.create(:user, id: 7)
         she = FactoryGirl.create(:user, id: 8)
 
-        xhr :put, :update, id: 42, campaign: { name: "Hello", access: "Shared", user_ids: %w(7 8) }
+        put :update, params: { id: 42, campaign: { name: "Hello", access: "Shared", user_ids: %w[7 8] } }, xhr: true
         expect(assigns[:campaign].access).to eq("Shared")
         expect(assigns[:campaign].user_ids.sort).to eq([he.id, she.id])
       end
@@ -381,7 +381,7 @@ describe CampaignsController do
           @campaign = FactoryGirl.create(:campaign, user: current_user)
           @campaign.destroy
 
-          xhr :put, :update, id: @campaign.id
+          put :update, params: { id: @campaign.id }, xhr: true
           expect(flash[:warning]).not_to eq(nil)
           expect(response.body).to eq("window.location.reload();")
         end
@@ -389,7 +389,7 @@ describe CampaignsController do
         it "should reload current page with the flash message if the campaign is protected" do
           @private = FactoryGirl.create(:campaign, user: FactoryGirl.create(:user), access: "Private")
 
-          xhr :put, :update, id: @private.id
+          put :update, params: { id: @private.id }, xhr: true
           expect(flash[:warning]).not_to eq(nil)
           expect(response.body).to eq("window.location.reload();")
         end
@@ -400,7 +400,7 @@ describe CampaignsController do
       it "should not update the requested campaign, but still expose it as @campaign and still render [update] template" do
         @campaign = FactoryGirl.create(:campaign, id: 42, name: "Hello", user: current_user)
 
-        xhr :put, :update, id: 42, campaign: { name: nil }
+        put :update, params: { id: 42, campaign: { name: nil } }, xhr: true
         expect(@campaign.reload.name).to eq("Hello")
         expect(assigns(:campaign)).to eq(@campaign)
         expect(response).to render_template("campaigns/update")
@@ -419,7 +419,7 @@ describe CampaignsController do
     describe "AJAX request" do
       it "should destroy the requested campaign and render [destroy] template" do
         @another_campaign = FactoryGirl.create(:campaign, user: current_user)
-        xhr :delete, :destroy, id: @campaign.id
+        delete :destroy, params: { id: @campaign.id }, xhr: true
 
         expect(assigns[:campaigns]).to eq([@another_campaign])
         expect { Campaign.find(@campaign.id) }.to raise_error(ActiveRecord::RecordNotFound)
@@ -427,7 +427,7 @@ describe CampaignsController do
       end
 
       it "should get data for campaigns sidebar" do
-        xhr :delete, :destroy, id: @campaign.id
+        delete :destroy, params: { id: @campaign.id }, xhr: true
 
         expect(assigns[:campaign_status_total]).to be_instance_of(HashWithIndifferentAccess)
       end
@@ -435,7 +435,7 @@ describe CampaignsController do
       it "should try previous page and render index action if current page has no campaigns" do
         session[:campaigns_current_page] = 42
 
-        xhr :delete, :destroy, id: @campaign.id
+        delete :destroy, params: { id: @campaign.id }, xhr: true
         expect(session[:campaigns_current_page]).to eq(41)
         expect(response).to render_template("campaigns/index")
       end
@@ -443,7 +443,7 @@ describe CampaignsController do
       it "should render index action when deleting last campaign" do
         session[:campaigns_current_page] = 1
 
-        xhr :delete, :destroy, id: @campaign.id
+        delete :destroy, params: { id: @campaign.id }, xhr: true
         expect(session[:campaigns_current_page]).to eq(1)
         expect(response).to render_template("campaigns/index")
       end
@@ -453,7 +453,7 @@ describe CampaignsController do
           @campaign = FactoryGirl.create(:campaign, user: current_user)
           @campaign.destroy
 
-          xhr :delete, :destroy, id: @campaign.id
+          delete :destroy, params: { id: @campaign.id }, xhr: true
           expect(flash[:warning]).not_to eq(nil)
           expect(response.body).to eq("window.location.reload();")
         end
@@ -461,7 +461,7 @@ describe CampaignsController do
         it "should reload current page with the flash message if the campaign is protected" do
           @private = FactoryGirl.create(:campaign, user: FactoryGirl.create(:user), access: "Private")
 
-          xhr :delete, :destroy, id: @private.id
+          delete :destroy, params: { id: @private.id }, xhr: true
           expect(flash[:warning]).not_to eq(nil)
           expect(response.body).to eq("window.location.reload();")
         end
@@ -470,7 +470,7 @@ describe CampaignsController do
 
     describe "HTML request" do
       it "should redirect to Campaigns index when a campaign gets deleted from its landing page" do
-        delete :destroy, id: @campaign.id
+        delete :destroy, params: { id: @campaign.id }
 
         expect(flash[:notice]).not_to eq(nil)
         expect(response).to redirect_to(campaigns_path)
@@ -480,7 +480,7 @@ describe CampaignsController do
         @campaign = FactoryGirl.create(:campaign, user: current_user)
         @campaign.destroy
 
-        delete :destroy, id: @campaign.id
+        delete :destroy, params: { id: @campaign.id }
         expect(flash[:warning]).not_to eq(nil)
         expect(response).to redirect_to(campaigns_path)
       end
@@ -488,7 +488,7 @@ describe CampaignsController do
       it "should redirect to campaign index with the flash message if the campaign is protected" do
         @private = FactoryGirl.create(:campaign, user: FactoryGirl.create(:user), access: "Private")
 
-        delete :destroy, id: @private.id
+        delete :destroy, params: { id: @private.id }
         expect(flash[:warning]).not_to eq(nil)
         expect(response).to redirect_to(campaigns_path)
       end
@@ -598,14 +598,14 @@ describe CampaignsController do
   #----------------------------------------------------------------------------
   describe "responding to GET redraw" do
     it "should save user selected campaign preference" do
-      xhr :get, :redraw, per_page: 42, view: "brief", sort_by: "name"
+      get :redraw, params: { per_page: 42, view: "brief", sort_by: "name" }, xhr: true
       expect(current_user.preference[:campaigns_per_page]).to eq("42")
       expect(current_user.preference[:campaigns_index_view]).to eq("brief")
       expect(current_user.preference[:campaigns_sort_by]).to eq("campaigns.name ASC")
     end
 
     it "should reset current page to 1" do
-      xhr :get, :redraw, per_page: 42, view: "brief", sort_by: "name"
+      get :redraw, params: { per_page: 42, view: "brief", sort_by: "name" }, xhr: true
       expect(session[:campaigns_current_page]).to eq(1)
     end
 
@@ -615,7 +615,7 @@ describe CampaignsController do
         FactoryGirl.create(:campaign, name: "B", user: current_user)
       ]
 
-      xhr :get, :redraw, per_page: 1, sort_by: "name"
+      get :redraw, params: { per_page: 1, sort_by: "name" }, xhr: true
       expect(assigns(:campaigns)).to eq([@campaigns.first])
       expect(response).to render_template("campaigns/index")
     end
@@ -628,14 +628,14 @@ describe CampaignsController do
       session[:campaigns_filter] = "planned,started"
       @campaigns = [FactoryGirl.create(:campaign, status: "completed", user: current_user)]
 
-      xhr :post, :filter, status: "completed"
+      post :filter, params: { status: "completed" }, xhr: true
       expect(assigns(:campaigns)).to eq(@campaigns)
       expect(response).to render_template("campaigns/index")
     end
 
     it "should reset current page to 1" do
       @campaigns = []
-      xhr :post, :filter, status: "completed"
+      post :filter, params: { status: "completed" }, xhr: true
 
       expect(session[:campaigns_current_page]).to eq(1)
     end

data/spec/controllers/entities/contacts_controller_spec.rb

@@ -27,7 +27,7 @@ describe ContactsController do
       @billy_bones   = FactoryGirl.create(:contact, user: current_user, first_name: "Billy",   last_name: "Bones")
       @captain_flint = FactoryGirl.create(:contact, user: current_user, first_name: "Captain", last_name: "Flint")
 
-      get :index, query: @billy_bones.email
+      get :index, params: { query: @billy_bones.email }
       expect(assigns[:contacts]).to eq([@billy_bones])
       expect(assigns[:current_query]).to eq(@billy_bones.email)
       expect(session[:contacts_current_query]).to eq(@billy_bones.email)
@@ -36,7 +36,7 @@ describe ContactsController do
     describe "AJAX pagination" do
       it "should pick up page number from params" do
         @contacts = [FactoryGirl.create(:contact, user: current_user)]
-        xhr :get, :index, page: 42
+        get :index, params: { page: 42 }, xhr: true
 
         expect(assigns[:current_page].to_i).to eq(42)
         expect(assigns[:contacts]).to eq([]) # page #42 should be empty if there's only one contact ;-)
@@ -47,7 +47,7 @@ describe ContactsController do
       it "should pick up saved page number from session" do
         session[:contacts_current_page] = 42
         @contacts = [FactoryGirl.create(:contact, user: current_user)]
-        xhr :get, :index
+        get :index, xhr: true
 
         expect(assigns[:current_page]).to eq(42)
         expect(assigns[:contacts]).to eq([])
@@ -58,7 +58,7 @@ describe ContactsController do
         session[:contacts_current_page] = 42
         session[:contacts_current_query] = "bill"
         @contacts = [FactoryGirl.create(:contact, user: current_user)]
-        xhr :get, :index
+        get :index, xhr: true
 
         expect(assigns[:current_page]).to eq(1)
         expect(assigns[:contacts]).to eq(@contacts)
@@ -101,7 +101,7 @@ describe ContactsController do
       end
 
       it "should expose the requested contact as @contact" do
-        get :show, id: 42
+        get :show, params: { id: 42 }
         expect(assigns[:contact]).to eq(@contact)
         expect(assigns[:stage]).to eq(@stage)
         expect(assigns[:comment].attributes).to eq(@comment.attributes)
@@ -109,7 +109,7 @@ describe ContactsController do
       end
 
       it "should update an activity when viewing the contact" do
-        get :show, id: @contact.id
+        get :show, params: { id: @contact.id }
         expect(@contact.versions.last.event).to eq('view')
       end
     end
@@ -121,7 +121,7 @@ describe ContactsController do
         expect(@contact).to receive(:to_json).and_return("generated JSON")
 
         request.env["HTTP_ACCEPT"] = "application/json"
-        get :show, id: 42
+        get :show, params: { id: 42 }
         expect(response.body).to eq("generated JSON")
       end
     end
@@ -133,7 +133,7 @@ describe ContactsController do
         expect(@contact).to receive(:to_xml).and_return("generated XML")
 
         request.env["HTTP_ACCEPT"] = "application/xml"
-        get :show, id: 42
+        get :show, params: { id: 42 }
         expect(response.body).to eq("generated XML")
       end
     end
@@ -143,7 +143,7 @@ describe ContactsController do
         @contact = FactoryGirl.create(:contact, user: current_user)
         @contact.destroy
 
-        get :show, id: @contact.id
+        get :show, params: { id: @contact.id }
         expect(flash[:warning]).not_to eq(nil)
         expect(response).to redirect_to(contacts_path)
       end
@@ -151,7 +151,7 @@ describe ContactsController do
       it "should redirect to contact index if the contact is protected" do
         @private = FactoryGirl.create(:contact, user: FactoryGirl.create(:user), access: "Private")
 
-        get :show, id: @private.id
+        get :show, params: { id: @private.id }
         expect(flash[:warning]).not_to eq(nil)
         expect(response).to redirect_to(contacts_path)
       end
@@ -161,7 +161,7 @@ describe ContactsController do
         @contact.destroy
         request.env["HTTP_ACCEPT"] = "application/xml"
 
-        get :show, id: @contact.id
+        get :show, params: { id: @contact.id }
         expect(response.code).to eq("404") # :not_found
       end
     end
@@ -177,7 +177,7 @@ describe ContactsController do
       @account = Account.new(user: current_user)
       @accounts = [FactoryGirl.create(:account, user: current_user)]
 
-      xhr :get, :new
+      get :new, xhr: true
       expect(assigns[:contact].attributes).to eq(@contact.attributes)
       expect(assigns[:account].attributes).to eq(@account.attributes)
       expect(assigns[:accounts]).to eq(@accounts)
@@ -188,7 +188,7 @@ describe ContactsController do
     it "should created an instance of related object when necessary" do
       @opportunity = FactoryGirl.create(:opportunity)
 
-      xhr :get, :new, related: "opportunity_#{@opportunity.id}"
+      get :new, params: { related: "opportunity_#{@opportunity.id}" }, xhr: true
       expect(assigns[:opportunity]).to eq(@opportunity)
     end
 
@@ -197,7 +197,7 @@ describe ContactsController do
         @account = FactoryGirl.create(:account)
         @account.destroy
 
-        xhr :get, :new, related: "account_#{@account.id}"
+        get :new, params: { related: "account_#{@account.id}" }, xhr: true
         expect(flash[:warning]).not_to eq(nil)
         expect(response.body).to eq('window.location.href = "/accounts";')
       end
@@ -205,7 +205,7 @@ describe ContactsController do
       it "should redirect to parent asset's index page with the message if parent asset got protected" do
         @account = FactoryGirl.create(:account, access: "Private")
 
-        xhr :get, :new, related: "account_#{@account.id}"
+        get :new, params: { related: "account_#{@account.id}" }, xhr: true
         expect(flash[:warning]).not_to eq(nil)
         expect(response.body).to eq('window.location.href = "/accounts";')
       end
@@ -221,12 +221,12 @@ describe ContactsController do
       end
 
       it "should return with an existing tag name" do
-        xhr :get, :field_group, tag: @tag.name
+        get :field_group, params: { tag: @tag.name }, xhr: true
         assigns[:tag].name == @tag.name
       end
 
       it "should have the same count of tags" do
-        xhr :get, :field_group, tag:  @tag.name
+        get :field_group, params: { tag:  @tag.name }, xhr: true
         expect(Tag.count).to equal(1)
       end
     end
@@ -234,13 +234,13 @@ describe ContactsController do
     context "without an existing tag" do
       it "should not find a tag" do
         tag_name = "New-Tag"
-        xhr :get, :field_group, tag: tag_name
+        get :field_group, params: { tag: tag_name }, xhr: true
         expect(assigns[:tag]).to eql(nil)
       end
 
       it "should have the same count of tags" do
         tag_name = "New-Tag-1"
-        xhr :get, :field_group, tag: tag_name
+        get :field_group, params: { tag: tag_name }, xhr: true
         expect(Tag.count).to equal(0)
       end
     end
@@ -253,7 +253,7 @@ describe ContactsController do
       @contact = FactoryGirl.create(:contact, id: 42, user: current_user, lead: nil)
       @account = Account.new(user: current_user)
 
-      xhr :get, :edit, id: 42
+      get :edit, params: { id: 42 }, xhr: true
       expect(assigns[:contact]).to eq(@contact)
       expect(assigns[:account].attributes).to eq(@account.attributes)
       expect(assigns[:previous]).to eq(nil)
@@ -265,7 +265,7 @@ describe ContactsController do
       @contact = FactoryGirl.create(:contact, id: 42, user: current_user, lead: nil)
       FactoryGirl.create(:account_contact, account: @account, contact: @contact)
 
-      xhr :get, :edit, id: 42
+      get :edit, params: { id: 42 }, xhr: true
       expect(assigns[:contact]).to eq(@contact)
       expect(assigns[:account]).to eq(@account)
     end
@@ -274,7 +274,7 @@ describe ContactsController do
       @contact = FactoryGirl.create(:contact, id: 42)
       @previous = FactoryGirl.create(:contact, id: 1992)
 
-      xhr :get, :edit, id: 42, previous: 1992
+      get :edit, params: { id: 42, previous: 1992 }, xhr: true
       expect(assigns[:previous]).to eq(@previous)
     end
 
@@ -283,7 +283,7 @@ describe ContactsController do
         @contact = FactoryGirl.create(:contact, user: current_user)
         @contact.destroy
 
-        xhr :get, :edit, id: @contact.id
+        get :edit, params: { id: @contact.id }, xhr: true
         expect(flash[:warning]).not_to eq(nil)
         expect(response.body).to eq("window.location.reload();")
       end
@@ -291,7 +291,7 @@ describe ContactsController do
       it "should reload current page with the flash message if the contact is protected" do
         @private = FactoryGirl.create(:contact, user: FactoryGirl.create(:user), access: "Private")
 
-        xhr :get, :edit, id: @private.id
+        get :edit, params: { id: @private.id }, xhr: true
         expect(flash[:warning]).not_to eq(nil)
         expect(response.body).to eq("window.location.reload();")
       end
@@ -306,7 +306,7 @@ describe ContactsController do
       it "should notify the view if previous contact got deleted" do
         @previous.destroy
 
-        xhr :get, :edit, id: @contact.id, previous: @previous.id
+        get :edit, params: { id: @contact.id, previous: @previous.id }, xhr: true
         expect(flash[:warning]).to eq(nil)
         expect(assigns[:previous]).to eq(@previous.id)
         expect(response).to render_template("contacts/edit")
@@ -315,7 +315,7 @@ describe ContactsController do
       it "should notify the view if previous contact got protected" do
         @previous.update_attribute(:access, "Private")
 
-        xhr :get, :edit, id: @contact.id, previous: @previous.id
+        get :edit, params: { id: @contact.id, previous: @previous.id }, xhr: true
         expect(flash[:warning]).to eq(nil)
         expect(assigns[:previous]).to eq(@previous.id)
         expect(response).to render_template("contacts/edit")
@@ -332,7 +332,7 @@ describe ContactsController do
         @contact = FactoryGirl.build(:contact, first_name: "Billy", last_name: "Bones")
         allow(Contact).to receive(:new).and_return(@contact)
 
-        xhr :post, :create, contact: { first_name: "Billy", last_name: "Bones" }, account: { name: "Hello world" }
+        post :create, params: { contact: { first_name: "Billy", last_name: "Bones" }, account: { name: "Hello world" } }, xhr: true
         expect(assigns(:contact)).to eq(@contact)
         expect(assigns(:contact).reload.account.name).to eq("Hello world")
         expect(response).to render_template("contacts/create")
@@ -343,7 +343,7 @@ describe ContactsController do
         @contact = FactoryGirl.build(:contact)
         allow(Contact).to receive(:new).and_return(@contact)
 
-        xhr :post, :create, contact: { first_name: "Billy" }, account: {}, opportunity: 987
+        post :create, params: { contact: { first_name: "Billy" }, account: {}, opportunity: 987 }, xhr: true
         expect(assigns(:contact).opportunities).to include(@opportunity)
         expect(response).to render_template("contacts/create")
       end
@@ -353,7 +353,7 @@ describe ContactsController do
         allow(Contact).to receive(:new).and_return(@contact)
 
         request.env["HTTP_REFERER"] = "http://localhost/contacts"
-        xhr :post, :create, contact: { first_name: "Billy", last_name: "Bones" }, account: {}
+        post :create, params: { contact: { first_name: "Billy", last_name: "Bones" }, account: {} }, xhr: true
         expect(assigns[:contacts]).to eq([@contact])
       end
 
@@ -361,7 +361,7 @@ describe ContactsController do
         @contact = FactoryGirl.build(:contact, user: current_user)
         allow(Contact).to receive(:new).and_return(@contact)
 
-        xhr :post, :create, contact: { first_name: "Testy", last_name: "McTest" }, account: { name: "Hello world" }, comment_body: "Awesome comment is awesome"
+        post :create, params: { contact: { first_name: "Testy", last_name: "McTest" }, account: { name: "Hello world" }, comment_body: "Awesome comment is awesome" }, xhr: true
         expect(assigns[:contact].comments.map(&:comment)).to include("Awesome comment is awesome")
       end
     end
@@ -377,7 +377,7 @@ describe ContactsController do
         @account = FactoryGirl.create(:account, id: 42, user: current_user)
 
         # This redraws [create] form with blank account.
-        xhr :post, :create, contact: {}, account: { id: 42, user_id: current_user.id }
+        post :create, params: { contact: {}, account: { id: 42, user_id: current_user.id } }, xhr: true
         expect(assigns(:contact)).to eq(@contact)
         expect(assigns(:account)).to eq(@account)
         expect(assigns(:accounts)).to eq([@account])
@@ -389,7 +389,7 @@ describe ContactsController do
         @account = FactoryGirl.create(:account, id: 123, user: current_user)
 
         request.env["HTTP_REFERER"] = "http://localhost/accounts/123"
-        xhr :post, :create, contact: { first_name: nil }, account: { name: nil, user_id: current_user.id }
+        post :create, params: { contact: { first_name: nil }, account: { name: nil, user_id: current_user.id } }, xhr: true
         expect(assigns(:contact)).to eq(@contact)
         expect(assigns(:account)).to eq(@account)
         expect(assigns(:accounts)).to eq([@account])
@@ -400,7 +400,7 @@ describe ContactsController do
         @accounts = [FactoryGirl.create(:account, user: current_user)]
         @account = Account.new(user: current_user)
 
-        xhr :post, :create, contact: { first_name: nil }, account: { name: nil, user_id: current_user.id }
+        post :create, params: { contact: { first_name: nil }, account: { name: nil, user_id: current_user.id } }, xhr: true
         expect(assigns(:contact)).to eq(@contact)
         expect(assigns(:account).attributes).to eq(@account.attributes)
         expect(assigns(:accounts)).to eq(@accounts)
@@ -410,7 +410,7 @@ describe ContactsController do
       it "should preserve Opportunity when called from Oppotuunity page" do
         @opportunity = FactoryGirl.create(:opportunity, id: 987)
 
-        xhr :post, :create, contact: {}, account: {}, opportunity: 987
+        post :create, params: { contact: {}, account: {}, opportunity: 987 }, xhr: true
         expect(assigns(:opportunity)).to eq(@opportunity)
         expect(response).to render_template("contacts/create")
       end
@@ -425,7 +425,7 @@ describe ContactsController do
       it "should update the requested contact and render [update] template" do
         @contact = FactoryGirl.create(:contact, id: 42, first_name: "Billy")
 
-        xhr :put, :update, id: 42, contact: { first_name: "Bones" }, account: {}
+        put :update, params: { id: 42, contact: { first_name: "Bones" }, account: {} }, xhr: true
         expect(assigns[:contact].first_name).to eq("Bones")
         expect(assigns[:contact]).to eq(@contact)
         expect(response).to render_template("contacts/update")
@@ -434,7 +434,7 @@ describe ContactsController do
       it "should be able to create a new account and link it to the contact" do
         @contact = FactoryGirl.create(:contact, id: 42, first_name: "Billy")
 
-        xhr :put, :update, id: 42, contact: { first_name: "Bones" }, account: { name: "new account" }
+        put :update, params: { id: 42, contact: { first_name: "Bones" }, account: { name: "new account" } }, xhr: true
         expect(assigns[:contact].first_name).to eq("Bones")
         expect(assigns[:contact].account.name).to eq("new account")
       end
@@ -443,7 +443,7 @@ describe ContactsController do
         @account = FactoryGirl.create(:account, id: 99, name: "Hello world")
         @contact = FactoryGirl.create(:contact, id: 42, first_name: "Billy")
 
-        xhr :put, :update, id: 42, contact: { first_name: "Bones" }, account: { id: 99 }
+        put :update, params: { id: 42, contact: { first_name: "Bones" }, account: { id: 99 } }, xhr: true
         expect(assigns[:contact].first_name).to eq("Bones")
         expect(assigns[:contact].account.id).to eq(99)
       end
@@ -451,7 +451,7 @@ describe ContactsController do
       it "should update contact permissions when sharing with specific users" do
         @contact = FactoryGirl.create(:contact, id: 42, access: "Public")
 
-        xhr :put, :update, id: 42, contact: { first_name: "Hello", access: "Shared", user_ids: [7, 8] }, account: {}
+        put :update, params: { id: 42, contact: { first_name: "Hello", access: "Shared", user_ids: [7, 8] }, account: {} }, xhr: true
         expect(assigns[:contact].access).to eq("Shared")
         expect(assigns[:contact].user_ids.sort).to eq([7, 8])
         expect(assigns[:contact]).to eq(@contact)
@@ -462,7 +462,7 @@ describe ContactsController do
           @contact = FactoryGirl.create(:contact, user: current_user)
           @contact.destroy
 
-          xhr :put, :update, id: @contact.id
+          put :update, params: { id: @contact.id }, xhr: true
           expect(flash[:warning]).not_to eq(nil)
           expect(response.body).to eq("window.location.reload();")
         end
@@ -470,7 +470,7 @@ describe ContactsController do
         it "should reload current page with the flash message if the contact is protected" do
           @private = FactoryGirl.create(:contact, user: FactoryGirl.create(:user), access: "Private")
 
-          xhr :put, :update, id: @private.id
+          put :update, params: { id: @private.id }, xhr: true
           expect(flash[:warning]).not_to eq(nil)
           expect(response.body).to eq("window.location.reload();")
         end
@@ -481,7 +481,7 @@ describe ContactsController do
       it "should not update the contact, but still expose it as @contact and render [update] template" do
         @contact = FactoryGirl.create(:contact, id: 42, user: current_user, first_name: "Billy", lead: nil)
 
-        xhr :put, :update, id: 42, contact: { first_name: nil }, account: {}
+        put :update, params: { id: 42, contact: { first_name: nil }, account: {} }, xhr: true
         expect(assigns[:contact].reload.first_name).to eq("Billy")
         expect(assigns[:contact]).to eq(@contact)
         expect(response).to render_template("contacts/update")
@@ -491,7 +491,7 @@ describe ContactsController do
         @account = FactoryGirl.create(:account, id: 99)
         @contact = FactoryGirl.create(:contact, id: 42, account: @account)
 
-        xhr :put, :update, id: 42, contact: { first_name: nil }, account: { id: 99 }
+        put :update, params: { id: 42, contact: { first_name: nil }, account: { id: 99 } }, xhr: true
         expect(assigns[:account]).to eq(@account)
       end
     end
@@ -507,7 +507,7 @@ describe ContactsController do
 
     describe "AJAX request" do
       it "should destroy the requested contact and render [destroy] template" do
-        xhr :delete, :destroy, id: @contact.id
+        delete :destroy, params: { id: @contact.id }, xhr: true
 
         expect { Contact.find(@contact.id) }.to raise_error(ActiveRecord::RecordNotFound)
         expect(response).to render_template("contacts/destroy")
@@ -520,7 +520,7 @@ describe ContactsController do
 
         it "should try previous page and render index action if current page has no contacts" do
           session[:contacts_current_page] = 42
-          xhr :delete, :destroy, id: @contact.id
+          delete :destroy, params: { id: @contact.id }, xhr: true
 
           expect(session[:contacts_current_page]).to eq(41)
           expect(response).to render_template("contacts/index")
@@ -528,7 +528,7 @@ describe ContactsController do
 
         it "should render index action when deleting last contact" do
           session[:contacts_current_page] = 1
-          xhr :delete, :destroy, id: @contact.id
+          delete :destroy, params: { id: @contact.id }, xhr: true
 
           expect(session[:contacts_current_page]).to eq(1)
           expect(response).to render_template("contacts/index")
@@ -538,7 +538,7 @@ describe ContactsController do
       describe "when called from related asset page page" do
         it "should reset current page to 1" do
           request.env["HTTP_REFERER"] = "http://localhost/accounts/123"
-          xhr :delete, :destroy, id: @contact.id
+          delete :destroy, params: { id: @contact.id }, xhr: true
 
           expect(session[:contacts_current_page]).to eq(1)
           expect(response).to render_template("contacts/destroy")
@@ -550,7 +550,7 @@ describe ContactsController do
           @contact = FactoryGirl.create(:contact, user: current_user)
           @contact.destroy
 
-          xhr :delete, :destroy, id: @contact.id
+          delete :destroy, params: { id: @contact.id }, xhr: true
           expect(flash[:warning]).not_to eq(nil)
           expect(response.body).to eq("window.location.reload();")
         end
@@ -558,7 +558,7 @@ describe ContactsController do
         it "should reload current page with the flash message if the contact is protected" do
           @private = FactoryGirl.create(:contact, user: FactoryGirl.create(:user), access: "Private")
 
-          xhr :delete, :destroy, id: @private.id
+          delete :destroy, params: { id: @private.id }, xhr: true
           expect(flash[:warning]).not_to eq(nil)
           expect(response.body).to eq("window.location.reload();")
         end
@@ -567,7 +567,7 @@ describe ContactsController do
 
     describe "HTML request" do
       it "should redirect to Contacts index when a contact gets deleted from its landing page" do
-        delete :destroy, id: @contact.id
+        delete :destroy, params: { id: @contact.id }
 
         expect(flash[:notice]).not_to eq(nil)
         expect(response).to redirect_to(contacts_path)
@@ -577,7 +577,7 @@ describe ContactsController do
         @contact = FactoryGirl.create(:contact, user: current_user)
         @contact.destroy
 
-        delete :destroy, id: @contact.id
+        delete :destroy, params: { id: @contact.id }
         expect(flash[:warning]).not_to eq(nil)
         expect(response).to redirect_to(contacts_path)
       end
@@ -585,7 +585,7 @@ describe ContactsController do
       it "should redirect to contact index with the flash message if the contact is protected" do
         @private = FactoryGirl.create(:contact, user: FactoryGirl.create(:user), access: "Private")
 
-        delete :destroy, id: @private.id
+        delete :destroy, params: { id: @private.id }
         expect(flash[:warning]).not_to eq(nil)
         expect(response).to redirect_to(contacts_path)
       end
@@ -670,7 +670,7 @@ describe ContactsController do
   #----------------------------------------------------------------------------
   describe "responding to POST redraw" do
     it "should save user selected contact preference" do
-      xhr :get, :redraw, per_page: 42, view: "long", sort_by: "first_name", naming: "after"
+      get :redraw, params: { per_page: 42, view: "long", sort_by: "first_name", naming: "after" }, xhr: true
       expect(current_user.preference[:contacts_per_page].to_i).to eq(42)
       expect(current_user.preference[:contacts_index_view]).to eq("long")
       expect(current_user.preference[:contacts_sort_by]).to eq("contacts.first_name ASC")
@@ -678,13 +678,13 @@ describe ContactsController do
     end
 
     it "should set similar options for Leads" do
-      xhr :get, :redraw, sort_by: "first_name", naming: "after"
+      get :redraw, params: { sort_by: "first_name", naming: "after" }, xhr: true
       expect(current_user.pref[:leads_sort_by]).to eq("leads.first_name ASC")
       expect(current_user.pref[:leads_naming]).to eq("after")
     end
 
     it "should reset current page to 1" do
-      xhr :get, :redraw, per_page: 42, view: "long", sort_by: "first_name", naming: "after"
+      get :redraw, params: { per_page: 42, view: "long", sort_by: "first_name", naming: "after" }, xhr: true
       expect(session[:contacts_current_page]).to eq(1)
     end
 
@@ -694,7 +694,7 @@ describe ContactsController do
         FactoryGirl.create(:contact, first_name: "Bobby", user: current_user)
       ]
 
-      xhr :get, :redraw, per_page: 1, sort_by: "first_name"
+      get :redraw, params: { per_page: 1, sort_by: "first_name" }, xhr: true
       expect(assigns(:contacts)).to eq([@contacts.first])
       expect(response).to render_template("contacts/index")
     end