diff --git a/plugins/context_content/lib/context_content_plugin/context_content_block.rb b/plugins/context_content/lib/context_content_plugin/context_content_block.rb
index 154223a..47298e7 100644
--- a/plugins/context_content/lib/context_content_plugin/context_content_block.rb
+++ b/plugins/context_content/lib/context_content_plugin/context_content_block.rb
@@ -58,33 +58,6 @@ class ContextContentPlugin::ContextContentBlock < Block
     contents.first.parent.name
   end
 
-  def footer
-    block = self
-    proc do
-      contents = block.contents(@page)
-      if contents
-        content_tag('div',
-          render(:partial => 'blocks/more', :locals => {:block => block, :contents => contents, :article_id => @page.id}), :id => "context_content_more_#{block.id}", :class => "more_button")
-      else
-        ''
-      end
-    end
-  end
-
-  def content(args={})
-    block = self
-    ret = proc do
-      contents = block.contents(@page)
-      parent_title = block.parent_title(contents)
-      if contents.present?
-        render(:file => 'blocks/context_content', :locals => {:block => block, :contents => contents, :parent_title => parent_title})
-      else
-        ''
-      end
-    end
-    ret
-  end
-
   def cacheable?
     false
   end
diff --git a/plugins/context_content/test/unit/context_content_block_test.rb b/plugins/context_content/test/unit/context_content_block_test.rb
index 4c585f2..54cc4f9 100644
--- a/plugins/context_content/test/unit/context_content_block_test.rb
+++ b/plugins/context_content/test/unit/context_content_block_test.rb
@@ -20,17 +20,6 @@ class ContextContentBlockTest < ActiveSupport::TestCase
     assert_equal nil, @block.contents(nil)
   end
 
-  should 'render nothing if it has no content to show' do
-    assert_equal '', instance_eval(&@block.content)
-  end
-
-  should 'render context content block view' do
-    @page = fast_create(Folder)
-    article = fast_create(TinyMceArticle, :parent_id => @page.id)
-    expects(:render).with(:file => 'blocks/context_content', :locals => {:block => @block, :contents => [article], :parent_title => @page.name})
-    instance_eval(&@block.content)
-  end
-
   should 'return children of page' do
     folder = fast_create(Folder)
     article = fast_create(TinyMceArticle, :parent_id => folder.id)
@@ -166,3 +155,33 @@ class ContextContentBlockTest < ActiveSupport::TestCase
   end
 
 end
+
+require 'boxes_helper'
+
+class ContextContentBlockViewTest < ActionView::TestCase
+  include BoxesHelper
+
+  def setup
+    Noosfero::Plugin::Manager.any_instance.stubs(:enabled_plugins).returns([])
+    @block = ContextContentPlugin::ContextContentBlock.create!
+    @block.types = ['TinyMceArticle']
+  end
+
+  should 'render nothing if it has no content to show' do
+    assert_equal "\n", render_block_content(@block)
+  end
+
+  should 'render context content block view' do
+    @page = fast_create(Folder)
+    article = fast_create(TinyMceArticle, :parent_id => @page.id)
+    contents = [article]
+    @block.use_parent_title = true
+
+    article.expects(:view_url).returns('http://test.noosfero.plugins')
+    @block.expects(:contents).with(@page).returns(contents)
+    @block.expects(:parent_title).with(contents).returns(@page.name)
+    ActionView::Base.any_instance.expects(:block_title).returns(@page.name, @block.subtitle)
+
+    render_block_content(@block)
+  end
+end
diff --git a/plugins/context_content/views/blocks/context_content.html.erb b/plugins/context_content/views/blocks/context_content.html.erb
index 6b86435..3cc2c86 100644
--- a/plugins/context_content/views/blocks/context_content.html.erb
+++ b/plugins/context_content/views/blocks/context_content.html.erb
@@ -1,23 +1,26 @@
 <% extend ContextContentBlockHelper %>
 
-<% if block.use_parent_title %>
-  <%= block_title(parent_title, block.subtitle) %>
-<% else %>
-  <%= block_title(block.title, block.subtitle) %>
-<% end %>
-
-<div class='contents' id='<%="context_content_#{block.id}"%>'>
-  <% contents.each do |content| %>
-    <% content = FilePresenter.for(content) %>
-    <span class="item">
-      <a href="<%= url_for(content.view_url) %>">
-        <div class="image">
-          <%= content_image(content) if block.show_image %>
-        </div>
-        <% if block.show_name %>
-          <div class="name"><%= content.name %></div>
-        <% end %>
-      </a>
-    </span>
+<% contents = block.contents(@page)
+   unless contents.blank? %>
+  <% if block.use_parent_title %>
+    <%= block_title(block.parent_title(contents), block.subtitle) %>
+  <% else %>
+    <%= block_title(block.title, block.subtitle) %>
   <% end %>
-</div>
+
+  <div class='contents' id='<%="context_content_#{block.id}"%>'>
+    <% contents.each do |content| %>
+      <% content = FilePresenter.for(content) %>
+      <span class="item">
+        <a href="<%= url_for(content.view_url) %>">
+          <div class="image">
+            <%= content_image(content) if block.show_image %>
+          </div>
+          <% if block.show_name %>
+            <div class="name"><%= content.name %></div>
+          <% end %>
+        </a>
+      </span>
+    <% end %>
+  </div>
+<% end %>
--
libgit2 0.21.2