watir 7.2.0 → 7.2.1

data/spec/watirspec/elements/map_spec.rb

@@ -2,75 +2,77 @@
 
 require 'watirspec_helper'
 
-describe 'Map' do
-  before :each do
-    browser.goto(WatirSpec.url_for('images.html'))
-  end
-
-  # Exists method
-  describe '#exist?' do
-    it "returns true if the 'map' exists" do
-      expect(browser.map(id: 'triangle_map')).to exist
-      expect(browser.map(id: /triangle_map/)).to exist
-      expect(browser.map(name: 'triangle_map')).to exist
-      expect(browser.map(name: /triangle_map/)).to exist
-      expect(browser.map(index: 0)).to exist
-      expect(browser.map(xpath: "//map[@id='triangle_map']")).to exist
+module Watir
+  describe Map do
+    before do
+      browser.goto(WatirSpec.url_for('images.html'))
     end
 
-    it 'returns the first map if given no args' do
-      expect(browser.map).to exist
-    end
+    # Exists method
+    describe '#exist?' do
+      it "returns true if the 'map' exists" do
+        expect(browser.map(id: 'triangle_map')).to exist
+        expect(browser.map(id: /triangle_map/)).to exist
+        expect(browser.map(name: 'triangle_map')).to exist
+        expect(browser.map(name: /triangle_map/)).to exist
+        expect(browser.map(index: 0)).to exist
+        expect(browser.map(xpath: "//map[@id='triangle_map']")).to exist
+      end
 
-    it "returns false if the 'map' doesn't exist" do
-      expect(browser.map(id: 'no_such_id')).to_not exist
-      expect(browser.map(id: /no_such_id/)).to_not exist
-      expect(browser.map(name: 'no_such_id')).to_not exist
-      expect(browser.map(name: /no_such_id/)).to_not exist
-      expect(browser.map(index: 1337)).to_not exist
-      expect(browser.map(xpath: "//map[@id='no_such_id']")).to_not exist
-    end
+      it 'returns the first map if given no args' do
+        expect(browser.map).to exist
+      end
 
-    it "raises TypeError when 'what' argument is invalid" do
-      expect { browser.map(id: 3.14).exists? }.to raise_error(TypeError)
-    end
-  end
+      it "returns false if the 'map' doesn't exist" do
+        expect(browser.map(id: 'no_such_id')).not_to exist
+        expect(browser.map(id: /no_such_id/)).not_to exist
+        expect(browser.map(name: 'no_such_id')).not_to exist
+        expect(browser.map(name: /no_such_id/)).not_to exist
+        expect(browser.map(index: 1337)).not_to exist
+        expect(browser.map(xpath: "//map[@id='no_such_id']")).not_to exist
+      end
 
-  # Attribute methods
-  describe '#id' do
-    it 'returns the id attribute' do
-      expect(browser.map(index: 0).id).to eq 'triangle_map'
+      it "raises TypeError when 'what' argument is invalid" do
+        expect { browser.map(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.map(index: 1).id).to eq ''
-    end
+    # Attribute methods
+    describe '#id' do
+      it 'returns the id attribute' do
+        expect(browser.map(index: 0).id).to eq 'triangle_map'
+      end
 
-    it "raises UnknownObjectException if the p doesn't exist" do
-      expect { browser.map(id: 'no_such_id').id }.to raise_unknown_object_exception
-      expect { browser.map(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.map(index: 1).id).to eq ''
+      end
 
-  describe '#name' do
-    it 'returns the name attribute' do
-      expect(browser.map(index: 0).name).to eq 'triangle_map'
+      it "raises UnknownObjectException if the p doesn't exist" do
+        expect { browser.map(id: 'no_such_id').id }.to raise_unknown_object_exception
+        expect { browser.map(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.map(index: 1).name).to eq ''
-    end
+    describe '#name' do
+      it 'returns the name attribute' do
+        expect(browser.map(index: 0).name).to eq 'triangle_map'
+      end
+
+      it "returns an empty string if the element exists and the attribute doesn't" do
+        expect(browser.map(index: 1).name).to eq ''
+      end
 
-    it "raises UnknownObjectException if the map doesn't exist" do
-      expect { browser.map(id: 'no_such_id').name }.to raise_unknown_object_exception
-      expect { browser.map(index: 1337).name }.to raise_unknown_object_exception
+      it "raises UnknownObjectException if the map doesn't exist" do
+        expect { browser.map(id: 'no_such_id').name }.to raise_unknown_object_exception
+        expect { browser.map(index: 1337).name }.to raise_unknown_object_exception
+      end
     end
-  end
 
-  describe '#respond_to?' do
-    it 'returns true for all attribute methods' do
-      expect(browser.map(index: 0)).to respond_to(:id)
-      expect(browser.map(index: 0)).to respond_to(:name)
+    describe '#respond_to?' do
+      it 'returns true for all attribute methods' do
+        expect(browser.map(index: 0)).to respond_to(:id)
+        expect(browser.map(index: 0)).to respond_to(:name)
+      end
     end
   end
 end

data/spec/watirspec/elements/maps_spec.rb

@@ -2,40 +2,42 @@
 
 require 'watirspec_helper'
 
-describe 'Maps' do
-  before :each do
-    browser.goto(WatirSpec.url_for('images.html'))
-  end
+module Watir
+  describe MapCollection do
+    before do
+      browser.goto(WatirSpec.url_for('images.html'))
+    end
 
-  describe 'with selectors' do
-    it 'returns the matching elements' do
-      expect(browser.maps(name: 'triangle_map').to_a).to eq [browser.map(name: 'triangle_map')]
+    describe 'with selectors' do
+      it 'returns the matching elements' do
+        expect(browser.maps(name: 'triangle_map').to_a).to eq [browser.map(name: 'triangle_map')]
+      end
     end
-  end
 
-  describe '#length' do
-    it 'returns the number of maps' do
-      expect(browser.maps.length).to eq 2
+    describe '#length' do
+      it 'returns the number of maps' do
+        expect(browser.maps.length).to eq 2
+      end
     end
-  end
 
-  describe '#[]' do
-    it 'returns the p at the given index' do
-      expect(browser.maps[0].id).to eq 'triangle_map'
+    describe '#[]' do
+      it 'returns the p at the given index' do
+        expect(browser.maps[0].id).to eq 'triangle_map'
+      end
     end
-  end
 
-  describe '#each' do
-    it 'iterates through maps correctly' do
-      count = 0
+    describe '#each' do
+      it 'iterates through maps correctly' do
+        count = 0
 
-      browser.maps.each_with_index do |m, index|
-        expect(m.name).to eq browser.map(index: index).name
-        expect(m.id).to eq browser.map(index: index).id
-        count += 1
-      end
+        browser.maps.each_with_index do |m, index|
+          expect(m.name).to eq browser.map(index: index).name
+          expect(m.id).to eq browser.map(index: index).id
+          count += 1
+        end
 
-      expect(count).to be > 0
+        expect(count).to be > 0
+      end
     end
   end
 end

data/spec/watirspec/elements/meta_spec.rb

@@ -2,24 +2,26 @@
 
 require 'watirspec_helper'
 
-describe 'Meta' do
-  before :each do
-    browser.goto(WatirSpec.url_for('forms_with_input_elements.html'))
-  end
-
-  describe '#exist?' do
-    it 'returns true if the meta tag exists' do
-      expect(browser.meta(http_equiv: 'Content-Type')).to exist
+module Watir
+  describe Meta do
+    before do
+      browser.goto(WatirSpec.url_for('forms_with_input_elements.html'))
     end
 
-    it 'returns the first meta if given no args' do
-      expect(browser.meta).to exist
+    describe '#exist?' do
+      it 'returns true if the meta tag exists' do
+        expect(browser.meta(http_equiv: 'Content-Type')).to exist
+      end
+
+      it 'returns the first meta if given no args' do
+        expect(browser.meta).to exist
+      end
     end
-  end
 
-  describe 'content' do
-    it 'returns the content attribute of the tag' do
-      expect(browser.meta(http_equiv: 'Content-Type').content).to eq 'text/html; charset=utf-8'
+    describe 'content' do
+      it 'returns the content attribute of the tag' do
+        expect(browser.meta(http_equiv: 'Content-Type').content).to eq 'text/html; charset=utf-8'
+      end
     end
   end
 end

data/spec/watirspec/elements/metas_spec.rb

@@ -2,39 +2,41 @@
 
 require 'watirspec_helper'
 
-describe 'Metas' do
-  before :each do
-    browser.goto(WatirSpec.url_for('forms_with_input_elements.html'))
-  end
+module Watir
+  describe MetaCollection 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.metas(name: 'description').to_a).to eq [browser.meta(name: 'description')]
+    describe 'with selectors' do
+      it 'returns the matching elements' do
+        expect(browser.metas(name: 'description').to_a).to eq [browser.meta(name: 'description')]
+      end
     end
-  end
 
-  describe '#length' do
-    it 'returns the number of meta elements' do
-      expect(browser.metas.length).to eq 2
+    describe '#length' do
+      it 'returns the number of meta elements' do
+        expect(browser.metas.length).to eq 2
+      end
     end
-  end
 
-  describe '#[]' do
-    it 'returns the meta element at the given index' do
-      expect(browser.metas[1].name).to eq 'description'
+    describe '#[]' do
+      it 'returns the meta element at the given index' do
+        expect(browser.metas[1].name).to eq 'description'
+      end
     end
-  end
 
-  describe '#each' do
-    it 'iterates through meta elements correctly' do
-      count = 0
+    describe '#each' do
+      it 'iterates through meta elements correctly' do
+        count = 0
 
-      browser.metas.each_with_index do |m, index|
-        expect(m.content).to eq browser.meta(index: index).content
-        count += 1
-      end
+        browser.metas.each_with_index do |m, index|
+          expect(m.content).to eq browser.meta(index: index).content
+          count += 1
+        end
 
-      expect(count).to be > 0
+        expect(count).to be > 0
+      end
     end
   end
 end

data/spec/watirspec/elements/ol_spec.rb

@@ -2,71 +2,62 @@
 
 require 'watirspec_helper'
 
-describe 'Ol' do
-  before :each do
-    browser.goto(WatirSpec.url_for('non_control_elements.html'))
-  end
-
-  # Exists method
-  describe '#exist?' do
-    it "returns true if the 'ol' exists" do
-      expect(browser.ol(id: 'favorite_compounds')).to exist
-      expect(browser.ol(id: /favorite_compounds/)).to exist
-      expect(browser.ol(index: 0)).to exist
-      expect(browser.ol(xpath: "//ol[@id='favorite_compounds']")).to exist
-    end
-
-    it 'returns the first ol if given no args' do
-      expect(browser.ol).to exist
-    end
-
-    it "returns false if the 'ol' doesn't exist" do
-      expect(browser.ol(id: 'no_such_id')).to_not exist
-      expect(browser.ol(id: /no_such_id/)).to_not exist
-      expect(browser.ol(text: 'no_such_text')).to_not exist
-      expect(browser.ol(text: /no_such_text/)).to_not exist
-      expect(browser.ol(class: 'no_such_class')).to_not exist
-      expect(browser.ol(class: /no_such_class/)).to_not exist
-      expect(browser.ol(index: 1337)).to_not exist
-      expect(browser.ol(xpath: "//ol[@id='no_such_id']")).to_not exist
-    end
-
-    it "returns false if the 'ol' doesn't exist" do
-      expect(browser.ol(id: 'no_such_id')).to_not exist
-      expect(browser.ol(id: /no_such_id/)).to_not exist
-      expect(browser.ol(text: 'no_such_text')).to_not exist
-      expect(browser.ol(text: /no_such_text/)).to_not exist
-      expect(browser.ol(class: 'no_such_class')).to_not exist
-      expect(browser.ol(class: /no_such_class/)).to_not exist
-      expect(browser.ol(index: 1337)).to_not exist
-      expect(browser.ol(xpath: "//ol[@id='no_such_id']")).to_not exist
-    end
-
-    it "raises TypeError when 'what' argument is invalid" do
-      expect { browser.ol(id: 3.14).exists? }.to raise_error(TypeError)
-    end
-  end
-
-  # Attribute methods
-  describe '#id' do
-    it 'returns the id attribute' do
-      expect(browser.ol(class: 'chemistry').id).to eq 'favorite_compounds'
-    end
-
-    it "returns an empty string if the element exists and the attribute doesn't" do
-      expect(browser.ol(index: 1).id).to eq ''
-    end
-
-    it "raises UnknownObjectException if the ol doesn't exist" do
-      expect { browser.ol(id: 'no_such_id').id }.to raise_unknown_object_exception
-      expect { browser.ol(index: 1337).id }.to raise_unknown_object_exception
-    end
-  end
-
-  describe '#respond_to?' do
-    it 'returns true for all attribute methods' do
-      expect(browser.ol(index: 0)).to respond_to(:class_name)
-      expect(browser.ol(index: 0)).to respond_to(:id)
+module Watir
+  describe OList do
+    before do
+      browser.goto(WatirSpec.url_for('non_control_elements.html'))
+    end
+
+    # Exists method
+    describe '#exist?' do
+      it "returns true if the 'ol' exists" do
+        expect(browser.ol(id: 'favorite_compounds')).to exist
+        expect(browser.ol(id: /favorite_compounds/)).to exist
+        expect(browser.ol(index: 0)).to exist
+        expect(browser.ol(xpath: "//ol[@id='favorite_compounds']")).to exist
+      end
+
+      it 'returns the first ol if given no args' do
+        expect(browser.ol).to exist
+      end
+
+      it "returns false if the 'ol' doesn't exist" do
+        expect(browser.ol(id: 'no_such_id')).not_to exist
+        expect(browser.ol(id: /no_such_id/)).not_to exist
+        expect(browser.ol(text: 'no_such_text')).not_to exist
+        expect(browser.ol(text: /no_such_text/)).not_to exist
+        expect(browser.ol(class: 'no_such_class')).not_to exist
+        expect(browser.ol(class: /no_such_class/)).not_to exist
+        expect(browser.ol(index: 1337)).not_to exist
+        expect(browser.ol(xpath: "//ol[@id='no_such_id']")).not_to exist
+      end
+
+      it "raises TypeError when 'what' argument is invalid" do
+        expect { browser.ol(id: 3.14).exists? }.to raise_error(TypeError)
+      end
+    end
+
+    # Attribute methods
+    describe '#id' do
+      it 'returns the id attribute' do
+        expect(browser.ol(class: 'chemistry').id).to eq 'favorite_compounds'
+      end
+
+      it "returns an empty string if the element exists and the attribute doesn't" do
+        expect(browser.ol(index: 1).id).to eq ''
+      end
+
+      it "raises UnknownObjectException if the ol doesn't exist" do
+        expect { browser.ol(id: 'no_such_id').id }.to raise_unknown_object_exception
+        expect { browser.ol(index: 1337).id }.to raise_unknown_object_exception
+      end
+    end
+
+    describe '#respond_to?' do
+      it 'returns true for all attribute methods' do
+        expect(browser.ol(index: 0)).to respond_to(:class_name)
+        expect(browser.ol(index: 0)).to respond_to(:id)
+      end
     end
   end
 end

data/spec/watirspec/elements/ols_spec.rb

@@ -2,39 +2,41 @@
 
 require 'watirspec_helper'
 
-describe 'Ols' do
-  before :each do
-    browser.goto(WatirSpec.url_for('non_control_elements.html'))
-  end
+module Watir
+  describe OListCollection 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.ols(class: 'chemistry').to_a).to eq [browser.ol(class: 'chemistry')]
+    describe 'with selectors' do
+      it 'returns the matching elements' do
+        expect(browser.ols(class: 'chemistry').to_a).to eq [browser.ol(class: 'chemistry')]
+      end
     end
-  end
 
-  describe '#length' do
-    it 'returns the number of ols' do
-      expect(browser.ols.length).to eq 2
+    describe '#length' do
+      it 'returns the number of ols' do
+        expect(browser.ols.length).to eq 2
+      end
     end
-  end
 
-  describe '#[]' do
-    it 'returns the ol at the given index' do
-      expect(browser.ols[0].id).to eq 'favorite_compounds'
+    describe '#[]' do
+      it 'returns the ol at the given index' do
+        expect(browser.ols[0].id).to eq 'favorite_compounds'
+      end
     end
-  end
 
-  describe '#each' do
-    it 'iterates through ols correctly' do
-      count = 0
+    describe '#each' do
+      it 'iterates through ols correctly' do
+        count = 0
 
-      browser.ols.each_with_index do |ol, index|
-        expect(ol.id).to eq browser.ol(index: index).id
-        count += 1
-      end
+        browser.ols.each_with_index do |ol, index|
+          expect(ol.id).to eq browser.ol(index: index).id
+          count += 1
+        end
 
-      expect(count).to be > 0
+        expect(count).to be > 0
+      end
     end
   end
 end