[Git][noosfero/noosfero][master] 2 commits: Remove TourBlock#content

[Bráulio Bhavamitra]

Bráulio Bhavamitra pushed to branch master at Noosfero / noosfero


Commits:
ffc2b613 by Rafael Reggiani Manzo at 2016-05-10T09:42:31-03:00
Remove TourBlock#content

This method was in violation of MVC principles and its logic is now
handled by the BoxesHelper.

- - - - -
e1163b1c by Bráulio Bhavamitra at 2016-05-13T22:05:25+00:00
Merge branch 'refactor_site_tour' into 'master'

Remove TourBlock#content

This method was in violation of MVC principles and its logic is now
handled by the BoxesHelper.

See merge request !907
- - - - -


2 changed files:

- plugins/site_tour/lib/site_tour_plugin/tour_block.rb
- plugins/site_tour/test/unit/tour_block_test.rb


Changes:

=====================================
plugins/site_tour/lib/site_tour_plugin/tour_block.rb
=====================================
--- a/plugins/site_tour/lib/site_tour_plugin/tour_block.rb
+++ b/plugins/site_tour/lib/site_tour_plugin/tour_block.rb
@@ -19,11 +19,4 @@ class SiteTourPlugin::TourBlock < Block
     _('Configure a step-by-step tour.')
   end
 
-  def content(args={})
-    block = self
-    proc do
-      render :file => 'blocks/tour', :locals => {:block => block}
-    end
-  end
-
 end


=====================================
plugins/site_tour/test/unit/tour_block_test.rb
=====================================
--- a/plugins/site_tour/test/unit/tour_block_test.rb
+++ b/plugins/site_tour/test/unit/tour_block_test.rb
@@ -3,6 +3,7 @@ require 'test_helper'
 class TrackListBlockTest < ActionView::TestCase
 
   ActionView::Base.send :include, ApplicationHelper
+  include BoxesHelper
 
   def setup
     @block = fast_create(SiteTourPlugin::TourBlock)
@@ -18,24 +19,24 @@ class TrackListBlockTest < ActionView::TestCase
 
   should 'render script tag in visualization mode' do
     controller.expects(:boxes_editor?).returns(false)
-    assert_tag_in_string instance_eval(&block.content), :tag => 'script'
+    assert_tag_in_string render_block_content(block), :tag => 'script'
   end
 
   should 'do not render script tag when editing' do
     controller.expects(:boxes_editor?).returns(true)
     controller.expects(:uses_design_blocks?).returns(true)
-    assert_no_tag_in_string instance_eval(&block.content), :tag => 'script'
+    assert_no_tag_in_string render_block_content(block), :tag => 'script'
   end
 
   should 'display help button' do
     controller.expects(:boxes_editor?).returns(false)
-    assert_tag_in_string instance_eval(&block.content), :tag => 'a', :attributes => {:class => 'button icon-help with-text tour-button'}
+    assert_tag_in_string render_block_content(block), :tag => 'a', :attributes => {:class => 'button icon-help with-text tour-button'}
   end
 
   should 'do not display help button when display_button is false' do
     block.display_button = false
     controller.expects(:boxes_editor?).returns(false)
-    assert_no_tag_in_string instance_eval(&block.content), :tag => 'a', :attributes => {:class => 'button icon-help with-text tour-button'}
+    assert_no_tag_in_string render_block_content(block), :tag => 'a', :attributes => {:class => 'button icon-help with-text tour-button'}
   end
 
 end



View it on GitLab: https://gitlab.com/noosfero/noosfero/compare/8b0cf64aae88ed3a3ad9e2a62ebedf9c54064a49...e1163b1c7be7bc97a04f3529423c1e9b913b52aa
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listas.softwarelivre.org/pipermail/noosfero-dev/attachments/20160513/28946b3b/attachment-0001.html>