From 2ada0f11cd2149158c1928dcd81c3531cc1d7229 Mon Sep 17 00:00:00 2001
From: Adam McCrea <adam@edgecase.com>
Date: Mon, 5 Sep 2011 12:14:10 -0400
Subject: [PATCH] Show that the selector API works with any number of arguments
 to xpath

---
 lib/capybara/selector.rb | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/lib/capybara/selector.rb b/lib/capybara/selector.rb
index 394381c4..6688f621 100644
--- a/lib/capybara/selector.rb
+++ b/lib/capybara/selector.rb
@@ -84,7 +84,7 @@ module Capybara
 end
 
 Capybara.add_selector(:xpath) do
-  xpath { |xpath, options| xpath }
+  xpath { |xpath| xpath }
 end
 
 Capybara.add_selector(:css) do
@@ -92,20 +92,20 @@ Capybara.add_selector(:css) do
 end
 
 Capybara.add_selector(:id) do
-  xpath { |id, options| XPath.descendant[XPath.attr(:id) == id.to_s] }
+  xpath { |id| XPath.descendant[XPath.attr(:id) == id.to_s] }
   match { |value| value.is_a?(Symbol) }
 end
 
 Capybara.add_selector(:field) do
-  xpath { |locator, options| XPath::HTML.field(locator) }
+  xpath { |locator| XPath::HTML.field(locator) }
 end
 
 Capybara.add_selector(:fieldset) do
-  xpath { |locator, options| XPath::HTML.fieldset(locator) }
+  xpath { |locator| XPath::HTML.fieldset(locator) }
 end
 
 Capybara.add_selector(:link_or_button) do
-  xpath { |locator, options| XPath::HTML.link_or_button(locator) }
+  xpath { |locator| XPath::HTML.link_or_button(locator) }
   failure_message { |node, selector| "no link or button '#{selector.locator}' found" }
 end
 
@@ -115,7 +115,7 @@ Capybara.add_selector(:link) do
 end
 
 Capybara.add_selector(:button) do
-  xpath { |locator, options| XPath::HTML.button(locator) }
+  xpath { |locator| XPath::HTML.button(locator) }
   failure_message { |node, selector| "no button with value or id or text '#{selector.locator}' found" }
 end
 
@@ -140,7 +140,7 @@ Capybara.add_selector(:select) do
 end
 
 Capybara.add_selector(:option) do
-  xpath { |locator, options| XPath::HTML.option(locator) }
+  xpath { |locator| XPath::HTML.option(locator) }
   failure_message do |node, selector|
     "no option with text '#{selector.locator}'".tap do |message|
       message << " in the select box" if node.tag_name == 'select'
@@ -154,7 +154,7 @@ Capybara.add_selector(:file_field) do
 end
 
 Capybara.add_selector(:content) do
-  xpath { |content, options| XPath::HTML.content(content) }
+  xpath { |content| XPath::HTML.content(content) }
 end
 
 Capybara.add_selector(:table) do