Fix options with quotes under selenium

sikachu · Apr 26, 2010 · 8a7ecba · 8a7ecba
1 parent cbb42a1
commit 8a7ecba
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/lib/capybara/driver/selenium_driver.rb b/lib/capybara/driver/selenium_driver.rb
@@ -36,7 +36,7 @@ def set(value)
     end
 
     def select(option)
-      option_node = node.find_element(:xpath, ".//option[text()='#{option}']") || node.find_element(:xpath, ".//option[contains(.,'#{option}')]")
+      option_node = node.find_element(:xpath, ".//option[text()=#{Capybara::XPath.escape(option)}]") || node.find_element(:xpath, ".//option[contains(.,#{Capybara::XPath.escape(option)})]")
       option_node.select
     rescue 
       options = node.find_elements(:xpath, "//option").map { |o| "'#{o.text}'" }.join(', ')
@@ -49,7 +49,7 @@ def unselect(option)
       end
 
       begin
-        option_node = node.find_element(:xpath, ".//option[text()='#{option}']") || node.find_element(:xpath, ".//option[contains(.,'#{option}')]")
+        option_node = node.find_element(:xpath, ".//option[text()=#{Capybara::XPath.escape(option)}]") || node.find_element(:xpath, ".//option[contains(.,#{Capybara::XPath.escape(option)})]")
         option_node.clear
       rescue
         options = node.find_elements(:xpath, "//option").map { |o| "'#{o.text}'" }.join(', ')