From 95798878570d13ec5e2179ec61d1146065e13984 Mon Sep 17 00:00:00 2001 From: John Bintz Date: Thu, 4 Jul 2013 08:43:03 -0400 Subject: [PATCH] small fixes --- lib/semantic_rails_view_helpers/capybara.rb | 2 +- lib/semantic_rails_view_helpers/view_helpers.rb | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/lib/semantic_rails_view_helpers/capybara.rb b/lib/semantic_rails_view_helpers/capybara.rb index 54fb82f..c546848 100644 --- a/lib/semantic_rails_view_helpers/capybara.rb +++ b/lib/semantic_rails_view_helpers/capybara.rb @@ -182,7 +182,7 @@ def within_any(search, &block) nodes.each_with_index do |node, index| begin - within("#{search}:nth-child(#{index + 1})", &block) + within(node, &block) return true rescue RSpec::Expectations::ExpectationNotMetError, Capybara::ElementNotFound => e exceptions << e diff --git a/lib/semantic_rails_view_helpers/view_helpers.rb b/lib/semantic_rails_view_helpers/view_helpers.rb index bfed2f4..d9981fa 100644 --- a/lib/semantic_rails_view_helpers/view_helpers.rb +++ b/lib/semantic_rails_view_helpers/view_helpers.rb @@ -21,7 +21,9 @@ module SemanticRailsViewHelpers options = args.pop end - link_to t(".#{route}"), send("#{route}_path", *args), semantic_link_data(route).merge(options) + label = options.delete(:label) || t(".#{route}") + + link_to label, send("#{route}_path", *args), semantic_link_data(route).merge(options) end def link_to_collection(route, options = {})