Download as
Browse Code »

Commit 43535f4f3124024ac3895dd28331bda3d033ccc7

Authored by Rodrigo Souto
1 parent 764f2771
Exists in master and in 28 other branches 1.2+SPB2, 2_split_by_role, add_fields_in_api, api_fixies, api_pagination, api_private_token, api_tasks, article_hit_count, blog_page_bug, checkbox_to_user_can_edit_page, communities_ratings, communities_ratings_moderation, community_ratings_rebase, fix_cloned_article_parent, fix_gallery_image_url, fix_javascript_categories, fix_optional_fields, fix_suggest_article, fix_user_email_validation, highlight_block_fix, notification_plugin, notification_plugin_rebase, script_to_update, split_by_role, stable, temp_ratings, tests, tests_fixies

boxes-helper: add params to context passed to the block

Showing 2 changed files with 8 additions and 5 deletions   Show diff stats
app/helpers/boxes_helper.rb
  Diff comments   View file @43535f4
@@ -65,7 +65,7 @@ module BoxesHelper @@ -65,7 +65,7 @@ module BoxesHelper
65 end 65 end
66 66
67 def display_box_content(box, main_content) 67 def display_box_content(box, main_content)
68 - context = { :article => @page, :request_path => request.path, :locale => locale } 68 + context = { :article => @page, :request_path => request.path, :locale => locale, :params => request.params }
69 box_decorator.select_blocks(box.blocks.includes(:box), context).map { |item| display_block(item, main_content) }.join("\n") + box_decorator.block_target(box) 69 box_decorator.select_blocks(box.blocks.includes(:box), context).map { |item| display_block(item, main_content) }.join("\n") + box_decorator.block_target(box)
70 end 70 end
71 71
test/unit/boxes_helper_test.rb
  Diff comments   View file @43535f4
@@ -41,6 +41,7 @@ class BoxesHelperTest < ActiveSupport::TestCase @@ -41,6 +41,7 @@ class BoxesHelperTest < ActiveSupport::TestCase
41 p = create_user_with_blocks 41 p = create_user_with_blocks
42 request = mock() 42 request = mock()
43 request.expects(:path).returns(nil) 43 request.expects(:path).returns(nil)
  44 + request.expects(:params).returns({})
44 45
45 46
46 b = p.blocks.select{|bk| !bk.kind_of?(MainBlock) }[0] 47 b = p.blocks.select{|bk| !bk.kind_of?(MainBlock) }[0]
@@ -49,7 +50,7 @@ class BoxesHelperTest < ActiveSupport::TestCase @@ -49,7 +50,7 @@ class BoxesHelperTest < ActiveSupport::TestCase
49 box.blocks = [b] 50 box.blocks = [b]
50 box.save! 51 box.save!
51 expects(:display_block).with(b, '') 52 expects(:display_block).with(b, '')
52 - expects(:request).returns(request) 53 + stubs(:request).returns(request)
53 stubs(:block_target).returns('') 54 stubs(:block_target).returns('')
54 expects(:locale).returns('en') 55 expects(:locale).returns('en')
55 with_box_decorator self do 56 with_box_decorator self do
@@ -61,6 +62,7 @@ class BoxesHelperTest < ActiveSupport::TestCase @@ -61,6 +62,7 @@ class BoxesHelperTest < ActiveSupport::TestCase
61 p = create_user_with_blocks 62 p = create_user_with_blocks
62 request = mock() 63 request = mock()
63 request.expects(:path).returns(nil) 64 request.expects(:path).returns(nil)
  65 + request.expects(:params).returns({})
64 66
65 b = p.blocks.select{|bk| !bk.kind_of?(MainBlock) }[0] 67 b = p.blocks.select{|bk| !bk.kind_of?(MainBlock) }[0]
66 b.display = 'never'; b.save! 68 b.display = 'never'; b.save!
@@ -68,7 +70,7 @@ class BoxesHelperTest < ActiveSupport::TestCase @@ -68,7 +70,7 @@ class BoxesHelperTest < ActiveSupport::TestCase
68 box.blocks = [b] 70 box.blocks = [b]
69 box.save! 71 box.save!
70 expects(:display_block).with(b, '').never 72 expects(:display_block).with(b, '').never
71 - expects(:request).returns(request) 73 + stubs(:request).returns(request)
72 stubs(:block_target).returns('') 74 stubs(:block_target).returns('')
73 expects(:locale).returns('en') 75 expects(:locale).returns('en')
74 display_box_content(box, '') 76 display_box_content(box, '')
@@ -105,9 +107,10 @@ class BoxesHelperTest < ActiveSupport::TestCase @@ -105,9 +107,10 @@ class BoxesHelperTest < ActiveSupport::TestCase
105 request = mock() 107 request = mock()
106 box = Box.create!(:owner => fast_create(Profile)) 108 box = Box.create!(:owner => fast_create(Profile))
107 request.expects(:path).returns('/') 109 request.expects(:path).returns('/')
108 - expects(:request).returns(request) 110 + request.expects(:params).returns({})
  111 + stubs(:request).returns(request)
109 expects(:locale).returns('en') 112 expects(:locale).returns('en')
110 - box_decorator.expects(:select_blocks).with([], {:article => nil, :request_path => '/', :locale => 'en'}).returns([]) 113 + box_decorator.expects(:select_blocks).with([], {:article => nil, :request_path => '/', :locale => 'en', :params => {}}).returns([])
111 114
112 display_box_content(box, '') 115 display_box_content(box, '')
113 end 116 end