watir 7.2.0 → 7.2.1

data/spec/watirspec/elements/hidden_spec.rb

@@ -2,103 +2,105 @@
 
 require 'watirspec_helper'
 
-describe 'Hidden' do
-  before :each do
-    browser.goto(WatirSpec.url_for('forms_with_input_elements.html'))
-  end
-
-  # Exist method
-  describe '#exists?' do
-    it 'returns true if the element exists' do
-      expect(browser.hidden(id: 'new_user_interests_dolls')).to exist
-      expect(browser.hidden(id: /new_user_interests_dolls/)).to exist
-      expect(browser.hidden(name: 'new_user_interests')).to exist
-      expect(browser.hidden(name: /new_user_interests/)).to exist
-      expect(browser.hidden(value: 'dolls')).to exist
-      expect(browser.hidden(value: /dolls/)).to exist
-      expect(browser.hidden(class: 'fun')).to exist
-      expect(browser.hidden(class: /fun/)).to exist
-      expect(browser.hidden(index: 0)).to exist
-      expect(browser.hidden(xpath: "//input[@id='new_user_interests_dolls']")).to exist
-    end
-
-    it 'returns the first hidden if given no args' do
-      expect(browser.hidden).to exist
+module Watir
+  describe Hidden do
+    before do
+      browser.goto(WatirSpec.url_for('forms_with_input_elements.html'))
     end
 
-    it 'returns false if the element does not exist' do
-      expect(browser.hidden(id: 'no_such_id')).to_not exist
-      expect(browser.hidden(id: /no_such_id/)).to_not exist
-      expect(browser.hidden(name: 'no_such_name')).to_not exist
-      expect(browser.hidden(name: /no_such_name/)).to_not exist
-      expect(browser.hidden(value: 'no_such_value')).to_not exist
-      expect(browser.hidden(value: /no_such_value/)).to_not exist
-      expect(browser.hidden(text: 'no_such_text')).to_not exist
-      expect(browser.hidden(text: /no_such_text/)).to_not exist
-      expect(browser.hidden(class: 'no_such_class')).to_not exist
-      expect(browser.hidden(class: /no_such_class/)).to_not exist
-      expect(browser.hidden(index: 1337)).to_not exist
-      expect(browser.hidden(xpath: "//input[@id='no_such_id']")).to_not exist
+    # Exist method
+    describe '#exists?' do
+      it 'returns true if the element exists' do
+        expect(browser.hidden(id: 'new_user_interests_dolls')).to exist
+        expect(browser.hidden(id: /new_user_interests_dolls/)).to exist
+        expect(browser.hidden(name: 'new_user_interests')).to exist
+        expect(browser.hidden(name: /new_user_interests/)).to exist
+        expect(browser.hidden(value: 'dolls')).to exist
+        expect(browser.hidden(value: /dolls/)).to exist
+        expect(browser.hidden(class: 'fun')).to exist
+        expect(browser.hidden(class: /fun/)).to exist
+        expect(browser.hidden(index: 0)).to exist
+        expect(browser.hidden(xpath: "//input[@id='new_user_interests_dolls']")).to exist
+      end
+
+      it 'returns the first hidden if given no args' do
+        expect(browser.hidden).to exist
+      end
+
+      it 'returns false if the element does not exist' do
+        expect(browser.hidden(id: 'no_such_id')).not_to exist
+        expect(browser.hidden(id: /no_such_id/)).not_to exist
+        expect(browser.hidden(name: 'no_such_name')).not_to exist
+        expect(browser.hidden(name: /no_such_name/)).not_to exist
+        expect(browser.hidden(value: 'no_such_value')).not_to exist
+        expect(browser.hidden(value: /no_such_value/)).not_to exist
+        expect(browser.hidden(text: 'no_such_text')).not_to exist
+        expect(browser.hidden(text: /no_such_text/)).not_to exist
+        expect(browser.hidden(class: 'no_such_class')).not_to exist
+        expect(browser.hidden(class: /no_such_class/)).not_to exist
+        expect(browser.hidden(index: 1337)).not_to exist
+        expect(browser.hidden(xpath: "//input[@id='no_such_id']")).not_to exist
+      end
+
+      it "raises TypeError when 'what' argument is invalid" do
+        expect { browser.hidden(id: 3.14).exists? }.to raise_error(TypeError)
+      end
     end
 
-    it "raises TypeError when 'what' argument is invalid" do
-      expect { browser.hidden(id: 3.14).exists? }.to raise_error(TypeError)
-    end
-  end
-
-  # Attribute methods
-  describe '#id' do
-    it 'returns the id attribute if the text field exists' do
-      expect(browser.hidden(index: 1).id).to eq 'new_user_interests_dolls'
-    end
+    # Attribute methods
+    describe '#id' do
+      it 'returns the id attribute if the text field exists' do
+        expect(browser.hidden(index: 1).id).to eq 'new_user_interests_dolls'
+      end
 
-    it "raises UnknownObjectException if the text field doesn't exist" do
-      expect { browser.hidden(index: 1337).id }.to raise_unknown_object_exception
+      it "raises UnknownObjectException if the text field doesn't exist" do
+        expect { browser.hidden(index: 1337).id }.to raise_unknown_object_exception
+      end
     end
-  end
 
-  describe '#name' do
-    it 'returns the name attribute if the text field exists' do
-      expect(browser.hidden(index: 1).name).to eq 'new_user_interests'
-    end
+    describe '#name' do
+      it 'returns the name attribute if the text field exists' do
+        expect(browser.hidden(index: 1).name).to eq 'new_user_interests'
+      end
 
-    it "raises UnknownObjectException if the text field doesn't exist" do
-      expect { browser.hidden(index: 1337).name }.to raise_unknown_object_exception
+      it "raises UnknownObjectException if the text field doesn't exist" do
+        expect { browser.hidden(index: 1337).name }.to raise_unknown_object_exception
+      end
     end
-  end
 
-  describe '#type' do
-    it 'returns the type attribute if the text field exists' do
-      expect(browser.hidden(index: 1).type).to eq 'hidden'
-    end
+    describe '#type' do
+      it 'returns the type attribute if the text field exists' do
+        expect(browser.hidden(index: 1).type).to eq 'hidden'
+      end
 
-    it "raises UnknownObjectException if the text field doesn't exist" do
-      expect { browser.hidden(index: 1337).type }.to raise_unknown_object_exception
+      it "raises UnknownObjectException if the text field doesn't exist" do
+        expect { browser.hidden(index: 1337).type }.to raise_unknown_object_exception
+      end
     end
-  end
 
-  describe '#value' do
-    it 'returns the value attribute if the text field exists' do
-      expect(browser.hidden(index: 1).value).to eq 'dolls'
-    end
+    describe '#value' do
+      it 'returns the value attribute if the text field exists' do
+        expect(browser.hidden(index: 1).value).to eq 'dolls'
+      end
 
-    it "raises UnknownObjectException if the text field doesn't exist" do
-      expect { browser.hidden(index: 1337).value }.to raise_unknown_object_exception
+      it "raises UnknownObjectException if the text field doesn't exist" do
+        expect { browser.hidden(index: 1337).value }.to raise_unknown_object_exception
+      end
     end
-  end
 
-  describe '#click' do
-    it 'raises ObjectDisabledException when attempting to click' do
-      expect { browser.hidden(index: 1337).click }.to raise_object_disabled_exception
+    describe '#click' do
+      it 'raises ObjectDisabledException when attempting to click' do
+        expect { browser.hidden(index: 1337).click }.to raise_object_disabled_exception
+      end
     end
-  end
 
-  describe '#respond_to?' do
-    it 'returns true for all attribute methods' do
-      expect(browser.hidden(index: 1)).to respond_to(:id)
-      expect(browser.hidden(index: 1)).to respond_to(:name)
-      expect(browser.hidden(index: 1)).to respond_to(:type)
-      expect(browser.hidden(index: 1)).to respond_to(:value)
+    describe '#respond_to?' do
+      it 'returns true for all attribute methods' do
+        expect(browser.hidden(index: 1)).to respond_to(:id)
+        expect(browser.hidden(index: 1)).to respond_to(:name)
+        expect(browser.hidden(index: 1)).to respond_to(:type)
+        expect(browser.hidden(index: 1)).to respond_to(:value)
+      end
     end
   end
 end

data/spec/watirspec/elements/hiddens_spec.rb

@@ -2,42 +2,44 @@
 
 require 'watirspec_helper'
 
-describe 'Hiddens' do
-  before :each do
-    browser.goto(WatirSpec.url_for('forms_with_input_elements.html'))
-  end
+module Watir
+  describe HiddenCollection 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.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
-  end
 
-  describe '#length' do
-    it 'returns the number of hiddens' do
-      expect(browser.hiddens.length).to eq 2
+    describe '#length' do
+      it 'returns the number of hiddens' do
+        expect(browser.hiddens.length).to eq 2
+      end
     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
-  end
 
-  describe '#each' do
-    it 'iterates through hiddens correctly' do
-      count = 0
+    describe '#each' do
+      it 'iterates through hiddens correctly' do
+        count = 0
 
-      browser.hiddens.each_with_index do |h, index|
-        expect(h.name).to eq browser.hidden(index: index).name
-        expect(h.id).to eq browser.hidden(index: index).id
-        expect(h.value).to eq browser.hidden(index: index).value
+        browser.hiddens.each_with_index do |h, index|
+          expect(h.name).to eq browser.hidden(index: index).name
+          expect(h.id).to eq browser.hidden(index: index).id
+          expect(h.value).to eq browser.hidden(index: index).value
 
-        count += 1
-      end
+          count += 1
+        end
 
-      expect(count).to be > 0
+        expect(count).to be > 0
+      end
     end
   end
 end

data/spec/watirspec/elements/hn_spec.rb

@@ -2,77 +2,79 @@
 
 require 'watirspec_helper'
 
-describe ['H1', 'H2', 'H3', 'H4', 'H5', 'H6'] do
-  before :each do
-    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
-      expect(browser.h2(id: /header2/)).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
+module Watir
+  describe Heading do
+    before do
+      browser.goto(WatirSpec.url_for('non_control_elements.html'))
     end
 
-    it 'returns the first h1 if given no args' do
-      expect(browser.h1).to exist
-    end
+    # Exists method
+    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.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 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 1/)).to_not exist
-      expect(browser.h1(index: 1337)).to_not exist
-      expect(browser.h1(xpath: "//p[@id='no_such_id']")).to_not exist
-    end
+      it 'returns the first h1 if given no args' do
+        expect(browser.h1).to exist
+      end
 
-    it "raises TypeError when 'what' argument is invalid" do
-      expect { browser.h1(id: 3.14).exists? }.to raise_error(TypeError)
-    end
-  end
+      it 'returns false if the element does not exist' do
+        expect(browser.h1(id: 'no_such_id')).not_to exist
+        expect(browser.h1(id: /no_such_id/)).not_to exist
+        expect(browser.h1(text: 'no_such_text')).not_to exist
+        expect(browser.h1(text: /no_such_text 1/)).not_to exist
+        expect(browser.h1(index: 1337)).not_to exist
+        expect(browser.h1(xpath: "//p[@id='no_such_id']")).not_to exist
+      end
 
-  # Attribute methods
-  describe '#id' do
-    it 'returns the id attribute' do
-      expect(browser.h1(index: 0).id).to eq 'first_header'
+      it "raises TypeError when 'what' argument is invalid" do
+        expect { browser.h1(id: 3.14).exists? }.to raise_error(TypeError)
+      end
     end
 
-    it "returns an empty string if the element exists and the attribute doesn't" do
-      expect(browser.h3(index: 0).id).to eq ''
-    end
+    # Attribute methods
+    describe '#id' do
+      it 'returns the id attribute' do
+        expect(browser.h1(index: 0).id).to eq 'first_header'
+      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(index: 1337).id }.to raise_unknown_object_exception
-    end
-  end
+      it "returns an empty string if the element exists and the attribute doesn't" do
+        expect(browser.h3(index: 0).id).to eq ''
+      end
 
-  describe '#text' do
-    it 'returns the text of the element' do
-      expect(browser.h1(index: 0).text).to eq 'Header 1'
+      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(index: 1337).id }.to raise_unknown_object_exception
+      end
     end
 
-    it "returns an empty string if the element doesn't contain any text" do
-      expect(browser.h6(id: 'empty_header').text).to eq ''
-    end
+    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 ''
+      end
 
-    it "raises UnknownObjectException if the p doesn't exist" do
-      expect { browser.h1(id: 'no_such_id').text }.to raise_unknown_object_exception
-      expect { browser.h1(xpath: "//h1[@id='no_such_id']").text }.to raise_unknown_object_exception
+      it "raises UnknownObjectException if the p doesn't exist" do
+        expect { browser.h1(id: 'no_such_id').text }.to raise_unknown_object_exception
+        expect { browser.h1(xpath: "//h1[@id='no_such_id']").text }.to raise_unknown_object_exception
+      end
     end
-  end
 
-  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)
+    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
 end

data/spec/watirspec/elements/hns_spec.rb

@@ -2,39 +2,41 @@
 
 require 'watirspec_helper'
 
-describe ['H1s', 'H2s', 'H3s', 'H4s', 'H5s', 'H6s'] do
-  before :each do
-    browser.goto(WatirSpec.url_for('non_control_elements.html'))
-  end
+module Watir
+  describe HeadingCollection do
+    before do
+      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
-  end
 
-  describe '#length' do
-    it 'returns the number of h1s' do
-      expect(browser.h2s.length).to eq 9
+    describe '#length' do
+      it 'returns the number of h1s' do
+        expect(browser.h2s.length).to eq 9
+      end
     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
-  end
 
-  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|
-          expect(h.id).to eq browser.send(:"h#{i}", index: index).id
+    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|
+            expect(h.id).to eq browser.send(:"h#{i}", index: index).id
+          end
+          collection.length
         end
-        collection.length
+        expect(lengths).to eq [2, 9, 2, 1, 1, 2]
       end
-      expect(lengths).to eq [2, 9, 2, 1, 1, 2]
     end
   end
 end