fix :fn/text && :fn/has-text (#284)

* fix :fn/text && :fn/has-text
clj-commons · Aug 13, 2020 · 770b8ba · 770b8ba
1 parent 47fdc17
commit 770b8ba
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 2 deletions.
diff --git a/resources/html/test.html b/resources/html/test.html
@@ -210,6 +210,7 @@ <h3>Find text with quote</h3>
         <div id="wc3-barks">
             <p>
                 <span class="crypt-lord">
+                    <!--  -->
                     From the depths I've come!
                 </span>
             </p>

diff --git a/src/etaoin/xpath.clj b/src/etaoin/xpath.clj
@@ -55,7 +55,7 @@
 
 (defmethod clause :fn/has-text
   [[_ text]]
-  (node-contains "text()" text))
+  (node-contains "string()" text))
 
 (defmethod clause :fn/has-class
   [[_ class]]

diff --git a/test/etaoin/api_test.clj b/test/etaoin/api_test.clj
@@ -688,6 +688,8 @@
     (-> (has-text? "'quote") is)))
 
 (deftest test-has-text
+  (testing "test :fn/has-text"
+    (is (boolean (query *driver* {:fn/has-text "From the depth"}))))
   (testing "gloval"
     (is (has-text? *driver* "From the depths I've come!"))
     (is (has-text? *driver* "I've come from the dark")))

diff --git a/test/etaoin/xpath_test.clj b/test/etaoin/xpath_test.clj
@@ -10,7 +10,7 @@
 
    [{:tag :button :fn/text "Press Me"} ".//button[text()=\"Press Me\"]"]
 
-   [{:fn/has-text "download"} ".//*[contains(text(), \"download\")]"]
+   [{:fn/has-text "download"} ".//*[contains(string(), \"download\")]"]
 
    [{:tag :div :fn/has-class "overlay"} ".//div[contains(@class, \"overlay\")]"]