From 329fd76358172cc32531dc7865f9305dec11c3f7 Mon Sep 17 00:00:00 2001
From: Larissa Reis <larissa@colivre.coop.br>
Date: Wed, 28 Oct 2015 18:15:49 -0300
Subject: [PATCH] blog: fixes duplication of blog image cover in blog page

---
 app/views/content_viewer/view_page.html.erb       |  2 +-
 test/functional/content_viewer_controller_test.rb | 10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/app/views/content_viewer/view_page.html.erb b/app/views/content_viewer/view_page.html.erb
index abb37a3..f089768 100644
--- a/app/views/content_viewer/view_page.html.erb
+++ b/app/views/content_viewer/view_page.html.erb
@@ -31,7 +31,7 @@
 <% cache(@page.cache_key(params, user, language)) do %>
   <div class="<%="article-body article-body-" + @page.css_class_name %>">
     <% options = @page.image? ? {:gallery_view => true} : {} %>
-    <% if @page.image.present? && !@page.event? %>
+    <% if @page.image.present? && !@page.event? && !@page.blog? %>
       <div class="article-body-img">
         <%= image_tag(@page.image.public_filename) %>
         <p><%= @page.image.label%></p>
diff --git a/test/functional/content_viewer_controller_test.rb b/test/functional/content_viewer_controller_test.rb
index d1b76e9..503db20 100644
--- a/test/functional/content_viewer_controller_test.rb
+++ b/test/functional/content_viewer_controller_test.rb
@@ -1616,4 +1616,14 @@ class ContentViewerControllerTest < ActionController::TestCase
      page.reload
      assert_equal 1, page.hits
   end
+
+  should 'show blog image only inside blog cover' do
+    blog = create(Blog, :profile_id => profile.id, :name=>'testblog', :image_builder => { :uploaded_data => fixture_file_upload('/files/rails.png', 'image/png')})
+    blog.save!
+    get :view_page, :profile => profile.identifier, :page => [blog.path]
+
+    assert_select '.blog-cover > img', 1
+    assert_select '.article-body-img > img', 0
+  end
+
 end
--
libgit2 0.21.2