Fix for #240, selects with optgroups not working

lefthandedgoat · Mar 12, 2016 · 47d8cad · 47d8cad
1 parent 80d31c8
commit 47d8cad
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 3 deletions.
diff --git a/docs/files/testpages/index.html b/docs/files/testpages/index.html
@@ -177,6 +177,19 @@ <h1 id="welcome">Welcome</h1>
 	<br>
 	<label>I've got an apostrophe</label>	
 
+	<br>
+	<br>
+	<select id="test-select">
+	  <optgroup label="Swedish Cars">
+		<option value="volvo">Volvo</option>
+		<option value="saab">Saab</option>
+	  </optgroup>
+	  <optgroup label="German Cars">
+		<option value="mercedes">Mercedes</option>
+		<option value="audi">Audi</option>
+	  </optgroup>
+	</select>
+
     <script type="text/javascript">
         $(document).ready(function () {
             setTimeout(function () { $("#ajax").html("ajax loaded"); }, 2000)

diff --git a/src/canopy/canopy.fs b/src/canopy/canopy.fs
@@ -302,9 +302,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"]""" text text) elem            
         else //to preserve previous behaviour
-            unreliableElementsWithin (sprintf """option[text()="%s"]""" text) elem
+            unreliableElementsWithin (sprintf """//option[text()="%s"]""" 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
@@ -445,6 +445,11 @@ context "other tests"
     !^ testpage
     "#states" << "95"
     "#states" == "Palmyra Atoll"
+
+"writting (selecting) to drop down test, value list, opt group" &&& fun _ ->
+    !^ testpage
+    "#test-select" << "Audi"
+    "#test-select" == "Audi"
 
 "double clicking" &&& fun _ ->
     !^ "http://lefthandedgoat.github.io/canopy/testpages/doubleClick"
@@ -486,7 +491,7 @@ context "other tests"
 
 "count test via sizzle" &&& fun _ ->
     !^ testpage
-    count "option:selected" 2
+    count "option:selected" 3
 
 "#firstName should have John (using == infix operator), iframe1" &&& fun _ ->
     url "http://lefthandedgoat.github.io/canopy/testpages/iframe1"