diff --git a/app/helpers/lightbox_helper.rb b/app/helpers/lightbox_helper.rb index 01f0ea8..1df9cab 100644 --- a/app/helpers/lightbox_helper.rb +++ b/app/helpers/lightbox_helper.rb @@ -8,7 +8,7 @@ module LightboxHelper link_to(text, url, lightbox_options(options)) end - def lightbox_close(text, options = {}) + def lightbox_close_button(text, options = {}) button(:close, text, '#', lightbox_options(options, 'lbAction').merge(:rel => 'deactivate')) end diff --git a/app/views/search/popup.rhtml b/app/views/search/popup.rhtml index 04f9613..30ab9e3 100644 --- a/app/views/search/popup.rhtml +++ b/app/views/search/popup.rhtml @@ -11,7 +11,7 @@
<%= submit_tag(_('Search')) %> - <%= lightbox_close(_('Close')) %> + <%= lightbox_close_button(_('Close')) %>
<% end %> diff --git a/test/unit/lightbox_helper_text.rb b/test/unit/lightbox_helper_text.rb index 5d4b660..10a7097 100644 --- a/test/unit/lightbox_helper_text.rb +++ b/test/unit/lightbox_helper_text.rb @@ -29,13 +29,13 @@ class LightboxHelperTest < Test::Unit::TestCase should 'provide link to close lightbox' do expects(:button).with(:close, 'text', '#', { :class => 'lbAction', :rel => 'deactivate', :id => 'my-id' }).returns('[close-lightbox]') - assert_equal '[close-lightbox]', lightbox_close('text', :id => 'my-id') + assert_equal '[close-lightbox]', lightbox_close_button('text', :id => 'my-id') end - should 'merge existing :class option in lightbox_close' do + should 'merge existing :class option in lightbox_close_button' do expects(:button).with(:close, 'text', '#', { :class => 'lbAction my-class', :rel => 'deactivate', :id => 'my-id' }).returns('[close-lightbox]') - assert_equal '[close-lightbox]', lightbox_close('text', :class => 'my-class', :id => 'my-id' ) + assert_equal '[close-lightbox]', lightbox_close_button('text', :class => 'my-class', :id => 'my-id' ) end should 'provide lightbox_button' do -- libgit2 0.21.2