From a162ccff02711813a78768d01dfc89c79024a103 Mon Sep 17 00:00:00 2001 From: Rodrigo Souto Date: Tue, 7 May 2013 16:17:23 -0300 Subject: [PATCH] Fixing html_safe and only starting server on tests run --- app/helpers/search_helper.rb | 2 +- plugins/solr/test/test_solr_helper.rb | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/helpers/search_helper.rb b/app/helpers/search_helper.rb index aa9eb5a..1f1114e 100644 --- a/app/helpers/search_helper.rb +++ b/app/helpers/search_helper.rb @@ -95,7 +95,7 @@ module SearchHelper map_link = display?(asset, :map) ? (display == 'map' ? _('Map') : link_to(_('Map'), params.merge(:display => 'map'))) : nil full_link = display?(asset, :full) ? (display == 'full' ? _('Full') : link_to(_('Full'), params.merge(:display => 'full'))) : nil content_tag('div', - content_tag('strong', _('Display')) + ': ' + [compact_link, map_link, full_link].compact.join(' | '), + content_tag('strong', _('Display')) + ': ' + [compact_link, map_link, full_link].compact.join(' | ').html_safe, :class => 'search-customize-options' ) end diff --git a/plugins/solr/test/test_solr_helper.rb b/plugins/solr/test/test_solr_helper.rb index ce992ac..19c496c 100644 --- a/plugins/solr/test/test_solr_helper.rb +++ b/plugins/solr/test/test_solr_helper.rb @@ -2,7 +2,7 @@ # FIXME Not working properly... if not $test_helper_loaded abort unless system 'rake -s solr:start' - at_exit { system 'rake -s solr:stop' } +# at_exit { system 'rake -s solr:stop' } $test_helper_loaded = true end -- libgit2 0.21.2