Skip to content
This repository has been archived by the owner on Nov 9, 2017. It is now read-only.

Commit

Permalink
Use element-like to account for loosening of API for webdriver-logic
Browse files Browse the repository at this point in the history
  • Loading branch information
semperos committed Aug 16, 2012
1 parent 3fcee94 commit 6cffc32
Showing 1 changed file with 13 additions and 13 deletions.
26 changes: 13 additions & 13 deletions src/clj_webdriver/taxi.clj
@@ -1,6 +1,6 @@
;; The faster way to use clj-webdriver: take a taxi ;; The faster way to use clj-webdriver: take a taxi
(ns clj-webdriver.taxi (ns clj-webdriver.taxi
(:use [clj-webdriver.element :only [element?]] (:use [clj-webdriver.element :only [element-like?]]
[clj-webdriver.driver :only [driver?]]) [clj-webdriver.driver :only [driver?]])
(:require [clj-webdriver.core :as core] (:require [clj-webdriver.core :as core]
[clj-webdriver.util :as util] [clj-webdriver.util :as util]
Expand Down Expand Up @@ -73,7 +73,7 @@
;; you get the idea.) ;; you get the idea.)
;; ;;
(set-finder! (fn [q] (set-finder! (fn [q]
(if (element? q) (if (element-like? q)
q q
(css-finder (str \"div#container \" q))))) (css-finder (str \"div#container \" q)))))
Expand All @@ -86,7 +86,7 @@
;; {:css \"query\"} or {:xpath \"query\"} instead of just a string. ;; {:css \"query\"} or {:xpath \"query\"} instead of just a string.
;; ;;
(set-finder! (fn [q] (set-finder! (fn [q]
(if (element? q) (if (element-like? q)
q q
(case (first (keys q)) (case (first (keys q))
:css (core/find-elements-by *driver* (by-css (first (values q)))) :css (core/find-elements-by *driver* (by-css (first (values q))))
Expand Down Expand Up @@ -161,9 +161,9 @@
([q] (css-finder *driver* q)) ([q] (css-finder *driver* q))
([driver q] ([driver q]
(cond (cond
(element? q) q (element-like? q) q
(map? q) (core/find-elements driver q) (map? q) (core/find-elements driver q)
:else (core/find-elements driver {:css q})))) :else (core/find-elements driver {:css q}))))


(set-finder! css-finder) (set-finder! css-finder)


Expand All @@ -174,9 +174,9 @@
([q] (xpath-finder *driver* q)) ([q] (xpath-finder *driver* q))
([driver q] ([driver q]
(cond (cond
(element? q) q (element-like? q) q
(map? q) (core/find-elements driver q) (map? q) (core/find-elements driver q)
:else (core/find-elements driver {:xpath q})))) :else (core/find-elements driver {:xpath q}))))


;; Be able to get actual element/elements when needed ;; Be able to get actual element/elements when needed
(defn element (defn element
Expand Down Expand Up @@ -205,7 +205,7 @@
submit)" submit)"
([q] (element *driver* q)) ([q] (element *driver* q))
([driver q] ([driver q]
(if (element? q) (if (element-like? q)
q q
(first (*finder-fn* driver q))))) (first (*finder-fn* driver q)))))


Expand All @@ -223,7 +223,7 @@
(def target-elements (elements \"a\"))" (def target-elements (elements \"a\"))"
([q] (elements *driver* q)) ([q] (elements *driver* q))
([driver q] ([driver q]
(if (element? q) (if (element-like? q)
q q
(*finder-fn* driver q)))) (*finder-fn* driver q))))


Expand Down Expand Up @@ -846,7 +846,7 @@
;; ;;
(find-elements-under \"div#container\" (core/by-id \"foo\")" (find-elements-under \"div#container\" (core/by-id \"foo\")"
[q-parent attr-val] [q-parent attr-val]
(if (element? q-parent) (if (element-like? q-parent)
(core/find-elements q-parent attr-val) (core/find-elements q-parent attr-val)
(core/find-elements (element q-parent) attr-val))) (core/find-elements (element q-parent) attr-val)))


Expand All @@ -868,7 +868,7 @@
;; ;;
(find-element-under \"div#container\" (core/by-id \"foo\")" (find-element-under \"div#container\" (core/by-id \"foo\")"
[q-parent attr-val] [q-parent attr-val]
(if (element? q-parent) (if (element-like? q-parent)
(core/find-element q-parent attr-val) (core/find-element q-parent attr-val)
(core/find-element (element q-parent) attr-val))) (core/find-element (element q-parent) attr-val)))


Expand Down

0 comments on commit 6cffc32

Please sign in to comment.