watir 7.2.0 → 7.3.0

data/spec/watirspec/elements/trs_spec.rb

@@ -2,60 +2,62 @@
 
 require 'watirspec_helper'
 
-describe 'TableRows' do
-  before :each do
-    browser.goto(WatirSpec.url_for('tables.html'))
-  end
-
-  describe 'with selectors' do
-    it 'returns the matching elements' do
-      expect(browser.trs(id: 'outer_second').to_a).to eq [browser.tr(id: 'outer_second')]
-    end
-  end
-
-  describe '#length' do
-    it 'returns the correct number of cells (table context)' do
-      expect(browser.table(id: 'inner').trs.length).to eq 1
-      expect(browser.table(id: 'outer').trs.length).to eq 4
+module Watir
+  describe TableRowCollection do
+    before do
+      browser.goto(WatirSpec.url_for('tables.html'))
     end
 
-    it 'returns the correct number of cells (page context)' do
-      expect(browser.trs.length).to eq 14
+    describe 'with selectors' do
+      it 'returns the matching elements' do
+        expect(browser.trs(id: 'outer_second').to_a).to eq [browser.tr(id: 'outer_second')]
+      end
     end
-  end
 
-  describe '#[]' do
-    it 'returns the row at the given index (table context)' do
-      expect(browser.table(id: 'outer').trs[0].id).to eq 'outer_first'
-    end
+    describe '#length' do
+      it 'returns the correct number of cells (table context)' do
+        expect(browser.table(id: 'inner').trs.length).to eq 1
+        expect(browser.table(id: 'outer').trs.length).to eq 4
+      end
 
-    it 'returns the row at the given index (page context)' do
-      expect(browser.trs[0].id).to eq 'thead_row_1'
+      it 'returns the correct number of cells (page context)' do
+        expect(browser.trs.length).to eq 14
+      end
     end
-  end
 
-  describe '#each' do
-    it 'iterates through rows correctly' do
-      inner_table = browser.table(id: 'inner')
-      count = 0
+    describe '#[]' do
+      it 'returns the row at the given index (table context)' do
+        expect(browser.table(id: 'outer').trs[0].id).to eq 'outer_first'
+      end
 
-      inner_table.trs.each_with_index do |r, index|
-        expect(r.id).to eq inner_table.tr(index: index).id
-        count += 1
+      it 'returns the row at the given index (page context)' do
+        expect(browser.trs[0].id).to eq 'thead_row_1'
       end
-      expect(count).to be > 0
     end
 
-    it 'iterates through the outer table correctly' do
-      outer_table = browser.table(id: 'outer')
-      count = 0
+    describe '#each' do
+      it 'iterates through rows correctly' do
+        inner_table = browser.table(id: 'inner')
+        count = 0
 
-      outer_table.trs.each_with_index do |r, index|
-        expect(r.id).to eq outer_table.tr(index: index).id
-        count += 1
+        inner_table.trs.each_with_index do |r, index|
+          expect(r.id).to eq inner_table.tr(index: index).id
+          count += 1
+        end
+        expect(count).to be > 0
       end
 
-      expect(count).to be > 0
+      it 'iterates through the outer table correctly' do
+        outer_table = browser.table(id: 'outer')
+        count = 0
+
+        outer_table.trs.each_with_index do |r, index|
+          expect(r.id).to eq outer_table.tr(index: index).id
+          count += 1
+        end
+
+        expect(count).to be > 0
+      end
     end
   end
 end

data/spec/watirspec/elements/ul_spec.rb

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

data/spec/watirspec/elements/uls_spec.rb

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