From 4daaccb7429387db142194f15e939ecdf848bcaa Mon Sep 17 00:00:00 2001 From: Yuki Nishijima Date: Sat, 2 Jan 2016 09:00:25 +0000 Subject: [PATCH] Prefer `helper.params[...] = ...` over `helper.request.assign_parameters(...)` Use of #assign_parameters makes the spec unnecessarily complex since it's a low level API and behaves differently on Rails 5.0. --- spec/helpers/tags_spec.rb | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/spec/helpers/tags_spec.rb b/spec/helpers/tags_spec.rb index 0231668..8b12728 100644 --- a/spec/helpers/tags_spec.rb +++ b/spec/helpers/tags_spec.rb @@ -4,10 +4,9 @@ include Kaminari::Helpers describe 'Kaminari::Helpers' do describe 'Tag' do describe '#page_url_for', :if => defined?(Rails) do - if ActionPack::VERSION::STRING > '5' - before { helper.request.assign_parameters(_routes, "users", "index", {}, '', []) } - else - before { helper.request.assign_parameters(_routes, "users", "index") } + before do + helper.params[:controller] = 'users' + helper.params[:action] = 'index' end context "for first page" do @@ -22,10 +21,10 @@ describe 'Kaminari::Helpers' do end context "with a friendly route setting" do - if ActionPack::VERSION::STRING > '5' - before { helper.request.assign_parameters(_routes, "addresses", "index", {:page => 3}, '', []) } - else - before { helper.request.assign_parameters(_routes, "addresses", "index", :page => 3) } + before do + helper.params[:controller] = 'addresses' + helper.params[:action] = 'index' + helper.params[:page] = 3 end context "for first page" do