watir 6.14.0 → 6.15.0

data/spec/watirspec/elements/em_spec.rb

@@ -28,19 +28,6 @@ describe 'Em' do
   end
 
   # Attribute methods
-  describe '#class_name' do
-    it 'returns the class attribute if the element exists' do
-      expect(browser.em(id: 'important-id').class_name).to eq 'important-class'
-    end
-
-    it 'raises UnknownObjectException if the element does not exist' do
-      expect { browser.em(id: 'no_such_id').class_name }.to raise_unknown_object_exception
-      expect { browser.em(title: 'no_such_title').class_name }.to raise_unknown_object_exception
-      expect { browser.em(index: 1337).class_name }.to raise_unknown_object_exception
-      expect { browser.em(xpath: "//em[@id='no_such_id']").class_name }.to raise_unknown_object_exception
-    end
-  end
-
   describe '#id' do
     it 'returns the id attribute if the element exists' do
       expect(browser.em(class: 'important-class').id).to eq 'important-id'

data/spec/watirspec/elements/filefield_spec.rb

@@ -42,17 +42,6 @@ describe 'FileField' do
   end
 
   # Attribute methods
-
-  describe '#class_name' do
-    it 'returns the class attribute if the text field exists' do
-      expect(browser.file_field(index: 0).class_name).to eq 'portrait'
-    end
-
-    it "raises UnknownObjectException if the text field doesn't exist" do
-      expect { browser.file_field(index: 1337).class_name }.to raise_unknown_object_exception
-    end
-  end
-
   describe '#id' do
     it 'returns the id attribute if the text field exists' do
       expect(browser.file_field(index: 0).id).to eq 'new_user_portrait'

data/spec/watirspec/elements/form_spec.rb

@@ -60,5 +60,11 @@ describe 'Form' do
         expect(messages[0]).to eq 'submit'
       end
     end
+
+    compliant_on :relaxed_locate do
+      it 'times out when submitting an element that is not displayed' do
+        expect { browser.form(name: 'no').submit }.to raise_unknown_object_exception
+      end
+    end
   end
 end

data/spec/watirspec/elements/hn_spec.rb

@@ -36,20 +36,6 @@ describe ['H1', 'H2', 'H3', 'H4', 'H5', 'H6'] do
   end
 
   # Attribute methods
-  describe '#class_name' do
-    it 'returns the class attribute' do
-      expect(browser.h1(index: 0).class_name).to eq 'primary'
-    end
-
-    it "returns an empty string if the element exists and the attribute doesn't" do
-      expect(browser.h2(index: 0).class_name).to eq ''
-    end
-
-    it "raises UnknownObjectException if the p doesn't exist" do
-      expect { browser.h2(id: 'no_such_id').class_name }.to raise_unknown_object_exception
-    end
-  end
-
   describe '#id' do
     it 'returns the id attribute' do
       expect(browser.h1(index: 0).id).to eq 'first_header'

data/spec/watirspec/elements/iframe_spec.rb

@@ -224,3 +224,18 @@ describe 'IFrame' do
     end
   end
 end
+
+describe 'FramedDriver' do
+  it 'raises name error if method is not defined on driver or element' do
+    browser.goto WatirSpec.url_for('iframes.html')
+    expect(browser.iframe(id: 'iframe_1').wd).not_to respond_to :foo
+    expect { browser.iframe(id: 'iframe_1').wd.foo }.to raise_exception NoMethodError
+  end
+
+  it 'raises exception when attempting to switch to a non-frame element' do
+    browser.goto WatirSpec.url_for('iframes.html')
+    element = browser.h1.wd
+    fd = Watir::FramedDriver.new(element, browser)
+    expect { fd.switch! }.to raise_exception Watir::Exception::UnknownFrameException
+  end
+end

data/spec/watirspec/elements/ins_spec.rb

@@ -39,20 +39,6 @@ describe 'Ins' do
   end
 
   # Attribute methods
-  describe '#class_name' do
-    it 'returns the class attribute' do
-      expect(browser.ins(index: 0).class_name).to eq 'lead'
-    end
-
-    it "returns an empty string if the element exists and the attribute doesn't" do
-      expect(browser.ins(index: 2).class_name).to eq ''
-    end
-
-    it "raises UnknownObjectException if the ins doesn't exist" do
-      expect { browser.ins(id: 'no_such_id').class_name }.to raise_unknown_object_exception
-    end
-  end
-
   describe '#id' do
     it 'returns the id attribute' do
       expect(browser.ins(index: 0).id).to eq 'lead'

data/spec/watirspec/elements/labels_spec.rb

@@ -13,7 +13,7 @@ describe 'Labels' do
 
   describe '#length' do
     it 'returns the number of labels' do
-      expect(browser.labels.length).to eq 41
+      expect(browser.labels.length).to eq 42
     end
   end
 

data/spec/watirspec/elements/li_spec.rb

@@ -39,20 +39,6 @@ describe 'Li' do
   end
 
   # Attribute methods
-  describe '#class_name' do
-    it 'returns the class attribute' do
-      expect(browser.li(id: 'non_link_1').class_name).to eq 'nonlink'
-    end
-
-    it "returns an empty string if the element exists and the attribute doesn't" do
-      expect(browser.li(index: 0).class_name).to eq ''
-    end
-
-    it "raises UnknownObjectException if the li doesn't exist" do
-      expect { browser.li(id: 'no_such_id').class_name }.to raise_unknown_object_exception
-    end
-  end
-
   describe '#id' do
     it 'returns the id attribute' do
       expect(browser.li(class: 'nonlink').id).to eq 'non_link_1'

data/spec/watirspec/elements/link_spec.rb

@@ -49,20 +49,6 @@ describe 'Link' do
   end
 
   # Attribute methods
-  describe '#class_name' do
-    it 'returns the type attribute if the link exists' do
-      expect(browser.link(index: 1).class_name).to eq 'external'
-    end
-
-    it "returns an empty string if the link exists and the attribute doesn't" do
-      expect(browser.link(index: 0).class_name).to eq ''
-    end
-
-    it "raises an UnknownObjectException if the link doesn't exist" do
-      expect { browser.link(index: 1337).class_name }.to raise_unknown_object_exception
-    end
-  end
-
   describe '#href' do
     it 'returns the href attribute if the link exists' do
       expect(browser.link(index: 1).href).to match(/non_control_elements/)
@@ -164,4 +150,26 @@ describe 'Link' do
       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: /some visible/)).to exist
+      expect(browser.link(visible_text: 'none visible')).not_to exist
+      expect(browser.link(visible_text: /none visible/)).not_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 'raises exception unless value is a String or a RegExp' do
+      browser.goto WatirSpec.url_for('non_control_elements.html')
+      msg = /expected string_or_regexp, got 7\:(Fixnum|Integer)/
+      expect { browser.link(visible_text: 7).exists? }.to raise_exception(TypeError, msg)
+    end
+  end
 end

data/spec/watirspec/elements/links_spec.rb

@@ -39,4 +39,17 @@ describe 'Links' do
       expect(count).to be > 0
     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_text')
+      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)
+      expect(container.links(visible_text: /some visible/).count).to eq(1)
+      expect(container.links(visible_text: 'none visible').count).to eq(0)
+      expect(container.links(visible_text: /none visible/).count).to eq(0)
+    end
+  end
 end

data/spec/watirspec/elements/list_spec.rb

@@ -17,6 +17,21 @@ describe 'List' do
     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

data/spec/watirspec/elements/ol_spec.rb

@@ -46,20 +46,6 @@ describe 'Ol' do
   end
 
   # Attribute methods
-  describe '#class_name' do
-    it 'returns the class attribute' do
-      expect(browser.ol(id: 'favorite_compounds').class_name).to eq 'chemistry'
-    end
-
-    it "returns an empty string if the element exists and the attribute doesn't" do
-      expect(browser.ol(index: 1).class_name).to eq ''
-    end
-
-    it "raises UnknownObjectException if the ol doesn't exist" do
-      expect { browser.ol(id: 'no_such_id').class_name }.to raise_unknown_object_exception
-    end
-  end
-
   describe '#id' do
     it 'returns the id attribute' do
       expect(browser.ol(class: 'chemistry').id).to eq 'favorite_compounds'

data/spec/watirspec/elements/option_spec.rb

@@ -101,16 +101,6 @@ describe 'Option' do
     end
   end
 
-  describe '#class_name' do
-    it 'is able to get attributes (page context)' do
-      expect(browser.option(text: 'Sweden').class_name).to eq 'scandinavia'
-    end
-
-    it 'is able to get attributes (select_list context)' do
-      expect(browser.select_list(name: 'new_user_country').option(text: 'Sweden').class_name).to eq 'scandinavia'
-    end
-  end
-
   describe '#respond_to?' do
     it 'returns true for all attribute methods' do
       expect(browser.select_list(name: 'new_user_country').option(text: 'Sweden')).to respond_to(:class_name)

data/spec/watirspec/elements/p_spec.rb

@@ -39,20 +39,6 @@ describe 'P' do
   end
 
   # Attribute methods
-  describe '#class_name' do
-    it 'returns the class attribute' do
-      expect(browser.p(index: 0).class_name).to eq 'lead'
-    end
-
-    it "returns an empty string if the element exists and the attribute doesn't" do
-      expect(browser.p(index: 2).class_name).to eq ''
-    end
-
-    it "raises UnknownObjectException if the p doesn't exist" do
-      expect { browser.p(id: 'no_such_id').class_name }.to raise_unknown_object_exception
-    end
-  end
-
   describe '#id' do
     it 'returns the id attribute' do
       expect(browser.p(index: 0).id).to eq 'lead'

data/spec/watirspec/elements/pre_spec.rb

@@ -39,20 +39,6 @@ describe 'Pre' do
   end
 
   # Attribute methods
-  describe '#class_name' do
-    it 'returns the class attribute' do
-      expect(browser.pre(id: 'rspec').class_name).to eq 'ruby'
-    end
-
-    it "returns an empty string if the element exists and the attribute doesn't" do
-      expect(browser.pre(index: 0).class_name).to eq ''
-    end
-
-    it "raises UnknownObjectException if the p doesn't exist" do
-      expect { browser.pre(id: 'no_such_id').class_name }.to raise_unknown_object_exception
-    end
-  end
-
   describe '#id' do
     it 'returns the id attribute' do
       expect(browser.pre(class: 'ruby').id).to eq 'rspec'

data/spec/watirspec/elements/radio_spec.rb

@@ -68,20 +68,6 @@ describe 'Radio' do
   end
 
   # Attribute methods
-  describe '#class_name' do
-    it 'returns the class name if the radio exists and has an attribute' do
-      expect(browser.radio(id: 'new_user_newsletter_yes').class_name).to eq 'huge'
-    end
-
-    it "returns an empty string if the radio exists and the attribute doesn't" do
-      expect(browser.radio(id: 'new_user_newsletter_no').class_name).to eq ''
-    end
-
-    it "raises UnknownObjectException if the radio doesn't exist" do
-      expect { browser.radio(id: 'no_such_id').class_name }.to raise_unknown_object_exception
-    end
-  end
-
   describe '#id' do
     it 'returns the id attribute if the radio exists and has an attribute' do
       expect(browser.radio(index: 0).id).to eq 'new_user_newsletter_yes'

data/spec/watirspec/elements/select_list_spec.rb

@@ -43,16 +43,6 @@ describe 'SelectList' do
   end
 
   # Attribute methods
-  describe '#class_name' do
-    it 'returns the class name of the select list' do
-      expect(browser.select_list(name: 'new_user_country').class_name).to eq 'country'
-    end
-
-    it "raises UnknownObjectException if the select list doesn't exist" do
-      expect { browser.select_list(name: 'no_such_name').class_name }.to raise_unknown_object_exception
-    end
-  end
-
   describe '#id' do
     it 'returns the id of the element' do
       expect(browser.select_list(index: 0).id).to eq 'new_user_country'

data/spec/watirspec/elements/span_spec.rb

@@ -11,13 +11,16 @@ describe 'Span' do
       expect(browser.span(id: 'lead')).to exist
       expect(browser.span(id: /lead/)).to exist
       expect(browser.span(text: 'Dubito, ergo cogito, ergo sum.')).to exist
-      expect(browser.span(text: /Dubito, ergo cogito, ergo sum/)).to exist
       expect(browser.span(class: 'lead')).to exist
       expect(browser.span(class: /lead/)).to exist
       expect(browser.span(index: 0)).to exist
       expect(browser.span(xpath: "//span[@id='lead']")).to exist
     end
 
+    it 'visible text is found by regular expression with text locator' do
+      expect(browser.span(text: /Dubito, ergo cogito, ergo sum/)).to exist
+    end
+
     it 'returns the first span if given no args' do
       expect(browser.span).to exist
     end
@@ -39,20 +42,6 @@ describe 'Span' do
   end
 
   # Attribute methods
-  describe '#class_name' do
-    it 'returns the class attribute' do
-      expect(browser.span(index: 0).class_name).to eq 'lead'
-    end
-
-    it "returns an empty string if the element exists and the attribute doesn't" do
-      expect(browser.span(index: 2).class_name).to eq ''
-    end
-
-    it "raises UnknownObjectException if the span doesn't exist" do
-      expect { browser.span(id: 'no_such_id').class_name }.to raise_unknown_object_exception
-    end
-  end
-
   describe '#id' do
     it 'returns the id attribute' do
       expect(browser.span(index: 0).id).to eq 'lead'

data/spec/watirspec/elements/strong_spec.rb

@@ -11,13 +11,16 @@ describe 'Strong' do
       expect(browser.strong(id: 'descartes')).to exist
       expect(browser.strong(id: /descartes/)).to exist
       expect(browser.strong(text: 'Dubito, ergo cogito, ergo sum.')).to exist
-      expect(browser.strong(text: /Dubito, ergo cogito, ergo sum/)).to exist
       expect(browser.strong(class: 'descartes')).to exist
       expect(browser.strong(class: /descartes/)).to exist
       expect(browser.strong(index: 0)).to exist
       expect(browser.strong(xpath: "//strong[@id='descartes']")).to exist
     end
 
+    it 'visible text is found by regular expression with text locator' do
+      expect(browser.strong(text: /Dubito, ergo cogito, ergo sum/)).to exist
+    end
+
     it 'returns the first strong if given no args' do
       expect(browser.strong).to exist
     end
@@ -39,20 +42,6 @@ describe 'Strong' do
   end
 
   # Attribute methods
-  describe '#class_name' do
-    it 'returns the class attribute' do
-      expect(browser.strong(index: 0).class_name).to eq 'descartes'
-    end
-
-    it "returns an empty string if the element exists and the attribute doesn't" do
-      expect(browser.strong(index: 1).class_name).to eq ''
-    end
-
-    it "raises UnknownObjectException if the element doesn't exist" do
-      expect { browser.strong(id: 'no_such_id').class_name }.to raise_unknown_object_exception
-    end
-  end
-
   describe '#id' do
     it 'returns the id attribute' do
       expect(browser.strong(index: 0).id).to eq 'descartes'

data/spec/watirspec/elements/table_nesting_spec.rb

@@ -7,7 +7,7 @@ describe 'Table' do
 
   # not a selenium bug - IE seems unable to deal with the invalid nesting
   not_compliant_on :internet_explorer do
-    it 'returns the correct number of rows under a table' do
+    it 'returns the correct number of rows under a table element' do
       tables = browser.div(id: 'table-rows-test').tables(id: /^tbl/)
       expect(tables.length).to be > 0
 

data/spec/watirspec/elements/table_spec.rb

@@ -103,6 +103,7 @@ describe 'Table' do
 
     it 'finds rows belonging to this table' do
       expect(table.row(id: 'outer_last')).to exist
+      table.row(text: 'Table 1, Row 1, Cell 1').locate
       expect(table.row(text: /Table 1, Row 1, Cell 1/)).to exist
     end
 
@@ -148,4 +149,10 @@ describe 'Table' do
       expect(bodies[1].id).to eq 'second'
     end
   end
+
+  describe '#each' do
+    it 'allows iterating over the rows in a table' do
+      expect(browser.table(id: 'inner').to_a).to all be_a Watir::Row
+    end
+  end
 end