Fix select/selected to work properly within frame scope

Mifrill · route · commit f0906dbaf0d7 · 2022-05-10T14:11:56.000+02:00
diff --git a/lib/ferrum/node.rb b/lib/ferrum/node.rb
@@ -139,7 +139,7 @@ def selected
           return Array.from(element).filter(option => option.selected);
         }
       JS
-      page.evaluate_func(function, self)
+      page.evaluate_func(function, self, on: self)
     end
 
     def select(*values, by: :value)
@@ -159,7 +159,7 @@ def select(*values, by: :value)
             element.dispatchEvent(new Event('change', { bubbles: true }));
           }
         JS
-        page.evaluate_func(function, self, values.flatten, by)
+        page.evaluate_func(function, self, values.flatten, by, on: self)
       end
     end
 
diff --git a/spec/node_spec.rb b/spec/node_spec.rb
@@ -110,6 +110,19 @@ module Ferrum
             .to raise_exception(Ferrum::JavaScriptError, /Element is not a <select> element/)
         end
       end
+
+      it "returns selected options within frame" do
+        browser.execute <<-JS
+          document.body.innerHTML += "<iframe src='about:blank' name='frame'>";
+          var iframeDocument = document.querySelector("iframe[name='frame']").contentWindow.document;
+          var content = "<html><body><select id='select'><option>One</option></select></body></html>";
+          iframeDocument.open("text/html", "replace");
+          iframeDocument.write(content);
+          iframeDocument.close();
+        JS
+        frame = browser.at_xpath("//iframe[@name='frame']").frame
+        expect(frame.at_xpath("//*[@id='select']").selected.map(&:text)).to eq(["One"])
+      end
     end
 
     describe "#select" do
@@ -193,6 +206,19 @@ module Ferrum
             .to eq([""])
         end
       end
+
+      it "picks option within frame" do
+        browser.execute <<-JS
+          document.body.innerHTML += "<iframe src='about:blank' name='frame'>";
+          var iframeDocument = document.querySelector("iframe[name='frame']").contentWindow.document;
+          var content = "<html><body><select id='select'><option>One</option><option>Two</option></select></body></html>";
+          iframeDocument.open("text/html", "replace");
+          iframeDocument.write(content);
+          iframeDocument.close();
+        JS
+        frame = browser.at_xpath("//iframe[@name='frame']").frame
+        expect(frame.at_xpath("//*[@id='select']").select("Two", by: :text).selected.map(&:text)).to eq(["Two"])
+      end
     end
 
     context "when the element is not in the viewport" do
