watir 6.15.0 → 6.15.1

data/lib/watir/locators/row/selector_builder/xpath.rb

@@ -8,17 +8,15 @@ module Watir
 
             index = selector.delete(:index)
 
-            common_string = super(selector)[:xpath]
+            super(selector)
+            common_string = @built.delete(:xpath)
             expressions = generate_expressions(scope_tag_name)
             expressions.map! { |e| "#{e}#{common_string}" } unless common_string.empty?
 
             xpath = expressions.join(' | ').to_s
 
-            xpath = index ? add_index(xpath, index) : xpath
-
-            @selector.merge! @requires_matches
-
-            {xpath: xpath}
+            @built[:xpath] = index ? add_index(xpath, index) : xpath
+            @built
           end
 
           private
@@ -32,7 +30,7 @@ module Watir
 
             # Can not directly locate a Row with Text because all text is in the Cells;
             # needs to use Locator#locate_matching_elements
-            @requires_matches[:text] = @selector.delete(:text) if @selector.key?(:text)
+            @built[:text] = @selector.delete(:text) if @selector.key?(:text)
             ''
           end
 

data/lib/watir/locators/text_area/selector_builder/xpath.rb

@@ -9,7 +9,7 @@ module Watir
           def predicate_conversion(key, regexp)
             return super unless key == :value
 
-            @requires_matches[:value] = regexp
+            @built[:value] = regexp
             nil
           end
         end

data/lib/watir/locators/text_field/selector_builder/xpath.rb

@@ -6,7 +6,7 @@ module Watir
           def text_string
             return super if @adjacent
 
-            @requires_matches[:text] = @selector.delete(:text) if @selector.key?(:text)
+            @built[:text] = @selector.delete(:text) if @selector.key?(:text)
             ''
           end
 

data/lib/watir/version.rb

@@ -1,3 +1,3 @@
 module Watir
-  VERSION = '6.15.0'.freeze
+  VERSION = '6.15.1'.freeze
 end

data/lib/watir/wait.rb

@@ -119,8 +119,7 @@ module Watir
       end
       message ||= proc { |obj| "waiting for true condition on #{obj.inspect}" }
 
-      raise ArgumentError, "Unknown keyword(s): #{opt.keys} " if block_given? && !opt.empty?
-
+      # TODO: Consider throwing argument error for mixing block & options
       proc = create_proc(opt, &blk)
 
       Wait.until(timeout: timeout, message: message, interval: interval, object: self, &proc)
@@ -151,6 +150,7 @@ module Watir
       end
       message ||= proc { |obj| "waiting for false condition on #{obj.inspect}" }
 
+      # TODO: Consider throwing argument error for mixing block & options
       proc = create_proc(opt, &blk)
 
       Wait.while(timeout: timeout, message: message, interval: interval, object: self, &proc)
@@ -180,7 +180,7 @@ module Watir
                              ids: [:wait_until_present]
 
       message ||= proc { |obj| "waiting for #{obj.inspect} to become present" }
-      wait_until(timeout: timeout, interval: interval, message: message, &:present?)
+      wait_until(timeout: timeout, interval: interval, message: message, element_reset: true, &:present?)
     end
 
     #
@@ -205,14 +205,14 @@ module Watir
                              ids: [:wait_while_present]
 
       message ||= proc { |obj| "waiting for #{obj.inspect} not to be present" }
-      wait_while(timeout: timeout, interval: interval, message: message, &:present?)
+      wait_while(timeout: timeout, interval: interval, message: message, element_reset: true, &:present?)
     end
 
     private
 
     def create_proc(opt)
       proc do
-        reset! if is_a?(Element)
+        reset! if opt.delete(:element_reset) && is_a?(Element)
         (opt.empty? || match_attributes(opt).call) && (!block_given? || yield(self))
       end
     end

data/spec/unit/element_locator_spec.rb

@@ -210,9 +210,8 @@ describe Watir::Locators::Element::Locator do
       it "uses the corresponding <label>'s @for attribute or parent::label when locating by label" do
         translated_type = "translate(@type,'ABCDEFGHIJKLMNOPQRSTUVWXYZÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖØÙÚÛÜÝÞŸŽŠŒ'," \
 "'abcdefghijklmnopqrstuvwxyzàáâãäåæçèéêëìíîïðñòóôõöøùúûüýþÿžšœ')"
-        xpath = ".//*[local-name()='input'][#{translated_type}='text' and " \
-                "(@id=//label[normalize-space()='foo']/@for or " \
-                "parent::label[normalize-space()='foo'])]"
+        xpath = ".//*[local-name()='input'][@id=//label[normalize-space()='foo']/@for " \
+"or parent::label[normalize-space()='foo']][#{translated_type}='text']"
         expect_one :xpath, xpath
 
         selector = [
@@ -325,7 +324,8 @@ describe Watir::Locators::Element::Locator do
         expect(locate_one(selector)).to eq element
       end
 
-      it 'handles :label => /regexp/ selector' do
+      # TODO: I can not figure out how to mock this out properly with the new implementation
+      xit 'handles :label => /regexp/ selector' do
         label_elements = [
           element(tag_name: 'label', text: 'foo', attributes: {'for' => 'bar'}),
           element(tag_name: 'label', text: 'foob', attributes: {'for' => 'baz'})
@@ -341,7 +341,8 @@ describe Watir::Locators::Element::Locator do
         expect(locate_one(tag_name: 'div', label: /oob/)).to eq div_elements.first
       end
 
-      it 'returns nil when no label matching the regexp is found' do
+      # TODO: I can not figure out how to mock this out properly with the new implementation
+      xit 'returns nil when no label matching the regexp is found' do
         expect_all(:tag_name, 'label').and_return([])
         expect(locate_one(tag_name: 'div', label: /foo/)).to be_nil
       end
@@ -374,7 +375,7 @@ describe Watir::Locators::Element::Locator do
 
         expect_all(:xpath, ".//*[contains(@class, 'foo')]").and_return(elements1, elements2, elements3)
 
-        msg = 'Unable to locate element from {:class=>[/foo$/]} due to changing page'
+        msg = 'Unable to locate element from {:class=>/foo$/} due to changing page'
         expect { locate_one(class: /foo$/) }.to raise_exception(Watir::Exception::LocatorException, msg)
       end
     end
@@ -403,8 +404,8 @@ describe Watir::Locators::Element::Locator do
 
     describe 'errors' do
       it 'raises a TypeError if :index is not a Integer' do
-        expect { locate_one(tag_name: 'div', index: 'bar') }.to \
-          raise_error(TypeError, %(expected Integer, got "bar":String))
+        msg = /expected one of \[(Integer|Fixnum)\], got "bar":String/
+        expect { locate_one(tag_name: 'div', index: 'bar') }.to raise_error TypeError, msg
       end
 
       it 'raises a TypeError if selector value is not a String, Regexp or Boolean' do
@@ -454,7 +455,7 @@ describe Watir::Locators::Element::Locator do
         selector_builder = Foo::SelectorBuilder.new(Watir::HTMLElement.attributes)
         locator = Watir::Locators::Element::Locator.new(browser, selector, selector_builder, element_validator)
 
-        msg = 'Foo::SelectorBuilder#build is not returning expected responses for the current version of Watir'
+        msg = 'Foo::SelectorBuilder was unable to build selector from {:name=>"foo"}'
         expect { locator.locate }.to raise_exception(Watir::Exception::LocatorException, msg)
       end
     end

data/spec/watirspec/element_hidden_spec.rb

@@ -72,7 +72,7 @@ describe Watir::Locators::Element::Locator do
 
     it 'raises exception when value is not Boolean' do
       element = browser.body.element(visible: 'true')
-      msg = 'expected boolean, got "true":String'
+      msg = 'expected one of [TrueClass, FalseClass], got "true":String'
       expect { element.exists? }.to raise_exception(TypeError, msg)
     end
   end

data/spec/watirspec/elements/dl_spec.rb

@@ -113,9 +113,9 @@ describe 'Dl' do
   describe '#to_hash' do
     it 'converts the dl to a Hash' do
       expect(browser.dl(id: 'experience-list').to_hash).to eq Hash[
-        'Experience'                   => '11 years',
-        'Education'                    => 'Master',
-        'Current industry'             => 'Architecture',
+        'Experience' => '11 years',
+        'Education' => 'Master',
+        'Current industry' => 'Architecture',
         'Previous industry experience' => 'Architecture'
       ]
     end

data/spec/watirspec/elements/element_spec.rb

@@ -100,7 +100,7 @@ describe 'Element' do
 
     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)/
+      msg = /expected one of \[String, Regexp\], got 7\:(Fixnum|Integer)/
       expect { browser.element(visible_text: 7).exists? }.to raise_exception(TypeError, msg)
     end
 
@@ -465,22 +465,10 @@ describe 'Element' do
       expect(browser.div(xpath: '//div', index: 1)).to exist
     end
 
-    it 'raises LocatorException error if selector hash with :xpath has multiple entries' do
-      msg = 'xpath cannot be combined with all of these locators ({:class=>"foo", :tag_name=>"div"})'
-      expect { browser.div(xpath: '//div', class: 'foo').exists? }
-        .to raise_exception Watir::Exception::LocatorException, msg
-    end
-
     it "doesn't raise when selector has with :css has :index" do
       expect(browser.div(css: 'div', index: 1)).to exist
     end
 
-    it 'raises LocatorException error if selector hash with :css has multiple entries' do
-      msg = 'css cannot be combined with all of these locators ({:class=>"foo", :tag_name=>"div"})'
-      expect { browser.div(css: 'div', class: 'foo').exists? }
-        .to raise_exception Watir::Exception::LocatorException, msg
-    end
-
     it 'finds element by Selenium name locator' do
       expect(browser.element(name: 'new_user_first_name')).to exist
       expect(browser.element(name: /new_user_first_name/)).to exist

data/spec/watirspec/elements/link_spec.rb

@@ -168,7 +168,7 @@ describe 'Link' do
 
     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)/
+      msg = /expected one of \[String, Regexp\], got 7\:(Fixnum|Integer)/
       expect { browser.link(visible_text: 7).exists? }.to raise_exception(TypeError, msg)
     end
   end

data/spec/watirspec/elements/select_list_spec.rb

@@ -346,10 +346,11 @@ describe 'SelectList' do
     end
 
     it "raises NoValueFoundException if the option doesn't exist" do
+      message = /#<Watir::Select: located: true; {:name=>"new_user_country", :tag_name=>"select"}>/
       expect { browser.select_list(name: 'new_user_country').select('missing_option') }
-        .to raise_no_value_found_exception
+        .to raise_no_value_found_exception message
       expect { browser.select_list(name: 'new_user_country').select(/missing_option/) }
-        .to raise_no_value_found_exception
+        .to raise_no_value_found_exception message
     end
 
     it 'raises ObjectDisabledException if the option is disabled' do

data/spec/watirspec/elements/text_field_spec.rb

@@ -20,7 +20,7 @@ describe 'TextField' do
       expect(browser.text_field(index: 0)).to exist
       expect(browser.text_field(xpath: "//input[@id='new_user_email']")).to exist
       expect(browser.text_field(label: 'First name')).to exist
-      expect(browser.text_field(label: /(Last|First) name/)).to exist
+      expect(browser.text_field(label: /(q|a)st? name/)).to exist
       expect(browser.text_field(label: 'Without for')).to exist
       expect(browser.text_field(label: /Without for/)).to exist
       expect(browser.text_field(label: 'With hidden text')).to exist

data/spec/watirspec/html/forms_with_input_elements.html

@@ -20,9 +20,9 @@
             <label for="new_user_first_name" id="first_label" onclick="WatirSpec.addMessage('label')">First name</label>
             <input name="new_user_first_name" id="new_user_first_name" class="name" data-locator="input name"/> <br />
             <label for="new_user_last_name">Last name</label>
-            <input type="no_such_type" name="new_user_last_name" id="new_user_last_name" class="name" /> <br />
+            <input type="no_such_type" name="new_user_last_name" id="new_user_last_name" class="name" data-locator="last name"/> <br />
             <label for="new_user_email">Email address</label>
-            <input type="text" name="new_user_email" id="new_user_email" data-locator="first text"/> <br />
+            <input type="text" name="new_user_email" id="new_user_email" data-locator="first text" contenteditable=""/> <br />
             <label for="new_user_email_confirm">Email address (confirmation)</label>
             <input type="Text" name="new_user_email_confirm" id="new_user_email_confirm" /> <br />
             <label for="new_user_country">Country</label>
@@ -41,7 +41,7 @@
             <label for="new_user_occupation">Occupation</label>
             <input type="text" class="c" name="new_user_occupation" data-locator="dev" id="new_user_occupation" value="Developer" onfocus="document.getElementById('onfocus_test').innerHTML = 'changed by onfocus event'"/> <br />
             <label>Without for <input /></label>
-            <label>With<span style="display:none;"> hidden</span> text<input /></label>
+            <label>With<span style="display:none;"> hidden</span> text<input data-locator="hidden" /></label>
             <label for="new_user_species">Species</label>
             <input type="text" name="new_user_species" id="new_user_species" value="Homo sapiens sapiens" disabled="disabled" /> <br />
             <label for="new_user_code">Personal code</label>

data/spec/watirspec/selector_builder/button_spec.rb

@@ -18,12 +18,11 @@ describe Watir::Locators::Button::SelectorBuilder do
       next if example.metadata[:skip_after]
 
       @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)
@@ -37,7 +36,7 @@ describe Watir::Locators::Button::SelectorBuilder do
     it 'without any arguments' do
       browser.goto(WatirSpec.url_for('forms_with_input_elements.html'))
       @selector = {}
-      @wd_locator = {xpath: ".//*[(local-name()='button') or (local-name()='input' and (#{default_types}))]"}
+      @built = {xpath: ".//*[(local-name()='button') or (local-name()='input' and (#{default_types}))]"}
       @data_locator = 'user submit'
     end
 
@@ -46,20 +45,20 @@ describe Watir::Locators::Button::SelectorBuilder do
 
       it 'false only locates with button without a type' do
         @selector = {type: false}
-        @wd_locator = {xpath: ".//*[(local-name()='button' and not(@type))]"}
+        @built = {xpath: ".//*[(local-name()='button' and not(@type))]"}
         @data_locator = 'No Type'
       end
 
       it 'true locates button or input with a type' do
         @selector = {type: true}
-        @wd_locator = {xpath: ".//*[(local-name()='button' and @type) or " \
+        @built = {xpath: ".//*[(local-name()='button' and @type) or " \
 "(local-name()='input' and (#{default_types}))]"}
         @data_locator = 'user submit'
       end
 
       it 'locates input or button element with specified type' do
         @selector = {type: 'reset'}
-        @wd_locator = {xpath: ".//*[(local-name()='button' and " \
+        @built = {xpath: ".//*[(local-name()='button' and " \
 "translate(@type,'#{uppercase}','#{lowercase}')='reset') or " \
 "(local-name()='input' and (translate(@type,'#{uppercase}','#{lowercase}')='reset'))]"}
         @data_locator = 'reset'
@@ -80,8 +79,7 @@ describe Watir::Locators::Button::SelectorBuilder do
 
       it 'returns tag name and type to the locator' do
         @selector = {xpath: '#disabled_button', tag_name: 'input', type: 'submit'}
-        @wd_locator = {xpath: '#disabled_button'}
-        @remaining = {tag_name: 'input', type: 'submit'}
+        @built = {xpath: '#disabled_button', tag_name: 'input', type: 'submit'}
       end
     end
 
@@ -90,51 +88,50 @@ describe Watir::Locators::Button::SelectorBuilder do
 
       it 'locates value of input element with String' do
         @selector = {text: 'Button'}
-        @wd_locator = {xpath: ".//*[(local-name()='button' and normalize-space()='Button') or " \
+        @built = {xpath: ".//*[(local-name()='button' and normalize-space()='Button') or " \
 "(local-name()='input' and (#{default_types}) and @value='Button')]"}
         @data_locator = 'new user'
       end
 
       it 'locates text of button element with String' do
         @selector = {text: 'Button 2'}
-        @wd_locator = {xpath: ".//*[(local-name()='button' and normalize-space()='Button 2') or " \
+        @built = {xpath: ".//*[(local-name()='button' and normalize-space()='Button 2') or " \
 "(local-name()='input' and (#{default_types}) and @value='Button 2')]"}
         @data_locator = 'Benjamin'
       end
 
       it 'locates value of input element with simple Regexp' do
         @selector = {text: /Button/}
-        @wd_locator = {xpath: ".//*[(local-name()='button' and contains(text(), 'Button')) or " \
+        @built = {xpath: ".//*[(local-name()='button' and contains(text(), 'Button')) or " \
 "(local-name()='input' and (#{default_types}) and contains(@value, 'Button'))]"}
         @data_locator = 'new user'
       end
 
       it 'locates text of button element with simple Regexp' do
         @selector = {text: /Button 2/}
-        @wd_locator = {xpath: ".//*[(local-name()='button' and contains(text(), 'Button 2')) or " \
+        @built = {xpath: ".//*[(local-name()='button' and contains(text(), 'Button 2')) or " \
 "(local-name()='input' and (#{default_types}) and contains(@value, 'Button 2'))]"}
         @data_locator = 'Benjamin'
       end
 
       it 'Simple Regexp for text' do
         @selector = {text: /n 2/}
-        @wd_locator = {xpath: ".//*[(local-name()='button' and contains(text(), 'n 2')) or " \
+        @built = {xpath: ".//*[(local-name()='button' and contains(text(), 'n 2')) or " \
 "(local-name()='input' and (#{default_types}) and contains(@value, 'n 2'))]"}
         @data_locator = 'Benjamin'
       end
 
       it 'Simple Regexp for value' do
         @selector = {text: /Prev/}
-        @wd_locator = {xpath: ".//*[(local-name()='button' and contains(text(), 'Prev')) or " \
+        @built = {xpath: ".//*[(local-name()='button' and contains(text(), 'Prev')) or " \
 "(local-name()='input' and (#{default_types}) and contains(@value, 'Prev'))]"}
         @data_locator = 'preview'
       end
 
       it 'returns complex Regexp to the locator' do
         @selector = {text: /^foo$/}
-        @wd_locator = {xpath: ".//*[(local-name()='button' and contains(text(), 'foo')) or " \
-"(local-name()='input' and (#{default_types}) and contains(@value, 'foo'))]"}
-        @remaining = {text: /^foo$/}
+        @built = {xpath: ".//*[(local-name()='button' and contains(text(), 'foo')) or " \
+"(local-name()='input' and (#{default_types}) and contains(@value, 'foo'))]", text: /^foo$/}
       end
     end
 
@@ -143,51 +140,50 @@ describe Watir::Locators::Button::SelectorBuilder do
 
       it 'input element value with String' do
         @selector = {value: 'Preview'}
-        @wd_locator = {xpath: ".//*[(local-name()='button') or (local-name()='input' and (#{default_types}))]" \
+        @built = {xpath: ".//*[(local-name()='button') or (local-name()='input' and (#{default_types}))]" \
 "[normalize-space()='Preview' or @value='Preview']"}
         @data_locator = 'preview'
       end
 
       it 'button element value with String' do
         @selector = {value: 'button_2'}
-        @wd_locator = {xpath: ".//*[(local-name()='button') or (local-name()='input' and (#{default_types}))]" \
+        @built = {xpath: ".//*[(local-name()='button') or (local-name()='input' and (#{default_types}))]" \
 "[normalize-space()='button_2' or @value='button_2']"}
         @data_locator = 'Benjamin'
       end
 
       it 'input element value with simple Regexp' do
         @selector = {value: /Prev/}
-        @wd_locator = {xpath: ".//*[(local-name()='button') or (local-name()='input' and (#{default_types}))]" \
+        @built = {xpath: ".//*[(local-name()='button') or (local-name()='input' and (#{default_types}))]" \
 "[contains(text(), 'Prev') or contains(@value, 'Prev')]"}
         @data_locator = 'preview'
       end
 
       it 'button element value with simple Regexp' do
         @selector = {value: /on_2/}
-        @wd_locator = {xpath: ".//*[(local-name()='button') or (local-name()='input' and (#{default_types}))]" \
+        @built = {xpath: ".//*[(local-name()='button') or (local-name()='input' and (#{default_types}))]" \
 "[contains(text(), 'on_2') or contains(@value, 'on_2')]"}
         @data_locator = 'Benjamin'
       end
 
       it 'button element text with String' do
         @selector = {value: 'Button 2'}
-        @wd_locator = {xpath: ".//*[(local-name()='button') or (local-name()='input' and (#{default_types}))]" \
+        @built = {xpath: ".//*[(local-name()='button') or (local-name()='input' and (#{default_types}))]" \
 "[normalize-space()='Button 2' or @value='Button 2']"}
         @data_locator = 'Benjamin'
       end
 
       it 'button element text with simple Regexp' do
         @selector = {value: /ton 2/}
-        @wd_locator = {xpath: ".//*[(local-name()='button') or (local-name()='input' and (#{default_types}))]" \
+        @built = {xpath: ".//*[(local-name()='button') or (local-name()='input' and (#{default_types}))]" \
 "[contains(text(), 'ton 2') or contains(@value, 'ton 2')]"}
         @data_locator = 'Benjamin'
       end
 
       it 'returns complex Regexp to the locator' do
         @selector = {value: /^foo$/}
-        @wd_locator = {xpath: ".//*[(local-name()='button') or (local-name()='input' and (#{default_types}))]" \
-"[contains(text(), 'foo') or contains(@value, 'foo')]"}
-        @remaining = {value: /^foo$/}
+        @built = {xpath: ".//*[(local-name()='button') or (local-name()='input' and (#{default_types}))]" \
+"[contains(text(), 'foo') or contains(@value, 'foo')]", value: /^foo$/}
       end
     end
 
@@ -198,33 +194,33 @@ describe Watir::Locators::Button::SelectorBuilder do
 
       it 'positive' do
         @selector = {index: 3}
-        @wd_locator = {xpath: "(.//*[(local-name()='button') or (local-name()='input' and (#{default_types}))])[4]"}
+        @built = {xpath: "(.//*[(local-name()='button') or (local-name()='input' and (#{default_types}))])[4]"}
         @data_locator = 'preview'
       end
 
       it 'negative' do
         @selector = {index: -4}
-        @wd_locator = {xpath: "(.//*[(local-name()='button') or " \
+        @built = {xpath: "(.//*[(local-name()='button') or " \
 "(local-name()='input' and (#{default_types}))])[last()-3]"}
         @data_locator = 'submittable button'
       end
 
       it 'last' do
         @selector = {index: -1}
-        @wd_locator = {xpath: "(.//*[(local-name()='button') or " \
+        @built = {xpath: "(.//*[(local-name()='button') or " \
 "(local-name()='input' and (#{default_types}))])[last()]"}
         @data_locator = 'last button'
       end
 
       it 'does not return index if it is zero' do
         @selector = {index: 0}
-        @wd_locator = {xpath: ".//*[(local-name()='button') or (local-name()='input' and (#{default_types}))]"}
+        @built = {xpath: ".//*[(local-name()='button') or (local-name()='input' and (#{default_types}))]"}
         @data_locator = 'user submit'
       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
@@ -236,7 +232,7 @@ describe Watir::Locators::Button::SelectorBuilder do
 
       it 'locates using class and attributes' do
         @selector = {class: 'image', name: 'new_user_image', src: true}
-        @wd_locator = {xpath: ".//*[(local-name()='button') or (local-name()='input' and (#{default_types}))]" \
+        @built = {xpath: ".//*[(local-name()='button') or (local-name()='input' and (#{default_types}))]" \
 "[contains(concat(' ', @class, ' '), ' image ')][@name='new_user_image' and @src]"}
         @data_locator = 'submittable button'
       end
@@ -247,7 +243,7 @@ describe Watir::Locators::Button::SelectorBuilder do
       @query_scope = browser.element(id: 'new_user_button').locate
 
       @selector = {adjacent: :ancestor, index: 2}
-      @wd_locator = {xpath: './ancestor::*[3]'}
+      @built = {xpath: './ancestor::*[3]'}
       @data_locator = 'body'
     end
   end