watir 6.13.0 → 6.14.0

data/spec/watirspec/elements/hiddens_spec.rb

@@ -1,31 +1,30 @@
-require "watirspec_helper"
-
-describe "Hiddens" do
+require 'watirspec_helper'
 
+describe 'Hiddens' do
   before :each do
-    browser.goto(WatirSpec.url_for("forms_with_input_elements.html"))
+    browser.goto(WatirSpec.url_for('forms_with_input_elements.html'))
   end
 
-  describe "with selectors" do
-    it "returns the matching elements" do
-      expect(browser.hiddens(value: "dolls").to_a).to eq [browser.hidden(value: "dolls")]
+  describe 'with selectors' do
+    it 'returns the matching elements' do
+      expect(browser.hiddens(value: 'dolls').to_a).to eq [browser.hidden(value: 'dolls')]
     end
   end
 
-  describe "#length" do
-    it "returns the number of hiddens" do
+  describe '#length' do
+    it 'returns the number of hiddens' do
       expect(browser.hiddens.length).to eq 2
     end
   end
 
-  describe "#[]" do
-    it "returns the Hidden at the given index" do
-      expect(browser.hiddens[1].id).to eq "new_user_interests_dolls"
+  describe '#[]' do
+    it 'returns the Hidden at the given index' do
+      expect(browser.hiddens[1].id).to eq 'new_user_interests_dolls'
     end
   end
 
-  describe "#each" do
-    it "iterates through hiddens correctly" do
+  describe '#each' do
+    it 'iterates through hiddens correctly' do
       count = 0
 
       browser.hiddens.each_with_index do |h, index|
@@ -39,5 +38,4 @@ describe "Hiddens" do
       expect(count).to be > 0
     end
   end
-
 end

data/spec/watirspec/elements/hn_spec.rb

@@ -1,31 +1,30 @@
-require "watirspec_helper"
-
-describe ["H1", "H2", "H3", "H4", "H5", "H6"] do
+require 'watirspec_helper'
 
+describe ['H1', 'H2', 'H3', 'H4', 'H5', 'H6'] do
   before :each do
-    browser.goto(WatirSpec.url_for("non_control_elements.html"))
+    browser.goto(WatirSpec.url_for('non_control_elements.html'))
   end
 
   # Exists method
-  describe "#exist?" do
-    it "returns true if the element exists" do
-      expect(browser.h1(id: "header1")).to exist
+  describe '#exist?' do
+    it 'returns true if the element exists' do
+      expect(browser.h1(id: 'header1')).to exist
       expect(browser.h2(id: /header2/)).to exist
-      expect(browser.h3(text: "Header 3")).to exist
+      expect(browser.h3(text: 'Header 3')).to exist
       expect(browser.h4(text: /Header 4/)).to exist
       expect(browser.h5(index: 0)).to exist
       expect(browser.h6(index: 0)).to exist
       expect(browser.h1(xpath: "//h1[@id='first_header']")).to exist
     end
 
-    it "returns the first h1 if given no args" do
+    it 'returns the first h1 if given no args' do
       expect(browser.h1).to exist
     end
 
-    it "returns true if the element exists" do
-      expect(browser.h1(id: "no_such_id")).to_not exist
+    it 'returns true if the element exists' do
+      expect(browser.h1(id: 'no_such_id')).to_not exist
       expect(browser.h1(id: /no_such_id/)).to_not exist
-      expect(browser.h1(text: "no_such_text")).to_not exist
+      expect(browser.h1(text: 'no_such_text')).to_not exist
       expect(browser.h1(text: /no_such_text 1/)).to_not exist
       expect(browser.h1(index: 1337)).to_not exist
       expect(browser.h1(xpath: "//p[@id='no_such_id']")).to_not exist
@@ -37,8 +36,8 @@ describe ["H1", "H2", "H3", "H4", "H5", "H6"] do
   end
 
   # Attribute methods
-  describe "#class_name" do
-    it "returns the class attribute" do
+  describe '#class_name' do
+    it 'returns the class attribute' do
       expect(browser.h1(index: 0).class_name).to eq 'primary'
     end
 
@@ -51,9 +50,9 @@ describe ["H1", "H2", "H3", "H4", "H5", "H6"] do
     end
   end
 
-  describe "#id" do
-    it "returns the id attribute" do
-      expect(browser.h1(index: 0).id).to eq "first_header"
+  describe '#id' do
+    it 'returns the id attribute' do
+      expect(browser.h1(index: 0).id).to eq 'first_header'
     end
 
     it "returns an empty string if the element exists and the attribute doesn't" do
@@ -61,18 +60,18 @@ describe ["H1", "H2", "H3", "H4", "H5", "H6"] do
     end
 
     it "raises UnknownObjectException if the p doesn't exist" do
-      expect { browser.h1(id: "no_such_id").id }.to raise_unknown_object_exception
+      expect { browser.h1(id: 'no_such_id').id }.to raise_unknown_object_exception
       expect { browser.h1(index: 1337).id }.to raise_unknown_object_exception
     end
   end
 
-  describe "#text" do
-    it "returns the text of the element" do
+  describe '#text' do
+    it 'returns the text of the element' do
       expect(browser.h1(index: 0).text).to eq 'Header 1'
     end
 
     it "returns an empty string if the element doesn't contain any text" do
-      expect(browser.h6(id: "empty_header").text).to eq ''
+      expect(browser.h6(id: 'empty_header').text).to eq ''
     end
 
     it "raises UnknownObjectException if the p doesn't exist" do
@@ -81,12 +80,11 @@ describe ["H1", "H2", "H3", "H4", "H5", "H6"] do
     end
   end
 
-  describe "#respond_to?" do
-    it "returns true for all attribute methods" do
+  describe '#respond_to?' do
+    it 'returns true for all attribute methods' do
       expect(browser.h1(index: 0)).to respond_to(:class_name)
       expect(browser.h1(index: 0)).to respond_to(:id)
       expect(browser.h1(index: 0)).to respond_to(:text)
     end
   end
-
 end

data/spec/watirspec/elements/hns_spec.rb

@@ -1,30 +1,30 @@
-require "watirspec_helper"
+require 'watirspec_helper'
 
-describe ["H1s", "H2s", "H3s", "H4s", "H5s", "H6s"] do
+describe ['H1s', 'H2s', 'H3s', 'H4s', 'H5s', 'H6s'] do
   before :each do
-    browser.goto(WatirSpec.url_for("non_control_elements.html"))
+    browser.goto(WatirSpec.url_for('non_control_elements.html'))
   end
 
-  describe "with selectors" do
-    it "returns the matching elements" do
-      expect(browser.h1s(class: "primary").to_a).to eq [browser.h1(class: "primary")]
+  describe 'with selectors' do
+    it 'returns the matching elements' do
+      expect(browser.h1s(class: 'primary').to_a).to eq [browser.h1(class: 'primary')]
     end
   end
 
-  describe "#length" do
-    it "returns the number of h1s" do
+  describe '#length' do
+    it 'returns the number of h1s' do
       expect(browser.h2s.length).to eq 9
     end
   end
 
-  describe "#[]" do
-    it "returns the h1 at the given index" do
-      expect(browser.h1s[0].id).to eq "first_header"
+  describe '#[]' do
+    it 'returns the h1 at the given index' do
+      expect(browser.h1s[0].id).to eq 'first_header'
     end
   end
 
-  describe "#each" do
-    it "iterates through header collections correctly" do
+  describe '#each' do
+    it 'iterates through header collections correctly' do
       lengths = (1..6).collect do |i|
         collection = browser.send(:"h#{i}s")
         collection.each_with_index do |h, index|

data/spec/watirspec/elements/iframe_spec.rb

@@ -1,52 +1,75 @@
-require "watirspec_helper"
+require 'watirspec_helper'
 
 #
 # TODO: fix duplication with frame_spec
 #
 
-describe "IFrame" do
-
+describe 'IFrame' do
   before :each do
-    browser.goto(WatirSpec.url_for("iframes.html"))
+    browser.goto(WatirSpec.url_for('iframes.html'))
   end
 
   not_compliant_on :safari do
-    bug "Firefox 58 broke this, apperas to be working in Nightly", %i(firefox linux) do
-      it "handles crossframe javascript" do
-        browser.goto WatirSpec.url_for("iframes.html")
-
-        expect(browser.iframe(id: "iframe_1").text_field(name: 'senderElement').value).to eq 'send_this_value'
-        expect(browser.iframe(id: "iframe_2").text_field(name: 'recieverElement').value).to eq 'old_value'
-        browser.iframe(id: "iframe_1").button(id: 'send').click
-        expect(browser.iframe(id: "iframe_2").text_field(name: 'recieverElement').value).to eq 'send_this_value'
+    bug 'Firefox 58 broke this, apperas to be working in Nightly', %i[firefox linux] do
+      it 'handles crossframe javascript' do
+        browser.goto WatirSpec.url_for('iframes.html')
+
+        expect(browser.iframe(id: 'iframe_1').text_field(name: 'senderElement').value).to eq 'send_this_value'
+        expect(browser.iframe(id: 'iframe_2').text_field(name: 'recieverElement').value).to eq 'old_value'
+        browser.iframe(id: 'iframe_1').button(id: 'send').click
+        expect(browser.iframe(id: 'iframe_2').text_field(name: 'recieverElement').value).to eq 'send_this_value'
       end
     end
   end
 
-  describe "#exist?" do
-    it "returns true if the iframe exists" do
-      expect(browser.iframe(id: "iframe_1")).to exist
-      expect(browser.iframe(name: "iframe1")).to exist
+  it 'locates an element defined by Selenium Element' do
+    iframe = browser.iframe(id: 'iframe_1').tap(&:exists?)
+    se_element = iframe.instance_variable_get('@element')
+    iframe2 = browser.element(element: se_element).to_subtype
+    expect(iframe2).to eq iframe
+  end
+
+  describe '#wd' do
+    it 'returns a Watir::FramedDriver instance' do
+      iframe = browser.iframe(id: 'iframe_1')
+      expect(iframe.wd).to be_a(Watir::FramedDriver)
+    end
+
+    it 'properly delegates driver commands' do
+      iframe = browser.iframe(id: 'iframe_1')
+      expect(iframe.wd.title).to eq 'Iframes'
+    end
+
+    it 'properly delegates element commands' do
+      iframe = browser.iframe(id: 'iframe_1')
+      expect(iframe.wd.attribute('id')).to eq 'iframe_1'
+    end
+  end
+
+  describe '#exist?' do
+    it 'returns true if the iframe exists' do
+      expect(browser.iframe(id: 'iframe_1')).to exist
+      expect(browser.iframe(name: 'iframe1')).to exist
       expect(browser.iframe(index: 0)).to exist
-      expect(browser.iframe(class: "half")).to exist
+      expect(browser.iframe(class: 'half')).to exist
       expect(browser.iframe(xpath: "//iframe[@id='iframe_1']")).to exist
-      expect(browser.iframe(src: "iframe_1.html")).to exist
+      expect(browser.iframe(src: 'iframe_1.html')).to exist
       expect(browser.iframe(id: /iframe/)).to exist
       expect(browser.iframe(name: /iframe/)).to exist
       expect(browser.iframe(src: /iframe_1/)).to exist
       expect(browser.iframe(class: /half/)).to exist
     end
 
-    it "returns the first iframe if given no args" do
+    it 'returns the first iframe if given no args' do
       expect(browser.iframe).to exist
     end
 
     it "returns false if the iframe doesn't exist" do
-      expect(browser.iframe(id: "no_such_id")).to_not exist
-      expect(browser.iframe(name: "no_such_text")).to_not exist
+      expect(browser.iframe(id: 'no_such_id')).to_not exist
+      expect(browser.iframe(name: 'no_such_text')).to_not exist
       expect(browser.iframe(index: 1337)).to_not exist
-      expect(browser.iframe(src: "no_such_src")).to_not exist
-      expect(browser.iframe(class: "no_such_class")).to_not exist
+      expect(browser.iframe(src: 'no_such_src')).to_not exist
+      expect(browser.iframe(class: 'no_such_class')).to_not exist
       expect(browser.iframe(id: /no_such_id/)).to_not exist
       expect(browser.iframe(name: /no_such_text/)).to_not exist
       expect(browser.iframe(src: /no_such_src/)).to_not exist
@@ -54,47 +77,47 @@ describe "IFrame" do
       expect(browser.iframe(xpath: "//iframe[@id='no_such_id']")).to_not exist
     end
 
-    it "returns false if an element in an iframe does exist" do
-      expect(browser.iframe.element(css: "#senderElement")).to exist
-      expect(browser.iframe.element(id: "senderElement")).to exist
+    it 'returns false if an element in an iframe does exist' do
+      expect(browser.iframe.element(css: '#senderElement')).to exist
+      expect(browser.iframe.element(id: 'senderElement')).to exist
     end
 
-    it "returns true if an element in an iframe does not exist" do
-      expect(browser.iframe.element(css: "#no_such_id")).to_not exist
-      expect(browser.iframe.element(id: "no_such_id")).to_not exist
+    it 'returns true if an element in an iframe does not exist' do
+      expect(browser.iframe.element(css: '#no_such_id')).to_not exist
+      expect(browser.iframe.element(id: 'no_such_id')).to_not exist
     end
 
-    it "returns true if an element outside an iframe exists after checking for one inside that does exist" do
-      existing_element = browser.element(css: "#iframe_1")
+    it 'returns true if an element outside an iframe exists after checking for one inside that does exist' do
+      existing_element = browser.element(css: '#iframe_1')
       expect(existing_element).to exist
-      expect(browser.iframe.element(css: "#senderElement")).to exist
+      expect(browser.iframe.element(css: '#senderElement')).to exist
       expect(existing_element).to exist
     end
 
-    it "returns true if an element outside an iframe exists after checking for one inside that does not exist" do
-      existing_element = browser.element(css: "#iframe_1")
+    it 'returns true if an element outside an iframe exists after checking for one inside that does not exist' do
+      existing_element = browser.element(css: '#iframe_1')
       expect(existing_element).to exist
-      expect(browser.iframe.element(css: "#no_such_id")).to_not exist
+      expect(browser.iframe.element(css: '#no_such_id')).to_not exist
       expect(existing_element).to exist
     end
 
-    it "returns true if an element exists in a frame generated in a collection" do
+    it 'returns true if an element exists in a frame generated in a collection' do
       nested_element = browser.body.iframes.first.div
       expect(nested_element).to exist
     end
 
-    it "returns false for sub-element of a non-existing iframe" do
+    it 'returns false for sub-element of a non-existing iframe' do
       expect(browser.iframe(id: 'no_such_id').element).to_not exist
     end
 
-    bug "https://bugzilla.mozilla.org/show_bug.cgi?id=1255946", :firefox do
+    bug 'https://bugzilla.mozilla.org/show_bug.cgi?id=1255946', :firefox do
       not_compliant_on :safari do
-        it "handles nested iframes" do
-          browser.goto(WatirSpec.url_for("nested_iframes.html"))
+        it 'handles nested iframes' do
+          browser.goto(WatirSpec.url_for('nested_iframes.html'))
 
-          browser.iframe(id: "two").iframe(id: "three").link(id: "four").click
+          browser.iframe(id: 'two').iframe(id: 'three').link(id: 'four').click
 
-          Watir::Wait.until { browser.title == "definition_lists" }
+          Watir::Wait.until { browser.title == 'definition_lists' }
         end
       end
     end
@@ -108,18 +131,18 @@ describe "IFrame" do
     expect(browser.iframe(index: 0).div(id: 'invalid')).to_not exist
   end
 
-  describe "#present?" do
-    it "returns true if the iframe present" do
-      expect(browser.iframe(id: "iframe_1")).to be_present
+  describe '#present?' do
+    it 'returns true if the iframe present' do
+      expect(browser.iframe(id: 'iframe_1')).to be_present
     end
 
-    it "returns false if the iframe is not present" do
-      expect(browser.iframe(id: "no_such_id")).not_to be_present
+    it 'returns false if the iframe is not present' do
+      expect(browser.iframe(id: 'no_such_id')).not_to be_present
     end
   end
 
   it 'switches between iframe and parent when needed' do
-    browser.iframe(id: "iframe_1").elements.each do |element|
+    browser.iframe(id: 'iframe_1').elements.each do |element|
       element.text
       browser.h1.text
     end
@@ -137,19 +160,19 @@ describe "IFrame" do
     expect(browser.h1s.first.text).to be == 'Iframes'
   end
 
-  it "raises UnknownFrameException when accessing elements inside non-existing iframe" do
-    expect { browser.iframe(name: "no_such_name").p(index: 0).id }.to raise_unknown_frame_exception
+  it 'raises UnknownFrameException when accessing elements inside non-existing iframe' do
+    expect { browser.iframe(name: 'no_such_name').p(index: 0).id }.to raise_unknown_frame_exception
   end
 
-  it "raises UnknownFrameException when accessing a non-existing iframe" do
-    expect { browser.iframe(name: "no_such_name").id }.to raise_unknown_frame_exception
+  it 'raises UnknownFrameException when accessing a non-existing iframe' do
+    expect { browser.iframe(name: 'no_such_name').id }.to raise_unknown_frame_exception
   end
 
-  it "raises UnknownFrameException when accessing a non-existing subframe" do
-    expect { browser.iframe(name: "iframe1").iframe(name: "no_such_name").id }.to raise_unknown_frame_exception
+  it 'raises UnknownFrameException when accessing a non-existing subframe' do
+    expect { browser.iframe(name: 'iframe1').iframe(name: 'no_such_name').id }.to raise_unknown_frame_exception
   end
 
-  it "raises UnknownObjectException when accessing a non-existing element inside an existing iframe" do
+  it 'raises UnknownObjectException when accessing a non-existing element inside an existing iframe' do
     expect { browser.iframe(index: 0).p(index: 1337).id }.to raise_unknown_object_exception
   end
 
@@ -157,38 +180,47 @@ describe "IFrame" do
     expect { browser.iframe(index: 0).foo }.to raise_error(NoMethodError)
   end
 
-  it "is able to set a field" do
-    browser.iframe(index: 0).text_field(name: 'senderElement').set("new value")
-    expect(browser.iframe(index: 0).text_field(name: 'senderElement').value).to eq "new value"
+  it 'is able to set a field' do
+    browser.iframe(index: 0).text_field(name: 'senderElement').set('new value')
+    expect(browser.iframe(index: 0).text_field(name: 'senderElement').value).to eq 'new value'
   end
 
   it 'will suggest looking in an iframe when iframes exist' do
-    expect { browser.text_field(name: 'senderElement').set('no') }.to raise_unknown_object_exception('Maybe look in an iframe?')
+    msg = 'Maybe look in an iframe?'
+    expect { browser.text_field(name: 'senderElement').set('no') }.to raise_unknown_object_exception(msg)
   end
 
-  describe "#execute_script" do
-    bug "Safari does not strip text", :safari do
-      it "executes the given javascript in the specified frame" do
+  it 'will suggest looking in a nested iframe when iframes exist' do
+    browser.goto(WatirSpec.url_for('nested_iframes.html'))
+    top = browser.iframe(id: 'two')
+    expect { top.link(id: 'four').click }.to raise_unknown_object_exception('Maybe look in an iframe?')
+  end
+
+  describe '#execute_script' do
+    bug 'Safari does not strip text', :safari do
+      it 'executes the given javascript in the specified frame' do
         frame = browser.iframe(index: 0)
-        expect(frame.div(id: 'set_by_js').text).to eq ""
-        frame.execute_script(%Q{document.getElementById('set_by_js').innerHTML = 'Art consists of limitation. The most beautiful part of every picture is the frame.'})
-        expect(frame.div(id: 'set_by_js').text).to eq "Art consists of limitation. The most beautiful part of every picture is the frame."
+        expect(frame.div(id: 'set_by_js').text).to eq ''
+        inner_html = 'Art consists of limitation. The most beautiful part of every picture is the frame.'
+        script = "document.getElementById('set_by_js').innerHTML = '#{inner_html}'"
+        frame.execute_script script
+        text = 'Art consists of limitation. The most beautiful part of every picture is the frame.'
+        expect(frame.div(id: 'set_by_js').text).to eq text
       end
     end
   end
 
-  describe "#html" do
-    it "returns the full HTML source of the iframe" do
-      browser.goto WatirSpec.url_for("iframes.html")
-      expect(browser.iframe.html.downcase).to include("<title>iframe 1</title>")
+  describe '#html' do
+    it 'returns the full HTML source of the iframe' do
+      browser.goto WatirSpec.url_for('iframes.html')
+      expect(browser.iframe.html.downcase).to include('<title>iframe 1</title>')
     end
   end
 
-  describe "#text" do
-    it "returns the text inside the iframe" do
-      browser.goto WatirSpec.url_for("iframes.html")
-      expect(browser.iframe.text).to include("Frame 1")
+  describe '#text' do
+    it 'returns the text inside the iframe' do
+      browser.goto WatirSpec.url_for('iframes.html')
+      expect(browser.iframe.text).to include('Frame 1')
     end
   end
-
 end