returns Node instead DOM instance in wait_for_selector method

Author: Mifrill

lib/ferrum/frame/dom.rb

@@ -37,33 +37,31 @@ def body
       end
 
       def wait_for_selector(css: nil, xpath: nil, timeout: 5000, interval: 100)
-        tap do
-          evaluate_func(%(
-            function(selector, isXpath, timeout, interval) {
-              var attempts = 0;
-              var max = timeout / interval;
-              function waitForSelector(resolve, reject) {
-                if (attempts > ((max < 1) ? 1 : max)) {
-                  return reject(new Error("Not found element match the selector: " + selector));
-                }
-                var element = isXpath
-                  ? document.
-                      evaluate(selector, document, null, XPathResult.FIRST_ORDERED_NODE_TYPE, null).singleNodeValue
-                  : document.querySelector(selector);
-                if (element !== null) {
-                  return resolve(element);
-                }
-                setTimeout(function () {
-                  waitForSelector(resolve, reject);
-                }, interval);
-                attempts++;
+        evaluate_func(%(
+          function(selector, isXpath, timeout, interval) {
+            var attempts = 0;
+            var max = timeout / interval;
+            function waitForSelector(resolve, reject) {
+              if (attempts > ((max < 1) ? 1 : max)) {
+                return reject(new Error("Not found element match the selector: " + selector));
               }
-              return new Promise(function (resolve, reject) {
+              var element = isXpath
+                ? document.
+                  evaluate(selector, document, null, XPathResult.FIRST_ORDERED_NODE_TYPE, null).singleNodeValue
+                : document.querySelector(selector);
+              if (element !== null) {
+                return resolve(element);
+              }
+              setTimeout(function () {
                 waitForSelector(resolve, reject);
-              });
+              }, interval);
+              attempts++;
             }
-          ), css || xpath, css.nil? && !xpath.nil?, timeout, interval, awaitPromise: true)
-        end
+            return new Promise(function (resolve, reject) {
+              waitForSelector(resolve, reject);
+            });
+          }
+        ), css || xpath, css.nil? && !xpath.nil?, timeout, interval, awaitPromise: true)
       end
 
       def xpath(selector, within: nil)

spec/browser_spec.rb

@@ -509,30 +509,25 @@ module Ferrum
         browser.go_to("/ferrum/with_js")
       end
 
+      it "returns Node by provided selector" do
+        expect(browser.wait_for_selector(css: "div#wait_for_selector")).to be_kind_of(Ferrum::Node)
+        expect(browser.wait_for_selector(xpath: "//div[@id='wait_for_selector']")).to be_kind_of(Ferrum::Node)
+      end
+
       it "waits for provided css selector" do
-        expect(
-          browser.wait_for_selector(css: "div#wait_for_selector").at_css("div#wait_for_selector")
-        ).not_to be_nil
+        expect(browser.wait_for_selector(css: "div#wait_for_selector")).not_to be_nil
       end
 
       it "waits for provided css hidden selector" do
-        expect(
-          browser.wait_for_selector(css: "div#wait_for_hidden_selector").at_css("div#wait_for_hidden_selector")
-        ).not_to be_nil
+        expect(browser.wait_for_selector(css: "div#wait_for_hidden_selector")).not_to be_nil
       end
 
       it "waits for provided xpath selector" do
-        expect(
-          browser.wait_for_selector(xpath: "//div[@id='wait_for_selector']").at_css("div#wait_for_selector")
-        ).not_to be_nil
+        expect(browser.wait_for_selector(xpath: "//div[@id='wait_for_selector']")).not_to be_nil
       end
 
       it "waits for provided xpath hidden selector" do
-        expect(
-          browser
-            .wait_for_selector(xpath: "//div[@id='wait_for_hidden_selector']")
-            .at_css("div#wait_for_hidden_selector")
-        ).not_to be_nil
+        expect(browser.wait_for_selector(xpath: "//div[@id='wait_for_hidden_selector']")).not_to be_nil
       end
 
       it "raises error when timeout exceed" do
@@ -555,9 +550,7 @@ module Ferrum
 
       it "waits less than provided timeout when node found" do
         Timeout.timeout(1) do
-          expect(
-            browser.wait_for_selector(css: "div#wait_for_selector", timeout: 2000).at_css("div#wait_for_selector")
-          ).not_to be_nil
+          expect(browser.wait_for_selector(css: "div#wait_for_selector", timeout: 2000)).not_to be_nil
         end
       end
 
@@ -572,12 +565,8 @@ module Ferrum
             iframeDocument.close();
           }, 900);
         JS
-        frame = browser.wait_for_selector(xpath: "//iframe[@name='frame']").at_xpath("//iframe[@name='frame']").frame
-        expect(
-          frame
-            .wait_for_selector(xpath: "//div[@id='wait_for_selector_within_frame']")
-            .at_css("div#wait_for_selector_within_frame")
-        ).not_to be_nil
+        frame = browser.wait_for_selector(xpath: "//iframe[@name='frame']").frame
+        expect(frame.wait_for_selector(xpath: "//div[@id='wait_for_selector_within_frame']")).not_to be_nil
       end
     end