Merge branch 'master' into staging

Leandro Santos
2 parents 3068e477 7b24dc08
Showing 2 changed files with 8 additions and 1 deletions Show diff stats
app/views/blocks/raw_html.html.erb
test/unit/raw_html_block_test.rb
 <%= block_title(block.title, block.subtitle) %>
  
-<%= block.html.html_safe %>
+<%= (block.html || '').html_safe %>
@@ -40,4 +40,11 @@ class RawHTMLBlockTest &lt; ActiveSupport::TestCase
     assert block.editable?(user)
   end
  
+  should 'not raise if there is no html defined' do
+    block = RawHTMLBlock.new(:html => nil)
+    assert_nothing_raised do
+      render_block_content(block)
+    end
+  end
+
 end
1	1	<%= block_title(block.title, block.subtitle) %>
2	2
3		-<%= block.html.html_safe %>
	3	+<%= (block.html \|\| '').html_safe %>
...	...
...	...	@@ -40,4 +40,11 @@ class RawHTMLBlockTest < ActiveSupport::TestCase
40	40	assert block.editable?(user)
41	41	end
42	42
	43	+ should 'not raise if there is no html defined' do
	44	+ block = RawHTMLBlock.new(:html => nil)
	45	+ assert_nothing_raised do
	46	+ render_block_content(block)
	47	+ end
	48	+ end
	49	+
43	50	end
...	...