watir 7.2.0 → 7.2.1

data/spec/watirspec/elements/tbodys_spec.rb

@@ -2,61 +2,63 @@
 
 require 'watirspec_helper'
 
-describe 'TableBodies' do
-  before :each do
-    browser.goto(WatirSpec.url_for('tables.html'))
-  end
-
-  describe 'with selectors' do
-    it 'returns the matching elements' do
-      expect(browser.tbodys(id: 'first').to_a).to eq [browser.tbody(id: 'first')]
+module Watir
+  describe 'TableBodies' do
+    before do
+      browser.goto(WatirSpec.url_for('tables.html'))
     end
-  end
 
-  describe '#length' do
-    it 'returns the correct number of table bodies (page context)' do
-      expect(browser.tbodys.length).to eq 5
+    describe 'with selectors' do
+      it 'returns the matching elements' do
+        expect(browser.tbodys(id: 'first').to_a).to eq [browser.tbody(id: 'first')]
+      end
     end
 
-    it 'returns the correct number of table bodies (table context)' do
-      expect(browser.table(index: 0).tbodys.length).to eq 2
-    end
-  end
+    describe '#length' do
+      it 'returns the correct number of table bodies (page context)' do
+        expect(browser.tbodys.length).to eq 5
+      end
 
-  describe '#[]' do
-    it 'returns the row at the given index (page context)' do
-      expect(browser.tbodys[0].id).to eq 'first'
+      it 'returns the correct number of table bodies (table context)' do
+        expect(browser.table(index: 0).tbodys.length).to eq 2
+      end
     end
 
-    it 'returns the row at the given index (table context)' do
-      expect(browser.table(index: 0).tbodys[0].id).to eq 'first'
+    describe '#[]' do
+      it 'returns the row at the given index (page context)' do
+        expect(browser.tbodys[0].id).to eq 'first'
+      end
+
+      it 'returns the row at the given index (table context)' do
+        expect(browser.table(index: 0).tbodys[0].id).to eq 'first'
+      end
     end
-  end
 
-  describe '#each' do
-    it 'iterates through table bodies correctly (table context)' do
-      count = 0
+    describe '#each' do
+      it 'iterates through table bodies correctly (browser context)' do
+        count = 0
 
-      browser.tbodys.each_with_index do |body, index|
-        expect(body.id).to eq browser.tbody(index: index).id
+        browser.tbodys.each_with_index do |body, index|
+          expect(body.id).to eq browser.tbody(index: index).id
 
-        count += 1
+          count += 1
+        end
+
+        expect(count).to be > 0
       end
 
-      expect(count).to be > 0
-    end
+      it 'iterates through table bodies correctly (table context)' do
+        table = browser.table(index: 0)
+        count = 0
 
-    it 'iterates through table bodies correctly (table context)' do
-      table = browser.table(index: 0)
-      count = 0
+        table.tbodys.each_with_index do |body, index|
+          expect(body.id).to eq table.tbody(index: index).id
 
-      table.tbodys.each_with_index do |body, index|
-        expect(body.id).to eq table.tbody(index: index).id
+          count += 1
+        end
 
-        count += 1
+        expect(count).to be > 0
       end
-
-      expect(count).to be > 0
     end
   end
 end

data/spec/watirspec/elements/td_spec.rb

@@ -2,89 +2,91 @@
 
 require 'watirspec_helper'
 
-describe 'TableCell' do
-  before :each do
-    browser.goto(WatirSpec.url_for('tables.html'))
-  end
-
-  # Exists
-  describe '#exists?' do
-    it 'returns true when the table cell exists' do
-      expect(browser.td(id: 't1_r2_c1')).to exist
-      expect(browser.td(id: /t1_r2_c1/)).to exist
-      expect(browser.td(text: 'Table 1, Row 3, Cell 1')).to exist
-      expect(browser.td(text: /Table 1/)).to exist
-      expect(browser.td(index: 0)).to exist
-      expect(browser.td(xpath: "//td[@id='t1_r2_c1']")).to exist
+module Watir
+  describe TableDataCell do
+    before do
+      browser.goto(WatirSpec.url_for('tables.html'))
     end
 
-    it 'returns the first cell if given no args' do
-      expect(browser.td).to exist
-    end
+    # Exists
+    describe '#exists?' do
+      it 'returns true when the table cell exists' do
+        expect(browser.td(id: 't1_r2_c1')).to exist
+        expect(browser.td(id: /t1_r2_c1/)).to exist
+        expect(browser.td(text: 'Table 1, Row 3, Cell 1')).to exist
+        expect(browser.td(text: /Table 1/)).to exist
+        expect(browser.td(index: 0)).to exist
+        expect(browser.td(xpath: "//td[@id='t1_r2_c1']")).to exist
+      end
 
-    it 'returns false when the table cell does not exist' do
-      expect(browser.td(id: 'no_such_id')).to_not exist
-      expect(browser.td(id: /no_such_id/)).to_not exist
-      expect(browser.td(text: 'no_such_text')).to_not exist
-      expect(browser.td(text: /no_such_text/)).to_not exist
-      expect(browser.td(index: 1337)).to_not exist
-      expect(browser.td(xpath: "//td[@id='no_such_id']")).to_not exist
-    end
+      it 'returns the first cell if given no args' do
+        expect(browser.td).to exist
+      end
+
+      it 'returns false when the table cell does not exist' do
+        expect(browser.td(id: 'no_such_id')).not_to exist
+        expect(browser.td(id: /no_such_id/)).not_to exist
+        expect(browser.td(text: 'no_such_text')).not_to exist
+        expect(browser.td(text: /no_such_text/)).not_to exist
+        expect(browser.td(index: 1337)).not_to exist
+        expect(browser.td(xpath: "//td[@id='no_such_id']")).not_to exist
+      end
 
-    it "raises TypeError when 'what' argument is invalid" do
-      expect { browser.td(id: 3.14).exists? }.to raise_error(TypeError)
+      it "raises TypeError when 'what' argument is invalid" do
+        expect { browser.td(id: 3.14).exists? }.to raise_error(TypeError)
+      end
     end
-  end
 
-  describe '#click' do
-    it "fires the table's onclick event" do
-      browser.td(id: 't2_r1_c1').click
-      expect(messages).to include('td')
+    describe '#click' do
+      it "fires the table's onclick event" do
+        browser.td(id: 't2_r1_c1').click
+        expect(messages).to include('td')
+      end
     end
-  end
 
-  # Attribute methods
-  describe '#text', except: {browser: :safari, reason: 'Safari does not strip text'} do
-    it 'returns the text inside the table cell' do
-      expect(browser.td(id: 't1_r2_c1').text).to eq 'Table 1, Row 2, Cell 1'
-      expect(browser.td(id: 't2_r1_c1').text).to eq 'Table 2, Row 1, Cell 1'
+    # Attribute methods
+    describe '#text', except: {browser: :safari, reason: 'Safari does not strip text'} do
+      it 'returns the text inside the table cell' do
+        expect(browser.td(id: 't1_r2_c1').text).to eq 'Table 1, Row 2, Cell 1'
+        expect(browser.td(id: 't2_r1_c1').text).to eq 'Table 2, Row 1, Cell 1'
+      end
     end
-  end
 
-  describe '#colspan' do
-    it 'gets the colspan attribute' do
-      expect(browser.td(id: 'colspan_2').colspan).to eq 2
-      expect(browser.td(id: 'no_colspan').colspan).to eq 1
+    describe '#colspan' do
+      it 'gets the colspan attribute' do
+        expect(browser.td(id: 'colspan_2').colspan).to eq 2
+        expect(browser.td(id: 'no_colspan').colspan).to eq 1
+      end
     end
-  end
 
-  describe '#respond_to?' do
-    it 'returns true for all attribute methods' do
-      expect(browser.td(index: 0)).to respond_to(:text)
-      expect(browser.td(index: 0)).to respond_to(:colspan)
+    describe '#respond_to?' do
+      it 'returns true for all attribute methods' do
+        expect(browser.td(index: 0)).to respond_to(:text)
+        expect(browser.td(index: 0)).to respond_to(:colspan)
+      end
     end
-  end
 
-  describe '#column_header' do
-    it 'returns the corresponding column header' do
-      header = browser.td(text: '1 331').column_header
-      expect(header).to eq 'Income tax'
+    describe '#column_header' do
+      it 'returns the corresponding column header' do
+        header = browser.td(text: '1 331').column_header
+        expect(header).to eq 'Income tax'
+      end
     end
-  end
 
-  describe '#sibling_from_header' do
-    it 'returns the corresponding sibling cell by text' do
-      local_td = browser.td(text: '1 331')
+    describe '#sibling_from_header' do
+      it 'returns the corresponding sibling cell by text' do
+        local_td = browser.td(text: '1 331')
 
-      td = local_td.sibling_from_header(text: 'After income tax')
-      expect(td.text).to eq '4 532'
-    end
+        td = local_td.sibling_from_header(text: 'After income tax')
+        expect(td.text).to eq '4 532'
+      end
 
-    it 'returns the corresponding sibling cell by index' do
-      local_td = browser.td(text: '1 331')
+      it 'returns the corresponding sibling cell by index' do
+        local_td = browser.td(text: '1 331')
 
-      td = local_td.sibling_from_header(text: /tax/, index: 2)
-      expect(td.text).to eq '4 532'
+        td = local_td.sibling_from_header(text: /tax/, index: 2)
+        expect(td.text).to eq '4 532'
+      end
     end
   end
 end

data/spec/watirspec/elements/tds_spec.rb

@@ -2,51 +2,53 @@
 
 require 'watirspec_helper'
 
-describe 'TableCells' do
-  before :each do
-    browser.goto(WatirSpec.url_for('tables.html'))
-  end
-
-  describe 'with selectors' do
-    it 'returns the matching elements' do
-      expect(browser.tds(headers: 'before_tax').to_a).to eq [browser.td(headers: 'before_tax')]
+module Watir
+  describe TableDataCellCollection do
+    before do
+      browser.goto(WatirSpec.url_for('tables.html'))
     end
-  end
 
-  #  describe "#length" do
-  #    it "returns the number of cells" do
-  #      browser.table(id: 'outer').cells.length.to eq 6
-  #      browser.table(id: 'inner').cells.length.to eq 2
-  #    end
-  #  end
-  #
-  #  describe "#[]" do
-  #    it "returns the row at the given index" do
-  #      browser.table(id: 'outer').cells[0].text.to eq "Table 1, Row 1, Cell 1"
-  #      browser.table(id: 'inner').cells[0].text.to eq "Table 2, Row 1, Cell 1"
-  #      browser.table(id: 'outer').cells[6].text.to eq "Table 1, Row 3, Cell 2"
-  #    end
-  #  end
-
-  describe '#each' do
-    it 'iterates through all cells on the page correctly' do
-      count = 0
-
-      browser.tds.each_with_index do |c, index|
-        expect(c.id).to eq browser.td(index: index).id
-        count += 1
+    describe 'with selectors' do
+      it 'returns the matching elements' do
+        expect(browser.tds(headers: 'before_tax').to_a).to eq [browser.td(headers: 'before_tax')]
       end
-
-      expect(count).to be > 0
     end
 
-    it 'iterates through cells inside a table' do
-      count = 0
+    #  describe "#length" do
+    #    it "returns the number of cells" do
+    #      browser.table(id: 'outer').cells.length.to eq 6
+    #      browser.table(id: 'inner').cells.length.to eq 2
+    #    end
+    #  end
+    #
+    #  describe "#[]" do
+    #    it "returns the row at the given index" do
+    #      browser.table(id: 'outer').cells[0].text.to eq "Table 1, Row 1, Cell 1"
+    #      browser.table(id: 'inner').cells[0].text.to eq "Table 2, Row 1, Cell 1"
+    #      browser.table(id: 'outer').cells[6].text.to eq "Table 1, Row 3, Cell 2"
+    #    end
+    #  end
+
+    describe '#each' do
+      it 'iterates through all cells on the page correctly' do
+        count = 0
+
+        browser.tds.each_with_index do |c, index|
+          expect(c.id).to eq browser.td(index: index).id
+          count += 1
+        end
+
+        expect(count).to be > 0
+      end
+
+      it 'iterates through cells inside a table' do
+        count = 0
 
-      inner_table = browser.table(id: 'inner')
-      inner_table.tds.each_with_index do |c, index|
-        expect(c.id).to eq inner_table.td(index: index).id
-        count += 1
+        inner_table = browser.table(id: 'inner')
+        inner_table.tds.each_with_index do |c, index|
+          expect(c.id).to eq inner_table.td(index: index).id
+          count += 1
+        end
       end
     end
   end