watir 7.2.0 → 7.3.0

data/spec/watirspec/elements/dl_spec.rb

@@ -2,114 +2,116 @@
 
 require 'watirspec_helper'
 
-describe 'Dl' do
-  before :each do
-    browser.goto(WatirSpec.url_for('definition_lists.html'))
-  end
-
-  # Exists method
-  describe '#exists?' do
-    it 'returns true if the element exists' do
-      expect(browser.dl(id: 'experience-list')).to exist
-      expect(browser.dl(class: 'list')).to exist
-      expect(browser.dl(xpath: "//dl[@id='experience-list']")).to exist
-      expect(browser.dl(index: 0)).to exist
-    end
-
-    it 'returns the first dl if given no args' do
-      expect(browser.dl).to exist
-    end
-
-    it 'returns false if the element does not exist' do
-      expect(browser.dl(id: 'no_such_id')).to_not exist
-    end
-
-    it "raises TypeError when 'what' argument is invalid" do
-      expect { browser.dl(id: 3.14).exists? }.to raise_error(TypeError)
-    end
-  end
-
-  # Attribute methods
-  describe '#id' do
-    it 'returns the id attribute if the element exists' do
-      expect(browser.dl(class: 'list').id).to eq 'experience-list'
-    end
-
-    it "returns an empty string if the element exists, but the attribute doesn't" do
-      expect(browser.dl(class: 'personalia').id).to eq ''
-    end
-
-    it 'raises UnknownObjectException if the element does not exist' do
-      expect { browser.dl(id: 'no_such_id').id }.to raise_unknown_object_exception
-      expect { browser.dl(title: 'no_such_id').id }.to raise_unknown_object_exception
-      expect { browser.dl(index: 1337).id }.to raise_unknown_object_exception
-    end
-  end
-
-  describe '#title' do
-    it 'returns the id attribute if the element exists' do
-      expect(browser.dl(class: 'list').title).to eq 'experience'
-    end
-  end
-
-  describe '#text' do
-    it 'returns the text of the element' do
-      expect(browser.dl(id: 'experience-list').text).to include('11 years')
-    end
-
-    it 'returns an empty string if the element exists but contains no text',
-       except: {browser: :safari, reason: 'Safari does not strip text'} do
-      expect(browser.dl(id: 'noop').text).to eq ''
-    end
-
-    it 'raises UnknownObjectException if the element does not exist' do
-      expect { browser.dl(id: 'no_such_id').text }.to raise_unknown_object_exception
-      expect { browser.dl(title: 'no_such_title').text }.to raise_unknown_object_exception
-      expect { browser.dl(index: 1337).text }.to raise_unknown_object_exception
-      expect { browser.dl(xpath: "//dl[@id='no_such_id']").text }.to raise_unknown_object_exception
-    end
-  end
-
-  describe '#respond_to?' do
-    it 'returns true for all attribute methods' do
-      expect(browser.dl(index: 0)).to respond_to(:id)
-      expect(browser.dl(index: 0)).to respond_to(:class_name)
-      expect(browser.dl(index: 0)).to respond_to(:style)
-      expect(browser.dl(index: 0)).to respond_to(:text)
-      expect(browser.dl(index: 0)).to respond_to(:title)
-    end
-  end
-
-  # Manipulation methods
-  describe '#click' do
-    it 'fires events when clicked' do
-      expect(browser.dt(id: 'name').text).to_not eq 'changed!'
-      browser.dt(id: 'name').click
-      expect(browser.dt(id: 'name').text).to eq 'changed!'
-    end
-
-    it 'raises UnknownObjectException if the element does not exist' do
-      expect { browser.dl(id: 'no_such_id').click }.to raise_unknown_object_exception
-      expect { browser.dl(title: 'no_such_title').click }.to raise_unknown_object_exception
-      expect { browser.dl(index: 1337).click }.to raise_unknown_object_exception
-      expect { browser.dl(xpath: "//dl[@id='no_such_id']").click }.to raise_unknown_object_exception
-    end
-  end
-
-  describe '#html' do
-    it 'returns the HTML of the element' do
-      html = browser.dl(id: 'experience-list').html.downcase
-      expect(html).to match(/<dt class=?"current-industry?">/)
-      expect(html).to_not include('</body>')
-    end
-  end
-
-  describe '#to_hash' do
-    it 'converts the dl to a Hash' do
-      expect(browser.dl(id: 'experience-list').to_hash).to eq({'Experience' => '11 years',
-                                                               'Education' => 'Master',
-                                                               'Current industry' => 'Architecture',
-                                                               'Previous industry experience' => 'Architecture'})
+module Watir
+  describe DList do
+    before do
+      browser.goto(WatirSpec.url_for('definition_lists.html'))
+    end
+
+    # Exists method
+    describe '#exists?' do
+      it 'returns true if the element exists' do
+        expect(browser.dl(id: 'experience-list')).to exist
+        expect(browser.dl(class: 'list')).to exist
+        expect(browser.dl(xpath: "//dl[@id='experience-list']")).to exist
+        expect(browser.dl(index: 0)).to exist
+      end
+
+      it 'returns the first dl if given no args' do
+        expect(browser.dl).to exist
+      end
+
+      it 'returns false if the element does not exist' do
+        expect(browser.dl(id: 'no_such_id')).not_to exist
+      end
+
+      it "raises TypeError when 'what' argument is invalid" do
+        expect { browser.dl(id: 3.14).exists? }.to raise_error(TypeError)
+      end
+    end
+
+    # Attribute methods
+    describe '#id' do
+      it 'returns the id attribute if the element exists' do
+        expect(browser.dl(class: 'list').id).to eq 'experience-list'
+      end
+
+      it "returns an empty string if the element exists, but the attribute doesn't" do
+        expect(browser.dl(class: 'personalia').id).to eq ''
+      end
+
+      it 'raises UnknownObjectException if the element does not exist' do
+        expect { browser.dl(id: 'no_such_id').id }.to raise_unknown_object_exception
+        expect { browser.dl(title: 'no_such_id').id }.to raise_unknown_object_exception
+        expect { browser.dl(index: 1337).id }.to raise_unknown_object_exception
+      end
+    end
+
+    describe '#title' do
+      it 'returns the id attribute if the element exists' do
+        expect(browser.dl(class: 'list').title).to eq 'experience'
+      end
+    end
+
+    describe '#text' do
+      it 'returns the text of the element' do
+        expect(browser.dl(id: 'experience-list').text).to include('11 years')
+      end
+
+      it 'returns an empty string if the element exists but contains no text',
+         except: {browser: :safari, reason: 'Safari does not strip text'} do
+        expect(browser.dl(id: 'noop').text).to eq ''
+      end
+
+      it 'raises UnknownObjectException if the element does not exist' do
+        expect { browser.dl(id: 'no_such_id').text }.to raise_unknown_object_exception
+        expect { browser.dl(title: 'no_such_title').text }.to raise_unknown_object_exception
+        expect { browser.dl(index: 1337).text }.to raise_unknown_object_exception
+        expect { browser.dl(xpath: "//dl[@id='no_such_id']").text }.to raise_unknown_object_exception
+      end
+    end
+
+    describe '#respond_to?' do
+      it 'returns true for all attribute methods' do
+        expect(browser.dl(index: 0)).to respond_to(:id)
+        expect(browser.dl(index: 0)).to respond_to(:class_name)
+        expect(browser.dl(index: 0)).to respond_to(:style)
+        expect(browser.dl(index: 0)).to respond_to(:text)
+        expect(browser.dl(index: 0)).to respond_to(:title)
+      end
+    end
+
+    # Manipulation methods
+    describe '#click' do
+      it 'fires events when clicked' do
+        expect(browser.dt(id: 'name').text).not_to eq 'changed!'
+        browser.dt(id: 'name').click
+        expect(browser.dt(id: 'name').text).to eq 'changed!'
+      end
+
+      it 'raises UnknownObjectException if the element does not exist' do
+        expect { browser.dl(id: 'no_such_id').click }.to raise_unknown_object_exception
+        expect { browser.dl(title: 'no_such_title').click }.to raise_unknown_object_exception
+        expect { browser.dl(index: 1337).click }.to raise_unknown_object_exception
+        expect { browser.dl(xpath: "//dl[@id='no_such_id']").click }.to raise_unknown_object_exception
+      end
+    end
+
+    describe '#html' do
+      it 'returns the HTML of the element' do
+        html = browser.dl(id: 'experience-list').html.downcase
+        expect(html).to match(/<dt class=?"current-industry?">/)
+        expect(html).not_to include('</body>')
+      end
+    end
+
+    describe '#to_hash' do
+      it 'converts the dl to a Hash' do
+        expect(browser.dl(id: 'experience-list').to_hash).to eq({'Experience' => '11 years',
+                                                                 'Education' => 'Master',
+                                                                 'Current industry' => 'Architecture',
+                                                                 'Previous industry experience' => 'Architecture'})
+      end
     end
   end
 end

data/spec/watirspec/elements/dls_spec.rb

@@ -2,42 +2,44 @@
 
 require 'watirspec_helper'
 
-describe 'Dls' do
-  before :each do
-    browser.goto(WatirSpec.url_for('definition_lists.html'))
-  end
+module Watir
+  describe DListCollection do
+    before do
+      browser.goto(WatirSpec.url_for('definition_lists.html'))
+    end
 
-  describe 'with selectors' do
-    it 'returns the matching elements' do
-      expect(browser.dls(title: 'experience').to_a).to eq [browser.dl(title: 'experience')]
+    describe 'with selectors' do
+      it 'returns the matching elements' do
+        expect(browser.dls(title: 'experience').to_a).to eq [browser.dl(title: 'experience')]
+      end
     end
-  end
 
-  describe '#length' do
-    it 'returns the number of dls' do
-      expect(browser.dls.length).to eq 3
+    describe '#length' do
+      it 'returns the number of dls' do
+        expect(browser.dls.length).to eq 3
+      end
     end
-  end
 
-  describe '#[]' do
-    it 'returns the dl at the given index' do
-      expect(browser.dls[0].id).to eq 'experience-list'
+    describe '#[]' do
+      it 'returns the dl at the given index' do
+        expect(browser.dls[0].id).to eq 'experience-list'
+      end
     end
-  end
 
-  describe '#each' do
-    it 'iterates through dls correctly' do
-      count = 0
+    describe '#each' do
+      it 'iterates through dls correctly' do
+        count = 0
 
-      browser.dls.each_with_index do |d, index|
-        expect(d.text).to eq browser.dl(index: index).text
-        expect(d.id).to eq browser.dl(index: index).id
-        expect(d.class_name).to eq browser.dl(index: index).class_name
+        browser.dls.each_with_index do |d, index|
+          expect(d.text).to eq browser.dl(index: index).text
+          expect(d.id).to eq browser.dl(index: index).id
+          expect(d.class_name).to eq browser.dl(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/dt_spec.rb

@@ -2,104 +2,106 @@
 
 require 'watirspec_helper'
 
-describe 'Dt' do
-  before :each do
-    browser.goto(WatirSpec.url_for('definition_lists.html'))
-  end
-
-  # Exists method
-  describe '#exists?' do
-    it 'returns true if the element exists' do
-      expect(browser.dt(id: 'experience')).to exist
-      expect(browser.dt(class: 'current-industry')).to exist
-      expect(browser.dt(xpath: "//dt[@id='experience']")).to exist
-      expect(browser.dt(index: 0)).to exist
-    end
-
-    it 'returns the first dt if given no args' do
-      expect(browser.dt).to exist
-    end
-
-    it 'returns false if the element does not exist' do
-      expect(browser.dt(id: 'no_such_id')).to_not exist
-    end
-
-    it "raises TypeError when 'what' argument is invalid" do
-      expect { browser.dt(id: 3.14).exists? }.to raise_error(TypeError)
-    end
-  end
-
-  # Attribute methods
-  describe '#id' do
-    it 'returns the id attribute if the element exists' do
-      expect(browser.dt(class: 'industry').id).to eq 'experience'
+module Watir
+  describe 'Dt' do
+    before do
+      browser.goto(WatirSpec.url_for('definition_lists.html'))
     end
 
-    it "returns an empty string if the element exists, but the attribute doesn't" do
-      expect(browser.dt(class: 'current-industry').id).to eq ''
+    # Exists method
+    describe '#exists?' do
+      it 'returns true if the element exists' do
+        expect(browser.dt(id: 'experience')).to exist
+        expect(browser.dt(class: 'current-industry')).to exist
+        expect(browser.dt(xpath: "//dt[@id='experience']")).to exist
+        expect(browser.dt(index: 0)).to exist
+      end
+
+      it 'returns the first dt if given no args' do
+        expect(browser.dt).to exist
+      end
+
+      it 'returns false if the element does not exist' do
+        expect(browser.dt(id: 'no_such_id')).not_to exist
+      end
+
+      it "raises TypeError when 'what' argument is invalid" do
+        expect { browser.dt(id: 3.14).exists? }.to raise_error(TypeError)
+      end
     end
 
-    it 'raises UnknownObjectException if the element does not exist' do
-      expect { browser.dt(id: 'no_such_id').id }.to raise_unknown_object_exception
-      expect { browser.dt(title: 'no_such_id').id }.to raise_unknown_object_exception
-      expect { browser.dt(index: 1337).id }.to raise_unknown_object_exception
+    # Attribute methods
+    describe '#id' do
+      it 'returns the id attribute if the element exists' do
+        expect(browser.dt(class: 'industry').id).to eq 'experience'
+      end
+
+      it "returns an empty string if the element exists, but the attribute doesn't" do
+        expect(browser.dt(class: 'current-industry').id).to eq ''
+      end
+
+      it 'raises UnknownObjectException if the element does not exist' do
+        expect { browser.dt(id: 'no_such_id').id }.to raise_unknown_object_exception
+        expect { browser.dt(title: 'no_such_id').id }.to raise_unknown_object_exception
+        expect { browser.dt(index: 1337).id }.to raise_unknown_object_exception
+      end
     end
-  end
-
-  describe '#title' do
-    it 'returns the title of the element' do
-      expect(browser.dt(id: 'experience').title).to eq 'experience'
-    end
-  end
 
-  describe '#text' do
-    it 'returns the text of the element' do
-      expect(browser.dt(id: 'experience').text).to eq 'Experience'
+    describe '#title' do
+      it 'returns the title of the element' do
+        expect(browser.dt(id: 'experience').title).to eq 'experience'
+      end
     end
 
-    it 'returns an empty string if the element exists but contains no text' do
-      expect(browser.dt(class: 'noop').text).to eq ''
+    describe '#text' do
+      it 'returns the text of the element' do
+        expect(browser.dt(id: 'experience').text).to eq 'Experience'
+      end
+
+      it 'returns an empty string if the element exists but contains no text' do
+        expect(browser.dt(class: 'noop').text).to eq ''
+      end
+
+      it 'raises UnknownObjectException if the element does not exist' do
+        expect { browser.dt(id: 'no_such_id').text }.to raise_unknown_object_exception
+        expect { browser.dt(title: 'no_such_title').text }.to raise_unknown_object_exception
+        expect { browser.dt(index: 1337).text }.to raise_unknown_object_exception
+        expect { browser.dt(xpath: "//dt[@id='no_such_id']").text }.to raise_unknown_object_exception
+      end
     end
 
-    it 'raises UnknownObjectException if the element does not exist' do
-      expect { browser.dt(id: 'no_such_id').text }.to raise_unknown_object_exception
-      expect { browser.dt(title: 'no_such_title').text }.to raise_unknown_object_exception
-      expect { browser.dt(index: 1337).text }.to raise_unknown_object_exception
-      expect { browser.dt(xpath: "//dt[@id='no_such_id']").text }.to raise_unknown_object_exception
+    describe '#respond_to?' do
+      it 'returns true for all attribute methods' do
+        expect(browser.dt(index: 0)).to respond_to(:id)
+        expect(browser.dt(index: 0)).to respond_to(:class_name)
+        expect(browser.dt(index: 0)).to respond_to(:style)
+        expect(browser.dt(index: 0)).to respond_to(:text)
+        expect(browser.dt(index: 0)).to respond_to(:title)
+      end
     end
-  end
 
-  describe '#respond_to?' do
-    it 'returns true for all attribute methods' do
-      expect(browser.dt(index: 0)).to respond_to(:id)
-      expect(browser.dt(index: 0)).to respond_to(:class_name)
-      expect(browser.dt(index: 0)).to respond_to(:style)
-      expect(browser.dt(index: 0)).to respond_to(:text)
-      expect(browser.dt(index: 0)).to respond_to(:title)
+    # Manipulation methods
+    describe '#click' do
+      it 'fires events when clicked' do
+        expect(browser.dt(id: 'education').text).not_to eq 'changed'
+        browser.dt(id: 'education').click
+        expect(browser.dt(id: 'education').text).to eq 'changed'
+      end
+
+      it 'raises UnknownObjectException if the element does not exist' do
+        expect { browser.dt(id: 'no_such_id').click }.to raise_unknown_object_exception
+        expect { browser.dt(title: 'no_such_title').click }.to raise_unknown_object_exception
+        expect { browser.dt(index: 1337).click }.to raise_unknown_object_exception
+        expect { browser.dt(xpath: "//dt[@id='no_such_id']").click }.to raise_unknown_object_exception
+      end
     end
-  end
-
-  # Manipulation methods
-  describe '#click' do
-    it 'fires events when clicked' do
-      expect(browser.dt(id: 'education').text).to_not eq 'changed'
-      browser.dt(id: 'education').click
-      expect(browser.dt(id: 'education').text).to eq 'changed'
-    end
-
-    it 'raises UnknownObjectException if the element does not exist' do
-      expect { browser.dt(id: 'no_such_id').click }.to raise_unknown_object_exception
-      expect { browser.dt(title: 'no_such_title').click }.to raise_unknown_object_exception
-      expect { browser.dt(index: 1337).click }.to raise_unknown_object_exception
-      expect { browser.dt(xpath: "//dt[@id='no_such_id']").click }.to raise_unknown_object_exception
-    end
-  end
 
-  describe '#html' do
-    it 'returns the HTML of the element' do
-      html = browser.dt(id: 'name').html
-      expect(html).to match(%r{<div>.*Name.*</div>}mi)
-      expect(html).to_not include('</body>')
+    describe '#html' do
+      it 'returns the HTML of the element' do
+        html = browser.dt(id: 'name').html
+        expect(html).to match(%r{<div>.*Name.*</div>}mi)
+        expect(html).not_to include('</body>')
+      end
     end
   end
 end

data/spec/watirspec/elements/dts_spec.rb

@@ -2,41 +2,43 @@
 
 require 'watirspec_helper'
 
-describe 'Dts' do
-  before :each do
-    browser.goto(WatirSpec.url_for('definition_lists.html'))
-  end
+module Watir
+  describe 'Dts' do
+    before do
+      browser.goto(WatirSpec.url_for('definition_lists.html'))
+    end
 
-  describe 'with selectors' do
-    it 'returns the matching elements' do
-      expect(browser.dts(class: 'current-industry').to_a).to eq [browser.dt(class: 'current-industry')]
+    describe 'with selectors' do
+      it 'returns the matching elements' do
+        expect(browser.dts(class: 'current-industry').to_a).to eq [browser.dt(class: 'current-industry')]
+      end
     end
-  end
 
-  describe '#length' do
-    it 'returns the number of dts' do
-      expect(browser.dts.length).to eq 11
+    describe '#length' do
+      it 'returns the number of dts' do
+        expect(browser.dts.length).to eq 11
+      end
     end
-  end
 
-  describe '#[]' do
-    it 'returns the dt at the given index' do
-      expect(browser.dts[0].id).to eq 'experience'
+    describe '#[]' do
+      it 'returns the dt at the given index' do
+        expect(browser.dts[0].id).to eq 'experience'
+      end
     end
-  end
 
-  describe '#each' do
-    it 'iterates through dts correctly' do
-      count = 0
+    describe '#each' do
+      it 'iterates through dts correctly' do
+        count = 0
 
-      browser.dts.each_with_index do |d, index|
-        expect(d.id).to eq browser.dt(index: index).id
-        expect(d.class_name).to eq browser.dt(index: index).class_name
+        browser.dts.each_with_index do |d, index|
+          expect(d.id).to eq browser.dt(index: index).id
+          expect(d.class_name).to eq browser.dt(index: index).class_name
 
-        count += 1
-      end
+          count += 1
+        end
 
-      expect(count).to be > 0
+        expect(count).to be > 0
+      end
     end
   end
 end