Fix #253 multiple dropdowns on the same page with same values

lefthandedgoat · Mar 27, 2016 · 5bfc001 · 5bfc001
1 parent de41b3b
commit 5bfc001
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 2 deletions.
diff --git a/docs/files/testpages/selectOptions.html b/docs/files/testpages/selectOptions.html
@@ -0,0 +1,18 @@
+<!DOCTYPE html>
+<html>
+<body>
+
+<select id="test-select">
+    <option value="r">Red</option>
+    <option value="g">Green</option>
+    <option value="b">Blue</option>
+</select>
+<br />
+<select id="test-select2">
+    <option value="r">Red</option>
+    <option value="g">Green</option>
+    <option value="b">Blue</option>
+</select>
+
+</body>
+</html>
diff --git a/src/canopy/canopy.fs b/src/canopy/canopy.fs
@@ -287,9 +287,9 @@ let last cssSelector = (List.rev (elements cssSelector)).Head
 let private writeToSelect (elem:IWebElement) (text:string) =
     let options =        
         if writeToSelectWithOptionValue then 
-            unreliableElementsWithin (sprintf """//option[text()="%s"] | //option[@value="%s"]""" text text) elem            
+            unreliableElementsWithin (sprintf """option[text()="%s"] | option[@value="%s"] | optgroup/option[text()="%s"] | optgroup/option[@value="%s"]""" text text text text) elem            
         else //to preserve previous behaviour
-            unreliableElementsWithin (sprintf """//option[text()="%s"]""" text) elem
+            unreliableElementsWithin (sprintf """option[text()="%s"] | optgroup/option[text()="%s"]""" text text) elem
 
     match options with
     | [] -> raise (CanopyOptionNotFoundException(sprintf "element %s does not contain value %s" (elem.ToString()) text))

diff --git a/tests/basictests/Program.fs b/tests/basictests/Program.fs
@@ -451,6 +451,13 @@ context "other tests"
     "#states" << "95"
     "#states" == "Palmyra Atoll"
 
+"writting (selecting) to drop down test, two selects same value" &&& fun _ ->
+    !^ "http://lefthandedgoat.github.io/canopy/testpages/selectOptions"
+    "#test-select" << "g"
+    "#test-select2" << "b"
+    "#test-select" == "Green"
+    "#test-select2" == "Blue"
+
 "writting (selecting) to drop down test, value list, opt group" &&& fun _ ->
     !^ testpage
     "#test-select" << "Audi"