watir 7.2.0 → 7.2.1

data/spec/watirspec/elements/font_spec.rb

@@ -2,28 +2,30 @@
 
 require 'watirspec_helper'
 
-describe 'Font' do
-  before :each do
-    browser.goto(WatirSpec.url_for('font.html'))
-  end
+module Watir
+  describe Font do
+    before do
+      browser.goto(WatirSpec.url_for('font.html'))
+    end
 
-  it 'finds the font element' do
-    expect(browser.font(index: 0)).to exist
-  end
+    it 'finds the font element' do
+      expect(browser.font(index: 0)).to exist
+    end
 
-  it 'knows about the color attribute' do
-    expect(browser.font(index: 0).color).to eq '#ff00ff'
-  end
+    it 'knows about the color attribute' do
+      expect(browser.font(index: 0).color).to eq '#ff00ff'
+    end
 
-  it 'knows about the face attribute' do
-    expect(browser.font(index: 0).face).to eq 'Helvetica'
-  end
+    it 'knows about the face attribute' do
+      expect(browser.font(index: 0).face).to eq 'Helvetica'
+    end
 
-  it 'knows about the size attribute' do
-    expect(browser.font(index: 0).size).to eq '12'
-  end
+    it 'knows about the size attribute' do
+      expect(browser.font(index: 0).size).to eq '12'
+    end
 
-  it 'finds all font elements' do
-    expect(browser.fonts.size).to eq 1
+    it 'finds all font elements' do
+      expect(browser.fonts.size).to eq 1
+    end
   end
 end

data/spec/watirspec/elements/form_spec.rb

@@ -2,67 +2,69 @@
 
 require 'watirspec_helper'
 
-describe 'Form' do
-  before :each do
-    browser.goto(WatirSpec.url_for('forms_with_input_elements.html'))
-  end
+module Watir
+  describe Form do
+    before do
+      browser.goto(WatirSpec.url_for('forms_with_input_elements.html'))
+    end
 
-  describe '#exists?' do
-    it 'returns true if the form exists' do
-      expect(browser.form(id: 'new_user')).to exist
-      expect(browser.form(id: /new_user/)).to exist
+    describe '#exists?' do
+      it 'returns true if the form exists' do
+        expect(browser.form(id: 'new_user')).to exist
+        expect(browser.form(id: /new_user/)).to exist
 
-      expect(browser.form(class: 'user')).to exist
-      expect(browser.form(class: /user/)).to exist
+        expect(browser.form(class: 'user')).to exist
+        expect(browser.form(class: /user/)).to exist
 
-      expect(browser.form(method: 'post')).to exist
-      expect(browser.form(method: /post/)).to exist
-      expect(browser.form(action: /to_me/)).to exist
-      expect(browser.form(index: 0)).to exist
-      expect(browser.form(xpath: "//form[@id='new_user']")).to exist
-    end
+        expect(browser.form(method: 'post')).to exist
+        expect(browser.form(method: /post/)).to exist
+        expect(browser.form(action: /to_me/)).to exist
+        expect(browser.form(index: 0)).to exist
+        expect(browser.form(xpath: "//form[@id='new_user']")).to exist
+      end
 
-    it 'returns the first form if given no args' do
-      expect(browser.form).to exist
-    end
+      it 'returns the first form if given no args' do
+        expect(browser.form).to exist
+      end
 
-    it "returns false if the form doesn't exist" do
-      expect(browser.form(id: 'no_such_id')).to_not exist
-      expect(browser.form(id: /no_such_id/)).to_not exist
+      it "returns false if the form doesn't exist" do
+        expect(browser.form(id: 'no_such_id')).not_to exist
+        expect(browser.form(id: /no_such_id/)).not_to exist
 
-      expect(browser.form(class: 'no_such_class')).to_not exist
-      expect(browser.form(class: /no_such_class/)).to_not exist
+        expect(browser.form(class: 'no_such_class')).not_to exist
+        expect(browser.form(class: /no_such_class/)).not_to exist
 
-      expect(browser.form(method: 'no_such_method')).to_not exist
-      expect(browser.form(method: /no_such_method/)).to_not exist
-      expect(browser.form(action: 'no_such_action')).to_not exist
-      expect(browser.form(action: /no_such_action/)).to_not exist
-      expect(browser.form(index: 1337)).to_not exist
-      expect(browser.form(xpath: "//form[@id='no_such_id']")).to_not exist
-    end
+        expect(browser.form(method: 'no_such_method')).not_to exist
+        expect(browser.form(method: /no_such_method/)).not_to exist
+        expect(browser.form(action: 'no_such_action')).not_to exist
+        expect(browser.form(action: /no_such_action/)).not_to exist
+        expect(browser.form(index: 1337)).not_to exist
+        expect(browser.form(xpath: "//form[@id='no_such_id']")).not_to exist
+      end
 
-    it "raises TypeError when 'what' argument is invalid" do
-      expect { browser.form(id: 3.14).exists? }.to raise_error(TypeError)
+      it "raises TypeError when 'what' argument is invalid" do
+        expect { browser.form(id: 3.14).exists? }.to raise_error(TypeError)
+      end
     end
-  end
 
-  describe '#submit' do
-    it 'submits the form' do
-      browser.form(id: 'delete_user').submit
-      browser.wait_while(url: /forms_with_input_elements\.html$/)
-      expect(browser.text).to include('Semantic table')
-    end
+    describe '#submit' do
+      it 'submits the form' do
+        browser.form(id: 'delete_user').submit
+        browser.wait_while(url: /forms_with_input_elements\.html$/)
+        expect(browser.text).to include('Semantic table')
+      end
 
-    it 'triggers onsubmit event and takes its result into account' do
-      form = browser.form(name: 'user_new')
-      form.submit
-      expect(form).to exist
-      expect(messages.size).to eq 1
-      expect(messages[0]).to eq 'submit'
-    end
+      it 'triggers onsubmit event and takes its result into account' do
+        form = browser.form(name: 'user_new')
+        form.submit
+        expect(form).to exist
+        expect(messages.size).to eq 1
+        expect(messages[0]).to eq 'submit'
+      end
 
-    it 'times out when submitting an element that is not displayed' do
-      expect { browser.form(name: 'no').submit }.to raise_unknown_object_exception
+      it 'times out when submitting an element that is not displayed' do
+        expect { browser.form(name: 'no').submit }.to raise_unknown_object_exception
+      end
     end
   end
 end

data/spec/watirspec/elements/forms_spec.rb

@@ -2,43 +2,45 @@
 
 require 'watirspec_helper'
 
-describe 'Forms' do
-  before :each do
-    browser.goto(WatirSpec.url_for('forms_with_input_elements.html'))
-  end
+module Watir
+  describe FormCollection do
+    before do
+      browser.goto(WatirSpec.url_for('forms_with_input_elements.html'))
+    end
 
-  describe 'with selectors' do
-    it 'returns the matching elements' do
-      expect(browser.forms(method: 'post').to_a).to eq [browser.form(method: 'post')]
+    describe 'with selectors' do
+      it 'returns the matching elements' do
+        expect(browser.forms(method: 'post').to_a).to eq [browser.form(method: 'post')]
+      end
     end
-  end
 
-  describe '#length' do
-    it 'returns the number of forms in the container' do
-      expect(browser.forms.length).to eq 2
+    describe '#length' do
+      it 'returns the number of forms in the container' do
+        expect(browser.forms.length).to eq 2
+      end
     end
-  end
 
-  describe '#[]n' do
-    it 'provides access to the nth form' do
-      expect(browser.forms[0].action).to match(/post_to_me$/) # varies between browsers
-      expect(browser.forms[0].attribute_value('method')).to eq 'post'
+    describe '#[]n' do
+      it 'provides access to the nth form' do
+        expect(browser.forms[0].action).to match(/post_to_me$/) # varies between browsers
+        expect(browser.forms[0].attribute_value('method')).to eq 'post'
+      end
     end
-  end
 
-  describe '#each' do
-    it 'iterates through forms correctly' do
-      count = 0
+    describe '#each' do
+      it 'iterates through forms correctly' do
+        count = 0
 
-      browser.forms.each_with_index do |f, index|
-        expect(f.name).to eq browser.form(index: index).name
-        expect(f.id).to eq browser.form(index: index).id
-        expect(f.class_name).to eq browser.form(index: index).class_name
+        browser.forms.each_with_index do |f, index|
+          expect(f.name).to eq browser.form(index: index).name
+          expect(f.id).to eq browser.form(index: index).id
+          expect(f.class_name).to eq browser.form(index: index).class_name
 
-        count += 1
-      end
+          count += 1
+        end
 
-      expect(count).to be > 0
+        expect(count).to be > 0
+      end
     end
   end
 end

data/spec/watirspec/elements/frame_spec.rb

@@ -6,110 +6,112 @@ require 'watirspec_helper'
 # TODO: fix duplication with iframe_spec
 #
 
-describe 'Frame' do
-  before :each do
-    browser.goto(WatirSpec.url_for('frames.html'))
-  end
-
-  it 'handles crossframe javascript' do
-    expect(browser.frame(id: 'frame_1').text_field(name: 'senderElement').value).to eq 'send_this_value'
-    expect(browser.frame(id: 'frame_2').text_field(name: 'recieverElement').value).to eq 'old_value'
-    browser.frame(id: 'frame_1').button(id: 'send').click
-    expect(browser.frame(id: 'frame_2').text_field(name: 'recieverElement').value).to eq 'send_this_value'
-  end
-
-  describe '#exist?' do
-    it 'returns true if the frame exists' do
-      expect(browser.frame(id: 'frame_1')).to exist
-      expect(browser.frame(name: 'frame1')).to exist
-      expect(browser.frame(index: 0)).to exist
-      expect(browser.frame(class: 'half')).to exist
-      expect(browser.frame(xpath: "//frame[@id='frame_1']")).to exist
-      expect(browser.frame(src: 'frame_1.html')).to exist
-      expect(browser.frame(id: /frame/)).to exist
-      expect(browser.frame(name: /frame/)).to exist
-      expect(browser.frame(src: /frame_1/)).to exist
-      expect(browser.frame(class: /half/)).to exist
+module Watir
+  describe Frame do
+    before do
+      browser.goto(WatirSpec.url_for('frames.html'))
     end
 
-    it 'returns the first frame if given no args' do
-      expect(browser.frame).to exist
+    it 'handles crossframe javascript' do
+      expect(browser.frame(id: 'frame_1').text_field(name: 'senderElement').value).to eq 'send_this_value'
+      expect(browser.frame(id: 'frame_2').text_field(name: 'recieverElement').value).to eq 'old_value'
+      browser.frame(id: 'frame_1').button(id: 'send').click
+      expect(browser.frame(id: 'frame_2').text_field(name: 'recieverElement').value).to eq 'send_this_value'
     end
 
-    it "returns false if the frame doesn't exist" do
-      expect(browser.frame(id: 'no_such_id')).to_not exist
-      expect(browser.frame(name: 'no_such_text')).to_not exist
-      expect(browser.frame(index: 1337)).to_not exist
-      expect(browser.frame(src: 'no_such_src')).to_not exist
-      expect(browser.frame(class: 'no_such_class')).to_not exist
-      expect(browser.frame(id: /no_such_id/)).to_not exist
-      expect(browser.frame(name: /no_such_text/)).to_not exist
-      expect(browser.frame(src: /no_such_src/)).to_not exist
-      expect(browser.frame(class: /no_such_class/)).to_not exist
-      expect(browser.frame(xpath: "//frame[@id='no_such_id']")).to_not exist
+    describe '#exist?' do
+      it 'returns true if the frame exists' do
+        expect(browser.frame(id: 'frame_1')).to exist
+        expect(browser.frame(name: 'frame1')).to exist
+        expect(browser.frame(index: 0)).to exist
+        expect(browser.frame(class: 'half')).to exist
+        expect(browser.frame(xpath: "//frame[@id='frame_1']")).to exist
+        expect(browser.frame(src: 'frame_1.html')).to exist
+        expect(browser.frame(id: /frame/)).to exist
+        expect(browser.frame(name: /frame/)).to exist
+        expect(browser.frame(src: /frame_1/)).to exist
+        expect(browser.frame(class: /half/)).to exist
+      end
+
+      it 'returns the first frame if given no args' do
+        expect(browser.frame).to exist
+      end
+
+      it "returns false if the frame doesn't exist" do
+        expect(browser.frame(id: 'no_such_id')).not_to exist
+        expect(browser.frame(name: 'no_such_text')).not_to exist
+        expect(browser.frame(index: 1337)).not_to exist
+        expect(browser.frame(src: 'no_such_src')).not_to exist
+        expect(browser.frame(class: 'no_such_class')).not_to exist
+        expect(browser.frame(id: /no_such_id/)).not_to exist
+        expect(browser.frame(name: /no_such_text/)).not_to exist
+        expect(browser.frame(src: /no_such_src/)).not_to exist
+        expect(browser.frame(class: /no_such_class/)).not_to exist
+        expect(browser.frame(xpath: "//frame[@id='no_such_id']")).not_to exist
+      end
+
+      it 'handles nested frames' do
+        browser.goto(WatirSpec.url_for('nested_frames.html'))
+
+        browser.frame(id: 'two').frame(id: 'three').link(id: 'four').click
+
+        browser.wait_until(title: 'definition_lists')
+        expect { browser.goto(WatirSpec.url_for('nested_frames.html')) }.not_to raise_exception
+      end
+
+      it "raises TypeError when 'what' argument is invalid" do
+        expect { browser.frame(id: 3.14).exists? }.to raise_error(TypeError)
+      end
     end
 
-    it 'handles nested frames' do
-      browser.goto(WatirSpec.url_for('nested_frames.html'))
-
-      browser.frame(id: 'two').frame(id: 'three').link(id: 'four').click
-
-      browser.wait_until(title: 'definition_lists')
-      expect { browser.goto(WatirSpec.url_for('nested_frames.html')) }.to_not raise_exception
+    it 'raises UnknownFrameException when accessing elements inside non-existing frame' do
+      expect { browser.frame(name: 'no_such_name').p(index: 0).id }.to raise_unknown_frame_exception
     end
 
-    it "raises TypeError when 'what' argument is invalid" do
-      expect { browser.frame(id: 3.14).exists? }.to raise_error(TypeError)
+    it 'raises UnknownFrameException when accessing a non-existing frame' do
+      expect { browser.frame(name: 'no_such_name').id }.to raise_unknown_frame_exception
     end
-  end
-
-  it 'raises UnknownFrameException when accessing elements inside non-existing frame' do
-    expect { browser.frame(name: 'no_such_name').p(index: 0).id }.to raise_unknown_frame_exception
-  end
-
-  it 'raises UnknownFrameException when accessing a non-existing frame' do
-    expect { browser.frame(name: 'no_such_name').id }.to raise_unknown_frame_exception
-  end
 
-  it 'raises UnknownFrameException when accessing a non-existing subframe' do
-    expect { browser.frame(name: 'frame1').frame(name: 'no_such_name').id }.to raise_unknown_frame_exception
-  end
+    it 'raises UnknownFrameException when accessing a non-existing subframe' do
+      expect { browser.frame(name: 'frame1').frame(name: 'no_such_name').id }.to raise_unknown_frame_exception
+    end
 
-  it 'raises UnknownObjectException when accessing a non-existing element inside an existing frame' do
-    expect { browser.frame(index: 0).p(index: 1337).id }.to raise_unknown_object_exception
-  end
+    it 'raises UnknownObjectException when accessing a non-existing element inside an existing frame' do
+      expect { browser.frame(index: 0).p(index: 1337).id }.to raise_unknown_object_exception
+    end
 
-  it "raises NoMethodError when trying to access attributes it doesn't have" do
-    expect { browser.frame(index: 0).foo }.to raise_error(NoMethodError)
-  end
+    it "raises NoMethodError when trying to access attributes it doesn't have" do
+      expect { browser.frame(index: 0).foo }.to raise_error(NoMethodError)
+    end
 
-  it 'is able to set a field' do
-    browser.frame(index: 0).text_field(name: 'senderElement').set('new value')
-    expect(browser.frame(index: 0).text_field(name: 'senderElement').value).to eq 'new value'
-  end
+    it 'is able to set a field' do
+      browser.frame(index: 0).text_field(name: 'senderElement').set('new value')
+      expect(browser.frame(index: 0).text_field(name: 'senderElement').value).to eq 'new value'
+    end
 
-  it "can access the frame's parent element after use" do
-    el = browser.frameset
-    el.frame.text_field.value
-    expect(el.attribute_value('cols')).to be_kind_of(String)
-  end
+    it "can access the frame's parent element after use" do
+      el = browser.frameset
+      el.frame.text_field.value
+      expect(el.attribute_value('cols')).to be_a(String)
+    end
 
-  describe '#execute_script' do
-    it 'executes the given javascript in the specified frame',
-       except: {browser: :safari, reason: 'Safari does not strip text'} do
-      frame = browser.frame(index: 0)
-      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.'
-      frame.execute_script(%{document.getElementById('set_by_js').innerHTML = '#{inner_html}'})
-      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
+    describe '#execute_script' do
+      it 'executes the given javascript in the specified frame',
+         except: {browser: :safari, reason: 'Safari does not strip text'} do
+        frame = browser.frame(index: 0)
+        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.'
+        frame.execute_script(%{document.getElementById('set_by_js').innerHTML = '#{inner_html}'})
+        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 frame' do
-      browser.goto WatirSpec.url_for('frames.html')
-      expect(browser.frame.html.downcase).to include('<title>frame 1</title>')
+    describe '#html' do
+      it 'returns the full HTML source of the frame' do
+        browser.goto WatirSpec.url_for('frames.html')
+        expect(browser.frame.html.downcase).to include('<title>frame 1</title>')
+      end
     end
   end
 end

data/spec/watirspec/elements/frames_spec.rb

@@ -2,40 +2,42 @@
 
 require 'watirspec_helper'
 
-describe 'Frames' do
-  before :each do
-    browser.goto(WatirSpec.url_for('frames.html'))
-  end
+module Watir
+  describe FrameCollection do
+    before do
+      browser.goto(WatirSpec.url_for('frames.html'))
+    end
 
-  describe 'with selectors' do
-    it 'returns the matching elements' do
-      expect(browser.frames(name: 'frame2').to_a).to eq [browser.frame(name: 'frame2')]
+    describe 'with selectors' do
+      it 'returns the matching elements' do
+        expect(browser.frames(name: 'frame2').to_a).to eq [browser.frame(name: 'frame2')]
+      end
     end
-  end
 
-  describe '#length' do
-    it 'returns the correct number of frames' do
-      expect(browser.frames.length).to eq 2
+    describe '#length' do
+      it 'returns the correct number of frames' do
+        expect(browser.frames.length).to eq 2
+      end
     end
-  end
 
-  describe '#[]' do
-    it 'returns the frame at the given index' do
-      expect(browser.frames[0].id).to eq 'frame_1'
+    describe '#[]' do
+      it 'returns the frame at the given index' do
+        expect(browser.frames[0].id).to eq 'frame_1'
+      end
     end
-  end
 
-  describe '#each' do
-    it 'iterates through frames correctly' do
-      count = 0
+    describe '#each' do
+      it 'iterates through frames correctly' do
+        count = 0
 
-      browser.frames.each_with_index do |f, index|
-        expect(f.name).to eq browser.frame(index: index).name
-        expect(f.id).to eq browser.frame(index: index).id
-        count += 1
-      end
+        browser.frames.each_with_index do |f, index|
+          expect(f.name).to eq browser.frame(index: index).name
+          expect(f.id).to eq browser.frame(index: index).id
+          count += 1
+        end
 
-      expect(count).to be > 0
+        expect(count).to be > 0
+      end
     end
   end
 end