watir 6.15.0 → 6.15.1

data/spec/watirspec/selector_builder/row_spec.rb

@@ -10,12 +10,11 @@ describe Watir::Locators::Row::SelectorBuilder do
 
       @scope_tag_name ||= @query_scope.tag_name
 
-      built = selector_builder.build(@selector)
-      expect(built).to eq [@wd_locator, (@remaining || {})]
+      expect(selector_builder.build(@selector)).to eq @built
 
       next unless @data_locator || @tag_name
 
-      expect { @located = @query_scope.wd.first(@wd_locator) }.not_to raise_exception
+      expect { @located = @query_scope.wd.first(@built) }.not_to raise_exception
 
       if @data_locator
         expect(@located.attribute('data-locator')).to eq(@data_locator)
@@ -34,7 +33,7 @@ describe Watir::Locators::Row::SelectorBuilder do
       it 'with only table query scope' do
         @query_scope = browser.element(id: 'outer').locate
         @selector = {}
-        @wd_locator = {xpath: "./*[local-name()='tr'] | ./*[local-name()='tbody']/*[local-name()='tr'] | " \
+        @built = {xpath: "./*[local-name()='tr'] | ./*[local-name()='tbody']/*[local-name()='tr'] | " \
 "./*[local-name()='thead']/*[local-name()='tr'] | ./*[local-name()='tfoot']/*[local-name()='tr']"}
         @data_locator = 'first row'
       end
@@ -42,21 +41,21 @@ describe Watir::Locators::Row::SelectorBuilder do
       it 'with tbody query scope' do
         @query_scope = browser.element(id: 'first').locate
         @selector = {}
-        @wd_locator = {xpath: "./*[local-name()='tr']"}
+        @built = {xpath: "./*[local-name()='tr']"}
         @data_locator = 'tbody row'
       end
 
       it 'with thead query scope' do
         @query_scope = browser.element(id: 'tax_headers').locate
         @selector = {}
-        @wd_locator = {xpath: "./*[local-name()='tr']"}
+        @built = {xpath: "./*[local-name()='tr']"}
         @data_locator = 'thead row'
       end
 
       it 'with tfoot query scope' do
         @query_scope = browser.element(id: 'tax_totals').locate
         @selector = {}
-        @wd_locator = {xpath: "./*[local-name()='tr']"}
+        @built = {xpath: "./*[local-name()='tr']"}
         @data_locator = 'tfoot row'
       end
     end
@@ -69,7 +68,7 @@ describe Watir::Locators::Row::SelectorBuilder do
       it 'positive' do
         @query_scope = browser.element(id: 'outer').locate
         @selector = {index: 1}
-        @wd_locator = {xpath: "(./*[local-name()='tr'] | ./*[local-name()='tbody']/*[local-name()='tr'] | " \
+        @built = {xpath: "(./*[local-name()='tr'] | ./*[local-name()='tbody']/*[local-name()='tr'] | " \
 "./*[local-name()='thead']/*[local-name()='tr'] | ./*[local-name()='tfoot']/*[local-name()='tr'])[2]"}
         @data_locator = 'middle row'
       end
@@ -77,7 +76,7 @@ describe Watir::Locators::Row::SelectorBuilder do
       it 'negative' do
         @query_scope = browser.element(id: 'outer').locate
         @selector = {index: -3}
-        @wd_locator = {xpath: "(./*[local-name()='tr'] | ./*[local-name()='tbody']/*[local-name()='tr'] | " \
+        @built = {xpath: "(./*[local-name()='tr'] | ./*[local-name()='tbody']/*[local-name()='tr'] | " \
 "./*[local-name()='thead']/*[local-name()='tr'] | ./*[local-name()='tfoot']/*[local-name()='tr'])[last()-2]"}
         @data_locator = 'first row'
       end
@@ -85,7 +84,7 @@ describe Watir::Locators::Row::SelectorBuilder do
       it 'last' do
         @query_scope = browser.element(id: 'outer').locate
         @selector = {index: -1}
-        @wd_locator = {xpath: "(./*[local-name()='tr'] | ./*[local-name()='tbody']/*[local-name()='tr'] | " \
+        @built = {xpath: "(./*[local-name()='tr'] | ./*[local-name()='tbody']/*[local-name()='tr'] | " \
 "./*[local-name()='thead']/*[local-name()='tr'] | ./*[local-name()='tfoot']/*[local-name()='tr'])[last()]"}
         @data_locator = 'last row'
       end
@@ -93,7 +92,7 @@ describe Watir::Locators::Row::SelectorBuilder do
       it 'does not return index if it is zero' do
         @query_scope = browser.element(id: 'outer').locate
         @selector = {index: 0}
-        @wd_locator = {xpath: "./*[local-name()='tr'] | ./*[local-name()='tbody']/*[local-name()='tr'] | " \
+        @built = {xpath: "./*[local-name()='tr'] | ./*[local-name()='tbody']/*[local-name()='tr'] | " \
 "./*[local-name()='thead']/*[local-name()='tr'] | ./*[local-name()='tfoot']/*[local-name()='tr']"}
         @data_locator = 'first row'
       end
@@ -101,7 +100,7 @@ describe Watir::Locators::Row::SelectorBuilder do
       it 'raises exception when index is not an Integer', skip_after: true do
         @query_scope = browser.element(id: 'outer').locate
         selector = {index: 'foo'}
-        msg = 'expected Integer, got "foo":String'
+        msg = /expected one of \[(Integer|Fixnum)\], got "foo":String/
         expect { selector_builder.build(selector) }.to raise_exception TypeError, msg
       end
     end
@@ -114,7 +113,7 @@ describe Watir::Locators::Row::SelectorBuilder do
 
       it 'attribute and class' do
         @selector = {id: 'gregory', class: /brick/}
-        @wd_locator = {xpath: "./*[local-name()='tr'][contains(@class, 'brick')][@id='gregory'] | " \
+        @built = {xpath: "./*[local-name()='tr'][contains(@class, 'brick')][@id='gregory'] | " \
 "./*[local-name()='tbody']/*[local-name()='tr'][contains(@class, 'brick')][@id='gregory'] | " \
 "./*[local-name()='thead']/*[local-name()='tr'][contains(@class, 'brick')][@id='gregory'] | " \
 "./*[local-name()='tfoot']/*[local-name()='tr'][contains(@class, 'brick')][@id='gregory']"}
@@ -130,9 +129,8 @@ describe Watir::Locators::Row::SelectorBuilder do
 
       it 'any text value' do
         @selector = {text: 'Gregory'}
-        @wd_locator = {xpath: "./*[local-name()='tr'] | ./*[local-name()='tbody']/*[local-name()='tr'] | " \
-"./*[local-name()='thead']/*[local-name()='tr'] | ./*[local-name()='tfoot']/*[local-name()='tr']"}
-        @remaining = {text: 'Gregory'}
+        @built = {xpath: "./*[local-name()='tr'] | ./*[local-name()='tbody']/*[local-name()='tr'] | " \
+"./*[local-name()='thead']/*[local-name()='tr'] | ./*[local-name()='tfoot']/*[local-name()='tr']", text: 'Gregory'}
       end
     end
 
@@ -143,7 +141,7 @@ describe Watir::Locators::Row::SelectorBuilder do
       @query_scope = browser.element(id: 'gregory').locate
 
       @selector = {adjacent: :ancestor, index: 1}
-      @wd_locator = {xpath: './ancestor::*[2]'}
+      @built = {xpath: './ancestor::*[2]'}
       @data_locator = 'top table'
     end
   end

data/spec/watirspec/selector_builder/text_spec.rb

@@ -27,12 +27,11 @@ describe Watir::Locators::TextField::SelectorBuilder do
 
       @query_scope ||= browser
 
-      built = selector_builder.build(@selector)
-      expect(built).to eq [@wd_locator, (@remaining || {})]
+      expect(selector_builder.build(@selector)).to eq @built
 
       next unless @data_locator || @tag_name
 
-      expect { @located = @query_scope.wd.first(@wd_locator) }.not_to raise_exception
+      expect { @located = @query_scope.wd.first(@built) }.not_to raise_exception
 
       if @data_locator
         expect(@located.attribute('data-locator')).to eq(@data_locator)
@@ -46,7 +45,7 @@ describe Watir::Locators::TextField::SelectorBuilder do
     it 'without any arguments' do
       browser.goto(WatirSpec.url_for('forms_with_input_elements.html'))
       @selector = {}
-      @wd_locator = {xpath: ".//*[local-name()='input'][not(@type) or (#{negative_types})]"}
+      @built = {xpath: ".//*[local-name()='input'][not(@type) or (#{negative_types})]"}
       @data_locator = 'input name'
     end
 
@@ -55,27 +54,27 @@ describe Watir::Locators::TextField::SelectorBuilder do
 
       it 'specified text field type that is text' do
         @selector = {type: 'text'}
-        @wd_locator = {xpath: ".//*[local-name()='input']" \
+        @built = {xpath: ".//*[local-name()='input']" \
 "[translate(@type,'#{uppercase}','#{lowercase}')='text']"}
         @data_locator = 'first text'
       end
 
       it 'specified text field type that is not text' do
         @selector = {type: 'number'}
-        @wd_locator = {xpath: ".//*[local-name()='input']" \
+        @built = {xpath: ".//*[local-name()='input']" \
 "[translate(@type,'#{uppercase}','#{lowercase}')='number']"}
         @data_locator = '42'
       end
 
       it 'true locates text field with a type specified' do
         @selector = {type: true}
-        @wd_locator = {xpath: ".//*[local-name()='input'][#{negative_types}]"}
+        @built = {xpath: ".//*[local-name()='input'][#{negative_types}]"}
         @data_locator = 'input name'
       end
 
       it 'false locates text field without type specified' do
         @selector = {type: false}
-        @wd_locator = {xpath: ".//*[local-name()='input'][not(@type)]"}
+        @built = {xpath: ".//*[local-name()='input'][not(@type)]"}
         @data_locator = 'input name'
       end
 
@@ -94,31 +93,31 @@ describe Watir::Locators::TextField::SelectorBuilder do
 
       it 'positive' do
         @selector = {index: 4}
-        @wd_locator = {xpath: "(.//*[local-name()='input'][not(@type) or (#{negative_types})])[5]"}
+        @built = {xpath: "(.//*[local-name()='input'][not(@type) or (#{negative_types})])[5]"}
         @data_locator = 'dev'
       end
 
       it 'negative' do
         @selector = {index: -3}
-        @wd_locator = {xpath: "(.//*[local-name()='input'][not(@type) or (#{negative_types})])[last()-2]"}
+        @built = {xpath: "(.//*[local-name()='input'][not(@type) or (#{negative_types})])[last()-2]"}
         @data_locator = '42'
       end
 
       it 'last' do
         @selector = {index: -1}
-        @wd_locator = {xpath: "(.//*[local-name()='input'][not(@type) or (#{negative_types})])[last()]"}
+        @built = {xpath: "(.//*[local-name()='input'][not(@type) or (#{negative_types})])[last()]"}
         @data_locator = 'last text'
       end
 
       it 'does not return index if it is zero' do
         @selector = {index: 0}
-        @wd_locator = {xpath: ".//*[local-name()='input'][not(@type) or (#{negative_types})]"}
+        @built = {xpath: ".//*[local-name()='input'][not(@type) or (#{negative_types})]"}
         @data_locator = 'input name'
       end
 
       it 'raises exception when index is not an Integer', skip_after: true do
         selector = {index: 'foo'}
-        msg = 'expected Integer, got "foo":String'
+        msg = /expected one of \[(Integer|Fixnum)\], got "foo":String/
         expect { selector_builder.build(selector) }.to raise_exception TypeError, msg
       end
     end
@@ -128,20 +127,51 @@ describe Watir::Locators::TextField::SelectorBuilder do
 
       it 'String for value' do
         @selector = {text: 'Developer'}
-        @wd_locator = {xpath: ".//*[local-name()='input'][not(@type) or (#{negative_types})]"}
-        @remaining = {text: 'Developer'}
+        @built = {xpath: ".//*[local-name()='input'][not(@type) or (#{negative_types})]", text: 'Developer'}
       end
 
       it 'Simple Regexp for value' do
         @selector = {text: /Dev/}
-        @wd_locator = {xpath: ".//*[local-name()='input'][not(@type) or (#{negative_types})]"}
-        @remaining = {text: /Dev/}
+        @built = {xpath: ".//*[local-name()='input'][not(@type) or (#{negative_types})]", text: /Dev/}
       end
 
       it 'returns complicated Regexp to the locator as a value' do
         @selector = {text: /^foo$/}
-        @wd_locator = {xpath: ".//*[local-name()='input'][not(@type) or (#{negative_types})]"}
-        @remaining = {text: /^foo$/}
+        @built = {xpath: ".//*[local-name()='input'][not(@type) or (#{negative_types})]", text: /^foo$/}
+      end
+    end
+
+    context 'with label' do
+      before(:each) { browser.goto(WatirSpec.url_for('forms_with_input_elements.html')) }
+
+      it 'using String' do
+        @selector = {label: 'First name'}
+        @built = {xpath: ".//*[local-name()='input'][not(@type) or (#{negative_types})]" \
+"[@id=//label[normalize-space()='First name']/@for or parent::label[normalize-space()='First name']]"}
+        @data_locator = 'input name'
+      end
+
+      it 'uses String with hidden text' do
+        @selector = {label: 'With hidden text'}
+        @built = {xpath: ".//*[local-name()='input'][not(@type) or (#{negative_types})]" \
+"[@id=//label[normalize-space()='With hidden text']/@for or parent::label[normalize-space()='With hidden text']]"}
+        @data_locator = 'hidden'
+      end
+
+      # Desired Behavior
+      xit 'using simple Regexp' do
+        @selector = {label: /First/}
+        @built = {xpath: ".//*[local-name()='input'][not(@type) or (#{negative_types})]" \
+"[@id=//label[contains(text(), 'First')]/@for or parent::label[contains(text(), 'First')]]"}
+        @data_locator = 'input name'
+      end
+
+      # Desired Behavior
+      xit 'using complex Regexp' do
+        @selector = {label: /([qa])st? name/}
+        @built = {xpath: ".//*[local-name()='input'][not(@type) or (#{negative_types})]" \
+"[@id=//label[contains(text(), 's') and contains(text(), ' name')]/@for or " \
+"parent::label[contains(text(), 's') and contains(text(), ' name')]]", label_element: /([qa])st? name/}
       end
     end
 
@@ -152,9 +182,8 @@ describe Watir::Locators::TextField::SelectorBuilder do
 
       it 'locates using tag name, class, attributes and text' do
         @selector = {text: 'Developer', class: /c/, id: true}
-        @wd_locator = {xpath: ".//*[local-name()='input'][contains(@class, 'c')]" \
-"[not(@type) or (#{negative_types})][@id]"}
-        @remaining = {text: 'Developer'}
+        @built = {xpath: ".//*[local-name()='input'][contains(@class, 'c')]" \
+"[not(@type) or (#{negative_types})][@id]", text: 'Developer'}
       end
 
       it 'delegates adjacent to Element SelectorBuilder' do
@@ -162,7 +191,7 @@ describe Watir::Locators::TextField::SelectorBuilder do
         @query_scope = browser.element(id: 'new_user_email').locate
 
         @selector = {adjacent: :ancestor, index: 1}
-        @wd_locator = {xpath: './ancestor::*[2]'}
+        @built = {xpath: './ancestor::*[2]'}
         @data_locator = 'form'
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: watir
 version: !ruby/object:Gem::Version
-  version: 6.15.0
+  version: 6.15.1
 platform: ruby
 authors:
 - Alex Rodionov
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-11-07 00:00:00.000000000 Z
+date: 2018-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver