From 70d40ab534163196c225ab27289b34a7b865b416 Mon Sep 17 00:00:00 2001 From: Thiago Ribeiro Date: Wed, 30 Sep 2015 14:23:54 -0300 Subject: [PATCH] Fix image address in highlightBlock when in subdir --- app/views/blocks/highlights.html.erb | 2 +- test/unit/highlights_block_test.rb | 13 +++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/app/views/blocks/highlights.html.erb b/app/views/blocks/highlights.html.erb index 678f453..8ae96ff 100644 --- a/app/views/blocks/highlights.html.erb +++ b/app/views/blocks/highlights.html.erb @@ -4,7 +4,7 @@
<% block.featured_images.each do |img| %> - <%= content_tag :img, nil, :src => img[:image_src], :alt => img[:title] %> + <%= image_tag [Noosfero.root, img[:image_src]].join, alt: img[:title] %>

<%= img[:title] %>

<% end %> diff --git a/test/unit/highlights_block_test.rb b/test/unit/highlights_block_test.rb index b4a411a..533ec7d 100644 --- a/test/unit/highlights_block_test.rb +++ b/test/unit/highlights_block_test.rb @@ -132,6 +132,19 @@ class HighlightsBlockTest < ActiveSupport::TestCase assert_equal block.images.first[:address], "/social/address" end + should 'display images with subdir src' do + Noosfero.stubs(:root).returns("/social") + f1 = mock() + f1.expects(:public_filename).returns('/img_address') + UploadedFile.expects(:find).with(1).returns(f1) + block = HighlightsBlock.new + i1 = {:image_id => 1, :address => '/address'} + block.images = [i1] + block.save! + + assert_tag_in_string instance_eval(& block.content), :tag => 'img', :attributes => { :src => "/social/img_address" } + end + [Environment, Profile].each do |klass| should "choose between owner galleries when owner is #{klass.name}" do owner = fast_create(klass) -- libgit2 0.21.2