#238 Refactor specs

route · route · commit c7156953b452 · 2022-05-10T14:41:04.000+02:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -33,14 +33,18 @@ a block with this page, after which the page is closed.
 - `Ferrum::Context#has_target?` -> `Ferrum::Context#target?`
 - We now start looking for Chrome first instead of Chromium, the order for checking binaries has changed
 - Multiple methods are moved into `Utils`:
-  - Ferrum.with_attempts -> Ferrum::Utils::Attempt.with_retry
-  - Ferrum.started -> Ferrum::Utils::ElapsedTime.start
-  - Ferrum.elapsed_time -> Ferrum::Utils::ElapsedTime.elapsed_time
-  - Ferrum.monotonic_time -> Ferrum::Utils::ElapsedTime.monotonic_time
-  - Ferrum.timeout? -> Ferrum::Utils::ElapsedTime.timeout?
-  - Ferrum.windows? -> Ferrum::Utils::Platform.windows?
-  - Ferrum.mac? -> Ferrum::Utils::Platform.mac?
-  - Ferrum.mri? -> Ferrum::Utils::Platform.mri?
+  - `Ferrum.with_attempts` -> `Ferrum::Utils::Attempt.with_retry`
+  - `Ferrum.started` -> `Ferrum::Utils::ElapsedTime.start`
+  - `Ferrum.elapsed_time` -> `Ferrum::Utils::ElapsedTime.elapsed_time`
+  - `Ferrum.monotonic_time` -> `Ferrum::Utils::ElapsedTime.monotonic_time`
+  - `Ferrum.timeout?` -> `Ferrum::Utils::ElapsedTime.timeout?`
+  - `Ferrum.windows?` -> `Ferrum::Utils::Platform.windows?`
+  - `Ferrum.mac?` -> `Ferrum::Utils::Platform.mac?`
+  - `Ferrum.mri?` -> `Ferrum::Utils::Platform.mri?`
+
+### Fixed
+
+- `Ferrum::Node#selected`, `Ferrum::Node#select` to work in frame scope
 
 ## [0.11](https://github.com/rubycdp/ferrum/compare/v0.10.2...v0.11) - (Mar 11, 2021) ##
 
diff --git a/spec/node_spec.rb b/spec/node_spec.rb
@@ -112,14 +112,6 @@ module Ferrum
       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
@@ -208,14 +200,6 @@ module Ferrum
       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
diff --git a/spec/support/views/form.erb b/spec/support/views/form.erb
@@ -1,8 +1,6 @@
-
 <h1>Form</h1>
 
 <form action="/form" method="post" novalidate>
-
   <p>
     <label for="form_title">Title</label>
     <select name="form[title]" id="form_title" class="title">
@@ -144,12 +142,12 @@
   </p>
 
   <p>
-    <label for="form_description">Description</label></br>
+    <label for="form_description">Description</label><br/>
     <textarea name="form[description]" id="form_description">Descriptive text goes here</textarea>
-  <p>
+  </p>
 
   <p>
-    <label for="form_newline">NewLine</label></br>
+    <label for="form_newline">NewLine</label><br/>
     <textarea name="form[newline]" id="form_newline">
 
 New line after and before textarea tag
@@ -298,13 +296,13 @@ New line after and before textarea tag
 
   <p>
     <span>First address<span>
-    <label for='address1_street'>Street</label>
+    <label for="address1_street">Street</label>
     <input type="text" name="form[addresses][][street]" value="" id="address1_street">
 
-    <label for='address1_city'>City</label>
+    <label for="address1_city">City</label>
     <input type="text" name="form[addresses][][city]" value="" id="address1_city">
 
-    <label for='address1_country'>Country</label>
+    <label for="address1_country">Country</label>
     <select name="form[addresses][][country]" id="address1_country">
       <option selected>France</option>
       <option>Ukraine</option>
@@ -313,13 +311,13 @@ New line after and before textarea tag
 
   <p>
     <span>Second address<span>
-    <label for='address2_street'>Street</label>
+    <label for="address2_street">Street</label>
     <input type="text" name="form[addresses][][street]" value="" id="address2_street">
 
-    <label for='address2_city'>City</label>
+    <label for="address2_city">City</label>
     <input type="text" name="form[addresses][][city]" value="" id="address2_city">
 
-    <label for='address2_country'>Country</label>
+    <label for="address2_country">Country</label>
     <select name="form[addresses][][country]" id="address2_country">
       <option>France</option>
       <option selected>Ukraine</option>
@@ -580,10 +578,10 @@ New line after and before textarea tag
 
   <input type="hidden" name="form[data]" value="TWTW"/>
   <p>
-    <button formaction='/redirect_307'>Go 307</button>
+    <button formaction="/redirect_307">Go 307</button>
   </p>
   <p>
-    <button formaction='/redirect_308'>Go 308</button>
+    <button formaction="/redirect_308">Go 308</button>
   </p>
 </form>
 
@@ -677,3 +675,5 @@ New line after and before textarea tag
   <option value=""></option>
   <option value="AU">Australia</option>
 </select>
+
+<iframe src="/ferrum/form_iframe" name="frame"></iframe>
diff --git a/spec/support/views/form_iframe.erb b/spec/support/views/form_iframe.erb
@@ -0,0 +1,8 @@
+<html>
+  <body>
+    <select id="select">
+      <option>One</option>
+      <option>Two</option>
+    </select>
+  </body>
+</html>
