Merge branch 'master' into staging

Leandro Santos
2 parents 4ad69cb7 6e8cbd35
Showing 2 changed files with 6 additions and 0 deletions Show diff stats
app/views/blocks/tags.html.erb
test/functional/profile_design_controller_test.rb
+<% extend TagsHelper %>
 <%= block_title(block.title, block.subtitle) %>
  
 <%
@@ -716,4 +716,9 @@ class ProfileDesignControllerTest &lt; ActionController::TestCase
     assert_equal assigns(:current_category), c1
   end
  
+  should 'not fail when a profile has a tag block' do
+    a = create(Article, :name => 'my article', :profile_id => holder.id, :tag_list => 'tag')
+    @box1.blocks << TagsBlock.new
+    get :index, :profile => 'designtestuser'
+  end
 end
	1	+<% extend TagsHelper %>
1	2	<%= block_title(block.title, block.subtitle) %>
2	3
3	4	<%
...	...
...	...	@@ -716,4 +716,9 @@ class ProfileDesignControllerTest < ActionController::TestCase
716	716	assert_equal assigns(:current_category), c1
717	717	end
718	718
	719	+ should 'not fail when a profile has a tag block' do
	720	+ a = create(Article, :name => 'my article', :profile_id => holder.id, :tag_list => 'tag')
	721	+ @box1.blocks << TagsBlock.new
	722	+ get :index, :profile => 'designtestuser'
	723	+ end
719	724	end
...	...