From 43535f4f3124024ac3895dd28331bda3d033ccc7 Mon Sep 17 00:00:00 2001 From: Rodrigo Souto Date: Wed, 22 Jan 2014 20:04:18 +0000 Subject: [PATCH] boxes-helper: add params to context passed to the block --- app/helpers/boxes_helper.rb | 2 +- test/unit/boxes_helper_test.rb | 11 +++++++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/app/helpers/boxes_helper.rb b/app/helpers/boxes_helper.rb index b668e4f..b4222ee 100644 --- a/app/helpers/boxes_helper.rb +++ b/app/helpers/boxes_helper.rb @@ -65,7 +65,7 @@ module BoxesHelper end def display_box_content(box, main_content) - context = { :article => @page, :request_path => request.path, :locale => locale } + context = { :article => @page, :request_path => request.path, :locale => locale, :params => request.params } box_decorator.select_blocks(box.blocks.includes(:box), context).map { |item| display_block(item, main_content) }.join("\n") + box_decorator.block_target(box) end diff --git a/test/unit/boxes_helper_test.rb b/test/unit/boxes_helper_test.rb index 9998e1e..62307f2 100644 --- a/test/unit/boxes_helper_test.rb +++ b/test/unit/boxes_helper_test.rb @@ -41,6 +41,7 @@ class BoxesHelperTest < ActiveSupport::TestCase p = create_user_with_blocks request = mock() request.expects(:path).returns(nil) + request.expects(:params).returns({}) b = p.blocks.select{|bk| !bk.kind_of?(MainBlock) }[0] @@ -49,7 +50,7 @@ class BoxesHelperTest < ActiveSupport::TestCase box.blocks = [b] box.save! expects(:display_block).with(b, '') - expects(:request).returns(request) + stubs(:request).returns(request) stubs(:block_target).returns('') expects(:locale).returns('en') with_box_decorator self do @@ -61,6 +62,7 @@ class BoxesHelperTest < ActiveSupport::TestCase p = create_user_with_blocks request = mock() request.expects(:path).returns(nil) + request.expects(:params).returns({}) b = p.blocks.select{|bk| !bk.kind_of?(MainBlock) }[0] b.display = 'never'; b.save! @@ -68,7 +70,7 @@ class BoxesHelperTest < ActiveSupport::TestCase box.blocks = [b] box.save! expects(:display_block).with(b, '').never - expects(:request).returns(request) + stubs(:request).returns(request) stubs(:block_target).returns('') expects(:locale).returns('en') display_box_content(box, '') @@ -105,9 +107,10 @@ class BoxesHelperTest < ActiveSupport::TestCase request = mock() box = Box.create!(:owner => fast_create(Profile)) request.expects(:path).returns('/') - expects(:request).returns(request) + request.expects(:params).returns({}) + stubs(:request).returns(request) expects(:locale).returns('en') - box_decorator.expects(:select_blocks).with([], {:article => nil, :request_path => '/', :locale => 'en'}).returns([]) + box_decorator.expects(:select_blocks).with([], {:article => nil, :request_path => '/', :locale => 'en', :params => {}}).returns([]) display_box_content(box, '') end -- libgit2 0.21.2