watir 7.2.0 → 7.2.1

data/spec/watirspec/elements/link_spec.rb

@@ -2,183 +2,179 @@
 
 require 'watirspec_helper'
 
-describe 'Link' do
-  before :each do
-    browser.goto(WatirSpec.url_for('non_control_elements.html'))
-  end
-
-  # Exists method
-  describe '#exist?' do
-    it 'returns true if the link exists' do
-      expect(browser.link(id: 'link_2')).to exist
-      expect(browser.link(id: /link_2/)).to exist
-      expect(browser.link(title: 'link_title_2')).to exist
-      expect(browser.link(title: /link_title_2/)).to exist
-      expect(browser.link(text: 'Link 2')).to exist
-      expect(browser.link(text: /Link 2/i)).to exist
-      expect(browser.link(href: 'non_control_elements.html')).to exist
-      expect(browser.link(href: /non_control_elements.html/)).to exist
-      expect(browser.link(index: 1)).to exist
-      expect(browser.link(xpath: "//a[@id='link_2']")).to exist
-    end
-
-    it 'returns the first link if given no args' do
-      expect(browser.link).to exist
-    end
-
-    it 'strips spaces from href attribute when locating elements' do
-      expect(browser.link(href: /strip_space$/)).to exist
-    end
-
-    it "returns false if the link doesn't exist" do
-      expect(browser.link(id: 'no_such_id')).to_not exist
-      expect(browser.link(id: /no_such_id/)).to_not exist
-      expect(browser.link(title: 'no_such_title')).to_not exist
-      expect(browser.link(title: /no_such_title/)).to_not exist
-      expect(browser.link(text: 'no_such_text')).to_not exist
-      expect(browser.link(text: /no_such_text/i)).to_not exist
-      expect(browser.link(href: 'no_such_href')).to_not exist
-      expect(browser.link(href: /no_such_href/)).to_not exist
-      expect(browser.link(index: 1337)).to_not exist
-      expect(browser.link(xpath: "//a[@id='no_such_id']")).to_not exist
-    end
-
-    it "raises TypeError when 'what' argument is invalid" do
-      expect { browser.link(id: 3.14).exists? }.to raise_error(TypeError)
-    end
-  end
-
-  # Attribute methods
-  describe '#href' do
-    it 'returns the href attribute if the link exists' do
-      expect(browser.link(index: 1).href).to match(/non_control_elements/)
-    end
-
-    it "returns an empty string if the link exists and the attribute doesn't" do
-      expect(browser.link(index: 0).href).to eq ''
-    end
-
-    it "raises an UnknownObjectException if the link doesn't exist" do
-      expect { browser.link(index: 1337).href }.to raise_unknown_object_exception
-    end
-  end
-
-  describe '#href' do
-    it 'returns the href attribute' do
-      expect(browser.link(index: 1).href).to match(/non_control_elements/)
-    end
-  end
-
-  describe '#id' do
-    it 'returns the id attribute if the link exists' do
-      expect(browser.link(index: 1).id).to eq 'link_2'
-    end
-
-    it "returns an empty string if the link exists and the attribute doesn't" do
-      expect(browser.link(index: 0).id).to eq ''
-    end
-
-    it "raises an UnknownObjectException if the link doesn't exist" do
-      expect { browser.link(index: 1337).id }.to raise_unknown_object_exception
-    end
-  end
-
-  describe '#text' do
-    it 'returns the link text' do
-      expect(browser.link(index: 1).text).to eq 'Link 2'
-    end
-
-    it 'returns an empty string if the link exists and contains no text' do
-      expect(browser.link(index: 0).text).to eq ''
-    end
-
-    it "raises an UnknownObjectException if the link doesn't exist" do
-      expect { browser.link(index: 1337).text }.to raise_unknown_object_exception
-    end
-  end
-
-  describe '#title' do
-    it 'returns the type attribute if the link exists' do
-      expect(browser.link(index: 1).title).to eq 'link_title_2'
-    end
-
-    it "returns an empty string if the link exists and the attribute doesn't" do
-      expect(browser.link(index: 0).title).to eq ''
-    end
-
-    it "raises an UnknownObjectException if the link doesn't exist" do
-      expect { browser.link(index: 1337).title }.to raise_unknown_object_exception
-    end
-  end
-
-  describe '#respond_to?' do
-    it 'returns true for all attribute methods' do
-      expect(browser.link(index: 0)).to respond_to(:class_name)
-      expect(browser.link(index: 0)).to respond_to(:href)
-      expect(browser.link(index: 0)).to respond_to(:id)
-      expect(browser.link(index: 0)).to respond_to(:style)
-      expect(browser.link(index: 0)).to respond_to(:text)
-      expect(browser.link(index: 0)).to respond_to(:title)
-    end
-  end
-
-  # Manipulation methods
-  # Note: the #wait_until calls are hacks for Safari specifically
-  describe '#click' do
-    it 'finds an existing link by (text: String) and clicks it' do
-      element = browser.link(text: 'Link 3')
-      element.wait_until { |link| !link.exist? || link.click }
-      expect(browser.h1(text: 'User administration')).to exist
-    end
-
-    it 'finds an existing link by (text: Regexp) and clicks it' do
-      element = browser.link(href: /forms_with_input_elements/)
-      element.wait_until { |link| !link.exist? || link.click }
-      expect(browser.h1(text: 'User administration')).to exist
-    end
-
-    it 'finds an existing link by (index: Integer) and clicks it' do
-      element = browser.link(index: 2)
-      element.wait_until { |link| !link.exist? || link.click }
-      expect(browser.h1(text: 'User administration')).to exist
-    end
-
-    it "raises an UnknownObjectException if the link doesn't exist" do
-      expect { browser.link(index: 1337).click }.to raise_unknown_object_exception
-    end
-
-    it 'clicks a link with no text content but an img child' do
-      browser.goto WatirSpec.url_for('images.html')
-      browser.link(href: /definition_lists.html/).click
-      browser.wait_while(title: /^(Images|)$/)
-      expect(browser.title).to eq 'definition_lists'
-    end
-  end
-
-  describe 'visible text' do
-    it 'finds links by visible text' do
-      browser.goto WatirSpec.url_for('non_control_elements.html')
-
-      expect(browser.link(visible_text: 'all visible')).to exist
-      expect(browser.link(visible_text: /all visible/)).to exist
-      expect(browser.link(visible_text: /some visible/)).to exist
-
-      expect(browser.link(visible_text: 'Link 2', class: 'external')).to exist
-      expect(browser.link(visible_text: /Link 2/, class: 'external')).to exist
-    end
-
-    it 'finds links in spite of hidden text' do
-      browser.goto WatirSpec.url_for('non_control_elements.html')
-
-      expect(browser.link(visible_text: 'some visible')).to exist
-      expect(browser.link(visible_text: 'none visible')).not_to exist
-      expect(browser.link(visible_text: /none visible/)).not_to exist
-    end
-
-    it 'raises exception unless value is a String or a RegExp' do
-      browser.goto WatirSpec.url_for('non_control_elements.html')
-      msg = /expected one of \[String, Regexp\], got 7:Integer/
-      expect { browser.link(visible_text: 7).exists? }.to raise_exception(TypeError, msg)
+module Watir
+  describe Anchor do
+    before do
+      browser.goto(WatirSpec.url_for('non_control_elements.html'))
+    end
+
+    # Exists method
+    describe '#exist?' do
+      it 'returns true if the link exists' do
+        expect(browser.link(id: 'link_2')).to exist
+        expect(browser.link(id: /link_2/)).to exist
+        expect(browser.link(title: 'link_title_2')).to exist
+        expect(browser.link(title: /link_title_2/)).to exist
+        expect(browser.link(text: 'Link 2')).to exist
+        expect(browser.link(text: /Link 2/i)).to exist
+        expect(browser.link(href: 'non_control_elements.html')).to exist
+        expect(browser.link(href: /non_control_elements.html/)).to exist
+        expect(browser.link(index: 1)).to exist
+        expect(browser.link(xpath: "//a[@id='link_2']")).to exist
+      end
+
+      it 'returns the first link if given no args' do
+        expect(browser.link).to exist
+      end
+
+      it 'strips spaces from href attribute when locating elements' do
+        expect(browser.link(href: /strip_space$/)).to exist
+      end
+
+      it "returns false if the link doesn't exist" do
+        expect(browser.link(id: 'no_such_id')).not_to exist
+        expect(browser.link(id: /no_such_id/)).not_to exist
+        expect(browser.link(title: 'no_such_title')).not_to exist
+        expect(browser.link(title: /no_such_title/)).not_to exist
+        expect(browser.link(text: 'no_such_text')).not_to exist
+        expect(browser.link(text: /no_such_text/i)).not_to exist
+        expect(browser.link(href: 'no_such_href')).not_to exist
+        expect(browser.link(href: /no_such_href/)).not_to exist
+        expect(browser.link(index: 1337)).not_to exist
+        expect(browser.link(xpath: "//a[@id='no_such_id']")).not_to exist
+      end
+
+      it "raises TypeError when 'what' argument is invalid" do
+        expect { browser.link(id: 3.14).exists? }.to raise_error(TypeError)
+      end
+    end
+
+    # Attribute methods
+    describe '#href' do
+      it 'returns the href attribute if the link exists' do
+        expect(browser.link(index: 1).href).to match(/non_control_elements/)
+      end
+
+      it "returns an empty string if the link exists and the attribute doesn't" do
+        expect(browser.link(index: 0).href).to eq ''
+      end
+
+      it "raises an UnknownObjectException if the link doesn't exist" do
+        expect { browser.link(index: 1337).href }.to raise_unknown_object_exception
+      end
+    end
+
+    describe '#id' do
+      it 'returns the id attribute if the link exists' do
+        expect(browser.link(index: 1).id).to eq 'link_2'
+      end
+
+      it "returns an empty string if the link exists and the attribute doesn't" do
+        expect(browser.link(index: 0).id).to eq ''
+      end
+
+      it "raises an UnknownObjectException if the link doesn't exist" do
+        expect { browser.link(index: 1337).id }.to raise_unknown_object_exception
+      end
+    end
+
+    describe '#text' do
+      it 'returns the link text' do
+        expect(browser.link(index: 1).text).to eq 'Link 2'
+      end
+
+      it 'returns an empty string if the link exists and contains no text' do
+        expect(browser.link(index: 0).text).to eq ''
+      end
+
+      it "raises an UnknownObjectException if the link doesn't exist" do
+        expect { browser.link(index: 1337).text }.to raise_unknown_object_exception
+      end
+    end
+
+    describe '#title' do
+      it 'returns the type attribute if the link exists' do
+        expect(browser.link(index: 1).title).to eq 'link_title_2'
+      end
+
+      it "returns an empty string if the link exists and the attribute doesn't" do
+        expect(browser.link(index: 0).title).to eq ''
+      end
+
+      it "raises an UnknownObjectException if the link doesn't exist" do
+        expect { browser.link(index: 1337).title }.to raise_unknown_object_exception
+      end
+    end
+
+    describe '#respond_to?' do
+      it 'returns true for all attribute methods' do
+        expect(browser.link(index: 0)).to respond_to(:class_name)
+        expect(browser.link(index: 0)).to respond_to(:href)
+        expect(browser.link(index: 0)).to respond_to(:id)
+        expect(browser.link(index: 0)).to respond_to(:style)
+        expect(browser.link(index: 0)).to respond_to(:text)
+        expect(browser.link(index: 0)).to respond_to(:title)
+      end
+    end
+
+    # Manipulation methods
+    # Note: the #wait_until calls are hacks for Safari specifically
+    describe '#click' do
+      it 'finds an existing link by (text: String) and clicks it' do
+        element = browser.link(text: 'Link 3')
+        element.wait_until { |link| !link.exist? || link.click }
+        expect(browser.h1(text: 'User administration')).to exist
+      end
+
+      it 'finds an existing link by (text: Regexp) and clicks it' do
+        element = browser.link(href: /forms_with_input_elements/)
+        element.wait_until { |link| !link.exist? || link.click }
+        expect(browser.h1(text: 'User administration')).to exist
+      end
+
+      it 'finds an existing link by (index: Integer) and clicks it' do
+        element = browser.link(index: 2)
+        element.wait_until { |link| !link.exist? || link.click }
+        expect(browser.h1(text: 'User administration')).to exist
+      end
+
+      it "raises an UnknownObjectException if the link doesn't exist" do
+        expect { browser.link(index: 1337).click }.to raise_unknown_object_exception
+      end
+
+      it 'clicks a link with no text content but an img child' do
+        browser.goto WatirSpec.url_for('images.html')
+        browser.link(href: /definition_lists.html/).click
+        browser.wait_while(title: /^(Images|)$/)
+        expect(browser.title).to eq 'definition_lists'
+      end
+    end
+
+    describe 'visible text' do
+      it 'finds links by visible text' do
+        browser.goto WatirSpec.url_for('non_control_elements.html')
+
+        expect(browser.link(visible_text: 'all visible')).to exist
+        expect(browser.link(visible_text: /all visible/)).to exist
+        expect(browser.link(visible_text: /some visible/)).to exist
+
+        expect(browser.link(visible_text: 'Link 2', class: 'external')).to exist
+        expect(browser.link(visible_text: /Link 2/, class: 'external')).to exist
+      end
+
+      it 'finds links in spite of hidden text' do
+        browser.goto WatirSpec.url_for('non_control_elements.html')
+
+        expect(browser.link(visible_text: 'some visible')).to exist
+        expect(browser.link(visible_text: 'none visible')).not_to exist
+        expect(browser.link(visible_text: /none visible/)).not_to exist
+      end
+
+      it 'raises exception unless value is a String or a RegExp' do
+        browser.goto WatirSpec.url_for('non_control_elements.html')
+        msg = /expected one of \[String, Regexp\], got 7:Integer/
+        expect { browser.link(visible_text: 7).exists? }.to raise_exception(TypeError, msg)
+      end
     end
   end
 end

data/spec/watirspec/elements/links_spec.rb

@@ -2,63 +2,65 @@
 
 require 'watirspec_helper'
 
-describe 'Links' do
-  before :each do
-    browser.goto(WatirSpec.url_for('non_control_elements.html'))
-  end
-
-  describe 'with selectors' do
-    it 'returns the matching elements' do
-      expect(browser.links(title: 'link_title_2').to_a).to eq [browser.link(title: 'link_title_2')]
+module Watir
+  describe AnchorCollection do
+    before do
+      browser.goto(WatirSpec.url_for('non_control_elements.html'))
     end
-  end
 
-  describe '#length' do
-    it 'returns the number of links' do
-      expect(browser.links.length).to eq 7
+    describe 'with selectors' do
+      it 'returns the matching elements' do
+        expect(browser.links(title: 'link_title_2').to_a).to eq [browser.link(title: 'link_title_2')]
+      end
     end
-  end
 
-  describe '#[]' do
-    it 'returns the link at the given index' do
-      expect(browser.links[2].id).to eq 'link_3'
+    describe '#length' do
+      it 'returns the number of links' do
+        expect(browser.links.length).to eq 7
+      end
     end
 
-    it 'returns a Link object also when the index is out of bounds' do
-      expect(browser.links[2000]).to_not be_nil
+    describe '#[]' do
+      it 'returns the link at the given index' do
+        expect(browser.links[2].id).to eq 'link_3'
+      end
+
+      it 'returns a Link object also when the index is out of bounds' do
+        expect(browser.links[2000]).not_to be_nil
+      end
     end
-  end
 
-  describe '#each' do
-    it 'iterates through links correctly' do
-      count = 0
+    describe '#each' do
+      it 'iterates through links correctly' do
+        count = 0
 
-      browser.links.each_with_index do |c, index|
-        expect(c.id).to eq browser.link(index: index).id
-        count += 1
-      end
+        browser.links.each_with_index do |c, index|
+          expect(c.id).to eq browser.link(index: index).id
+          count += 1
+        end
 
-      expect(count).to be > 0
+        expect(count).to be > 0
+      end
     end
-  end
 
-  describe 'visible text' do
-    it 'finds links by visible text' do
-      browser.goto WatirSpec.url_for('non_control_elements.html')
-      container = browser.div(id: 'visible_link')
-      expect(container.links(visible_text: 'all visible').count).to eq(1)
-      expect(container.links(visible_text: /all visible/).count).to eq(1)
-      expect(container.links(visible_text: /some visible/).count).to eq(1)
-    end
+    describe 'visible text' do
+      it 'finds links by visible text' do
+        browser.goto WatirSpec.url_for('non_control_elements.html')
+        container = browser.div(id: 'visible_link')
+        expect(container.links(visible_text: 'all visible').count).to eq(1)
+        expect(container.links(visible_text: /all visible/).count).to eq(1)
+        expect(container.links(visible_text: /some visible/).count).to eq(1)
+      end
 
-    it 'finds links in spite of hidden text',
-       except: {browser: :safari, reason: 'Safari is not filtering out hidden text'} do
-      browser.goto WatirSpec.url_for('non_control_elements.html')
-      container = browser.div(id: 'visible_text')
+      it 'finds links in spite of hidden text',
+         except: {browser: :safari, reason: 'Safari is not filtering out hidden text'} do
+        browser.goto WatirSpec.url_for('non_control_elements.html')
+        container = browser.div(id: 'visible_text')
 
-      expect(container.divs(visible_text: 'some visible').count).to eq(1)
-      expect(container.divs(visible_text: 'none visible').count).to eq(0)
-      expect(container.divs(visible_text: /none visible/).count).to eq(0)
+        expect(container.divs(visible_text: 'some visible').count).to eq(1)
+        expect(container.divs(visible_text: 'none visible').count).to eq(0)
+        expect(container.divs(visible_text: /none visible/).count).to eq(0)
+      end
     end
   end
 end

data/spec/watirspec/elements/lis_spec.rb

@@ -2,41 +2,43 @@
 
 require 'watirspec_helper'
 
-describe 'Lis' do
-  before :each do
-    browser.goto(WatirSpec.url_for('non_control_elements.html'))
-  end
+module Watir
+  describe LICollection 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.lis(class: 'nonlink').to_a).to eq [browser.li(class: 'nonlink')]
+    describe 'with selectors' do
+      it 'returns the matching elements' do
+        expect(browser.lis(class: 'nonlink').to_a).to eq [browser.li(class: 'nonlink')]
+      end
     end
-  end
 
-  describe '#length' do
-    it 'returns the number of lis' do
-      expect(browser.lis.length).to eq 18
+    describe '#length' do
+      it 'returns the number of lis' do
+        expect(browser.lis.length).to eq 18
+      end
     end
-  end
 
-  describe '#[]' do
-    it 'returns the li at the given index' do
-      expect(browser.lis[4].id).to eq 'non_link_1'
+    describe '#[]' do
+      it 'returns the li at the given index' do
+        expect(browser.lis[4].id).to eq 'non_link_1'
+      end
     end
-  end
 
-  describe '#each' do
-    it 'iterates through lis correctly' do
-      count = 0
+    describe '#each' do
+      it 'iterates through lis correctly' do
+        count = 0
 
-      browser.lis.each_with_index do |l, index|
-        expect(l.id).to eq browser.li(index: index).id
-        expect(l.value).to eq browser.li(index: index).value
+        browser.lis.each_with_index do |l, index|
+          expect(l.id).to eq browser.li(index: index).id
+          expect(l.value).to eq browser.li(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/list_spec.rb

@@ -2,47 +2,49 @@
 
 require 'watirspec_helper'
 
-describe 'List' do
-  before :each do
-    browser.goto(WatirSpec.url_for('non_control_elements.html'))
-  end
-
-  it 'returns the list items assocaited with an Ol' do
-    items = browser.ol(id: 'favorite_compounds').list_items
-    expect(items).to be_a Watir::LICollection
-    expect(items).to all(be_a Watir::LI)
-  end
-
-  it 'returns the list items assocaited with an Ul' do
-    items = browser.ul(id: 'navbar').list_items
-    expect(items).to be_a Watir::LICollection
-    expect(items).to all(be_a Watir::LI)
-  end
-
-  it 'gets the size of a list' do
-    ul = browser.ul(id: 'navbar')
-    expect(ul.size).to eq 7
-  end
-
-  it 'iterates over a list' do
-    ul = browser.ul(id: 'navbar')
-    expect(ul.map(&:tag_name)).to eq Array.new(7, 'li')
-  end
-
-  it 'gets a list item at the specified index' do
-    ul = browser.ul(id: 'navbar')
-    expect(ul[4].text).to eq 'Non-link 1'
-  end
-
-  it 'returns the list item size' do
-    items = browser.ol(id: 'favorite_compounds').list_items
-    expect(items.size).to eq 5
-  end
-
-  it 'returns list item at an index' do
-    items = browser.ol(id: 'favorite_compounds').list_items
-    third = browser.ol(id: 'favorite_compounds').li(index: 2)
-
-    expect(items[2]).to eq third
+module Watir
+  describe List do
+    before do
+      browser.goto(WatirSpec.url_for('non_control_elements.html'))
+    end
+
+    it 'returns the list items assocaited with an Ol' do
+      items = browser.ol(id: 'favorite_compounds').list_items
+      expect(items).to be_a Watir::LICollection
+      expect(items).to all(be_a Watir::LI)
+    end
+
+    it 'returns the list items assocaited with an Ul' do
+      items = browser.ul(id: 'navbar').list_items
+      expect(items).to be_a Watir::LICollection
+      expect(items).to all(be_a Watir::LI)
+    end
+
+    it 'gets the size of a list' do
+      ul = browser.ul(id: 'navbar')
+      expect(ul.size).to eq 7
+    end
+
+    it 'iterates over a list' do
+      ul = browser.ul(id: 'navbar')
+      expect(ul.map(&:tag_name)).to eq Array.new(7, 'li')
+    end
+
+    it 'gets a list item at the specified index' do
+      ul = browser.ul(id: 'navbar')
+      expect(ul[4].text).to eq 'Non-link 1'
+    end
+
+    it 'returns the list item size' do
+      items = browser.ol(id: 'favorite_compounds').list_items
+      expect(items.size).to eq 5
+    end
+
+    it 'returns list item at an index' do
+      items = browser.ol(id: 'favorite_compounds').list_items
+      third = browser.ol(id: 'favorite_compounds').li(index: 2)
+
+      expect(items[2]).to eq third
+    end
   end
 end