Clean up test according to previous commit changes

semperos · Oct 26, 2012 · e68335c · e68335c
1 parent 94b071a
commit e68335c
Show file tree

Hide file tree

Showing 3 changed files with 49 additions and 44 deletions.
diff --git a/test/webdriver_logic/test/benchmarks/core.clj b/test/webdriver_logic/test/benchmarks/core.clj
@@ -2,23 +2,26 @@
   (:refer-clojure :exclude [==])
   (:use webdriver-logic.core
         clojure.core.logic
+        [clj-webdriver.core :only [quit start]]
         criterium.core)
   (:require [webdriver-logic.raw :as raw]))
 
 (def ^:dynamic *default-url* "https://github.com")
 
 (defn start-browser
   []
-  (set-driver! {:browser :firefox
-                    :cache-spec {:strategy :basic
-                                 :args [{}]
-                                 :include [ {:xpath "//a"} ]}
-                    }
-               *default-url*))
+  (let [d (start {:browser :chrome
+                  :cache-spec {:strategy :basic
+                               :args [{}]
+                               :include [ {:xpath "//a"} ]}
+                  } *default-url*)]
+    (set-driver! d)
+    (raw/set-driver! d))
+  )
 
 (defn quit-browser
   []
-  (clj-webdriver.core/quit webdriver-logic.state/*driver*))
+  (quit *driver*))
 
 ;; ## Benchmarks ##
 ;;

diff --git a/test/webdriver_logic/test/core.clj b/test/webdriver_logic/test/core.clj
@@ -1,6 +1,7 @@
 (ns webdriver-logic.test.core
   (:refer-clojure :exclude [==])
-  (:use [webdriver-logic.core]
+  (:use webdriver-logic.core
+        webdriver-logic.test
         [webdriver-logic.test.util :only [start-server test-base-url]]
         [clojure.core.logic :exclude [is]]
         [clojure.test])

diff --git a/test/webdriver_logic/test/raw.clj b/test/webdriver_logic/test/raw.clj
@@ -1,45 +1,46 @@
 (ns webdriver-logic.test.raw
   (:refer-clojure :exclude [==])
-  (:use [webdriver-logic.raw]
-        [webdriver-logic.test.util :only [start-server]]
-        [clojure.core.logic :exclude [is]]
-        clojure.test)
+  (:use clojure.test
+        webdriver-logic.test
+        webdriver-logic.raw
+        [webdriver-logic.test.util :only [start-server test-base-url]]
+        [clojure.core.logic :exclude [is]])
   (:require [clj-webdriver.core :as wd]
             [webdriver-logic.test.example-app.core :as web-app]))
 
 ;; ## Setup ##
-;; (def driver (wd/new-driver {:browser :firefox}))
-;; (set-driver! driver)
-
-;; ;; Fixtures
-;; (defn reset-browser-fixture
-;;   [f]
-;;   (wd/to driver test-base-url)
-;;   (f))
-
-;; (defn quit-browser-fixture
-;;   [f]
-;;   (f)
-;;   (wd/quit driver))
-
-;; (use-fixtures :once start-server quit-browser-fixture)
-;; (use-fixtures :each reset-browser-fixture)
-
-;; (defn go-to-form-page
-;;   []
-;;   (wd/click (wd/find-element driver {:text "example form"})))
-
-;; ;;
-;; ;; ### Test Cases ####
-;; ;;
-;; ;; Yes, these do beg the question.
-;; ;;
-;; ;; Note: `*search-domain*` is rebound often to improve performance.
-;; ;;
-
-;; (deftest test-basic-logic-success
-;;   (s (run* [q]
-;;            (== q true))))
+(def driver (wd/new-driver {:browser :firefox}))
+(set-driver! driver)
+
+;; Fixtures
+(defn reset-browser-fixture
+  [f]
+  (wd/to driver test-base-url)
+  (f))
+
+(defn quit-browser-fixture
+  [f]
+  (f)
+  (wd/quit driver))
+
+(use-fixtures :once start-server quit-browser-fixture)
+(use-fixtures :each reset-browser-fixture)
+
+(defn go-to-form-page
+  []
+  (wd/click (wd/find-element driver {:text "example form"})))
+
+;;
+;; ### Test Cases ####
+;;
+;; Yes, these do beg the question.
+;;
+;; Note: `*search-domain*` is rebound often to improve performance.
+;;
+
+(deftest test-basic-logic-success
+  (s (run* [q]
+           (== q true))))
 
 ;; ;; This test doubles as a test of all the s/u test macros.
 ;; (deftest test-attributeo