Make select-related functions return Element records instead of raw J…

…ava WebElement objects
semperos · Feb 8, 2012 · daad6d8 · daad6d8
1 parent 1be62ba
commit daad6d8
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/src/clj_webdriver/core_element.clj b/src/clj_webdriver/core_element.clj
@@ -141,12 +141,12 @@
   ;; TODO: test coverage
   (all-options [element]
     (let [select-list (Select. (:webelement element))]
-      (lazy-seq (.getOptions select-list))))
+      (lazy-seq (init-elements (.getOptions select-list)))))
 
   ;; TODO: test coverage
   (all-selected-options [element]
     (let [select-list (Select. (:webelement element))]
-      (lazy-seq (.getAllSelectedOptions select-list))))
+      (lazy-seq (init-elements (.getAllSelectedOptions select-list)))))
 
   ;; TODO: test coverage
   (deselect-option [element attr-val]
@@ -188,7 +188,7 @@
   ;; TODO: test coverage
   (first-selected-option [element]
     (let [select-list (Select. (:webelement element))]
-      (.getFirstSelectedOption select-list)))
+      (init-element (.getFirstSelectedOption select-list))))
 
   ;; TODO: test coverage
   (multiple? [element]

diff --git a/src/clj_webdriver/element.clj b/src/clj_webdriver/element.clj
@@ -7,6 +7,12 @@
   ([] (Element. nil))
   ([webelement] (Element. webelement)))
 
+(defn init-elements
+  "Given WebElement objects, batch initialize elements (for things like returning all options for select lists)"
+  [webelements]
+  (for [webel webelements]
+    (init-element webel)))
+
 (defn is-element?
   "Return true if parameter is an Element record"
   [element]