watir 6.15.0 → 6.15.1

data/spec/watirspec/selector_builder/cell_spec.rb

@@ -10,12 +10,11 @@ describe Watir::Locators::Cell::SelectorBuilder do
 
       @query_scope ||= browser.element(id: 'gregory').locate
 
-      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)
@@ -29,7 +28,7 @@ describe Watir::Locators::Cell::SelectorBuilder do
     it 'without any arguments' do
       browser.goto(WatirSpec.url_for('tables.html'))
       @selector = {}
-      @wd_locator = {xpath: "./*[local-name()='th' or local-name()='td']"}
+      @built = {xpath: "./*[local-name()='th' or local-name()='td']"}
       @data_locator = 'first cell'
     end
 
@@ -40,31 +39,31 @@ describe Watir::Locators::Cell::SelectorBuilder do
 
       it 'positive' do
         @selector = {index: 3}
-        @wd_locator = {xpath: "(./*[local-name()='th' or local-name()='td'])[4]"}
+        @built = {xpath: "(./*[local-name()='th' or local-name()='td'])[4]"}
         @data_locator = 'after tax'
       end
 
       it 'negative' do
         @selector = {index: -3}
-        @wd_locator = {xpath: "(./*[local-name()='th' or local-name()='td'])[last()-2]"}
+        @built = {xpath: "(./*[local-name()='th' or local-name()='td'])[last()-2]"}
         @data_locator = 'before tax'
       end
 
       it 'last' do
         @selector = {index: -1}
-        @wd_locator = {xpath: "(./*[local-name()='th' or local-name()='td'])[last()]"}
+        @built = {xpath: "(./*[local-name()='th' or local-name()='td'])[last()]"}
         @data_locator = 'after tax'
       end
 
       it 'does not return index if it is zero' do
         @selector = {index: 0}
-        @wd_locator = {xpath: "./*[local-name()='th' or local-name()='td']"}
+        @built = {xpath: "./*[local-name()='th' or local-name()='td']"}
         @data_locator = 'first cell'
       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
@@ -76,7 +75,7 @@ describe Watir::Locators::Cell::SelectorBuilder do
 
       it 'attribute and text' do
         @selector = {headers: /before_tax/, text: '5 934'}
-        @wd_locator = {xpath: "./*[local-name()='th' or local-name()='td']" \
+        @built = {xpath: "./*[local-name()='th' or local-name()='td']" \
 "[normalize-space()='5 934'][contains(@headers, 'before_tax')]"}
         @data_locator = 'before tax'
       end
@@ -86,7 +85,7 @@ describe Watir::Locators::Cell::SelectorBuilder do
       @query_scope = browser.element(id: 'p3').locate
 
       @selector = {adjacent: :ancestor, index: 2}
-      @wd_locator = {xpath: './ancestor::*[3]'}
+      @built = {xpath: './ancestor::*[3]'}
       @data_locator = 'top table'
     end
   end

data/spec/watirspec/selector_builder/element_spec.rb

@@ -9,12 +9,11 @@ describe Watir::Locators::Element::SelectorBuilder do
 
       @attributes ||= Watir::HTMLElement.attribute_list
       @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)
@@ -27,7 +26,7 @@ describe Watir::Locators::Element::SelectorBuilder do
 
     it 'without any arguments' do
       @selector = {}
-      @wd_locator = {xpath: './/*'}
+      @built = {xpath: './/*'}
       @tag_name = 'html'
     end
 
@@ -38,37 +37,37 @@ describe Watir::Locators::Element::SelectorBuilder do
 
       it 'locates with xpath only' do
         @selector = {xpath: './/div'}
-        @wd_locator = @selector.dup
+        @built = @selector.dup
         @data_locator = 'first div'
       end
 
       it 'locates with css only' do
         @selector = {css: 'div'}
-        @wd_locator = @selector.dup
+        @built = @selector.dup
         @data_locator = 'first div'
       end
 
-      it 'raises exception when using xpath & css', skip_after: true do
-        selector = {xpath: './/*', css: 'div'}
-        msg = ':xpath and :css cannot be combined ({:xpath=>".//*", :css=>"div"})'
-        expect { selector_builder.build(selector) }.to raise_exception Watir::Exception::LocatorException, msg
+      it 'locates when attributes combined with xpath' do
+        @selector = {xpath: './/div', random: 'foo'}
+        @built = @selector.dup
+        @data_locator = 'first div'
       end
 
-      it 'raises exception when combining with xpath', skip_after: true do
-        selector = {xpath: './/*', foo: 'div'}
-        msg = 'xpath cannot be combined with all of these locators ({:foo=>"div"})'
-        expect { selector_builder.build(selector) }.to raise_exception Watir::Exception::LocatorException, msg
+      it 'locates when attributes combined with css' do
+        @selector = {css: 'div', random: 'foo'}
+        @built = @selector.dup
+        @data_locator = 'first div'
       end
 
-      it 'raises exception when combining with css', skip_after: true do
-        selector = {css: 'div', foo: 'div'}
-        msg = 'css cannot be combined with all of these locators ({:foo=>"div"})'
+      it 'raises exception when using xpath & css', skip_after: true do
+        selector = {xpath: './/*', css: 'div'}
+        msg = ':xpath and :css cannot be combined ({:xpath=>".//*", :css=>"div"})'
         expect { selector_builder.build(selector) }.to raise_exception Watir::Exception::LocatorException, msg
       end
 
       it 'raises exception when not a String', skip_after: true do
         selector = {xpath: 7}
-        msg = /expected String, got 7:(Fixnum|Integer)/
+        msg = /expected one of \[String\], got 7:(Fixnum|Integer)/
         expect { selector_builder.build(selector) }.to raise_exception TypeError, msg
       end
 
@@ -96,25 +95,25 @@ describe Watir::Locators::Element::SelectorBuilder do
 
       it 'with String equals' do
         @selector = {tag_name: 'div'}
-        @wd_locator = {xpath: ".//*[local-name()='div']"}
+        @built = {xpath: ".//*[local-name()='div']"}
         @data_locator = 'first div'
       end
 
       it 'with simple Regexp contains' do
         @selector = {tag_name: /div/}
-        @wd_locator = {xpath: ".//*[contains(local-name(), 'div')]"}
+        @built = {xpath: ".//*[contains(local-name(), 'div')]"}
         @data_locator = 'first div'
       end
 
       it 'with Symbol' do
         @selector = {tag_name: :div}
-        @wd_locator = {xpath: ".//*[local-name()='div']"}
+        @built = {xpath: ".//*[local-name()='div']"}
         @data_locator = 'first div'
       end
 
       it 'raises exception when not a String or Regexp', skip_after: true do
         selector = {tag_name: 7}
-        msg = /expected string_or_regexp_or_symbol, got 7:(Fixnum|Integer)/
+        msg = /expected one of \[String, Regexp, Symbol\], got 7:(Fixnum|Integer)/
         expect { selector_builder.build(selector) }.to raise_exception TypeError, msg
       end
     end
@@ -126,63 +125,63 @@ describe Watir::Locators::Element::SelectorBuilder do
 
       it 'class_name is converted to class' do
         @selector = {class_name: 'user'}
-        @wd_locator = {xpath: ".//*[contains(concat(' ', @class, ' '), ' user ')]"}
+        @built = {xpath: ".//*[contains(concat(' ', @class, ' '), ' user ')]"}
         @data_locator = 'form'
       end
 
       # TODO: This functionality is deprecated with "class_array"
       it 'values with spaces' do
         @selector = {class_name: 'multiple classes here'}
-        @wd_locator = {xpath: ".//*[contains(concat(' ', @class, ' '), ' multiple classes here ')]"}
+        @built = {xpath: ".//*[contains(concat(' ', @class, ' '), ' multiple classes here ')]"}
         @data_locator = 'first div'
       end
 
       it 'single String concatenates' do
         @selector = {class: 'user'}
-        @wd_locator = {xpath: ".//*[contains(concat(' ', @class, ' '), ' user ')]"}
+        @built = {xpath: ".//*[contains(concat(' ', @class, ' '), ' user ')]"}
         @data_locator = 'form'
       end
 
       it 'Array of String concatenates with and' do
         @selector = {class: %w[multiple here]}
-        @wd_locator = {xpath: ".//*[contains(concat(' ', @class, ' '), ' multiple ') and " \
+        @built = {xpath: ".//*[contains(concat(' ', @class, ' '), ' multiple ') and " \
 "contains(concat(' ', @class, ' '), ' here ')]"}
         @data_locator = 'first div'
       end
 
       it 'simple Regexp contains' do
         @selector = {class_name: /use/}
-        @wd_locator = {xpath: ".//*[contains(@class, 'use')]"}
+        @built = {xpath: ".//*[contains(@class, 'use')]"}
         @data_locator = 'form'
       end
 
       it 'Array of Regexp contains with and' do
         @selector = {class: [/mult/, /her/]}
-        @wd_locator = {xpath: ".//*[contains(@class, 'mult') and contains(@class, 'her')]"}
+        @built = {xpath: ".//*[contains(@class, 'mult') and contains(@class, 'her')]"}
         @data_locator = 'first div'
       end
 
       it 'single negated String concatenates with not' do
         @selector = {class: '!multiple'}
-        @wd_locator = {xpath: ".//*[not(contains(concat(' ', @class, ' '), ' multiple '))]"}
+        @built = {xpath: ".//*[not(contains(concat(' ', @class, ' '), ' multiple '))]"}
         @tag_name = 'html'
       end
 
       it 'single Boolean true provides the at' do
         @selector = {class: true}
-        @wd_locator = {xpath: './/*[@class]'}
+        @built = {xpath: './/*[@class]'}
         @data_locator = 'first div'
       end
 
       it 'single Boolean false provides the not atat' do
         @selector = {class: false}
-        @wd_locator = {xpath: './/*[not(@class)]'}
+        @built = {xpath: './/*[not(@class)]'}
         @tag_name = 'html'
       end
 
       it 'Array of mixed String, Regexp and Boolean contains and concatenates with and and not' do
         @selector = {class: [/mult/, 'classes', '!here']}
-        @wd_locator = {xpath: ".//*[contains(@class, 'mult') and contains(concat(' ', @class, ' '), ' classes ') " \
+        @built = {xpath: ".//*[contains(@class, 'mult') and contains(concat(' ', @class, ' '), ' classes ') " \
 "and not(contains(concat(' ', @class, ' '), ' here '))]"}
         @data_locator = 'second div'
       end
@@ -195,7 +194,7 @@ describe Watir::Locators::Element::SelectorBuilder do
 
       it 'raises exception when Array values are not a String or Regexp', skip_after: true do
         selector = {class: [7]}
-        msg = /expected string_or_regexp, got 7:(Fixnum|Integer)/
+        msg = /expected one of \[String, Regexp, TrueClass, FalseClass\], got 7:(Fixnum|Integer)/
         expect { selector_builder.build(selector) }.to raise_exception TypeError, msg
       end
 
@@ -219,37 +218,37 @@ describe Watir::Locators::Element::SelectorBuilder do
 
       it 'with href attribute' do
         @selector = {href: 'watirspec.css'}
-        @wd_locator = {xpath: ".//*[normalize-space(@href)='watirspec.css']"}
+        @built = {xpath: ".//*[normalize-space(@href)='watirspec.css']"}
         @data_locator = 'link'
       end
 
       it 'with string attribute' do
         @selector = {'name' => 'user_new'}
-        @wd_locator = {xpath: ".//*[@name='user_new']"}
+        @built = {xpath: ".//*[@name='user_new']"}
         @data_locator = 'form'
       end
 
       it 'with String equals' do
         @selector = {name: 'user_new'}
-        @wd_locator = {xpath: ".//*[@name='user_new']"}
+        @built = {xpath: ".//*[@name='user_new']"}
         @data_locator = 'form'
       end
 
       it 'with TrueClass no equals' do
         @selector = {tag_name: 'input', name: true}
-        @wd_locator = {xpath: ".//*[local-name()='input'][@name]"}
+        @built = {xpath: ".//*[local-name()='input'][@name]"}
         @data_locator = 'input name'
       end
 
       it 'with FalseClass not with no equals' do
         @selector = {tag_name: 'input', name: false}
-        @wd_locator = {xpath: ".//*[local-name()='input'][not(@name)]"}
+        @built = {xpath: ".//*[local-name()='input'][not(@name)]"}
         @data_locator = 'input nameless'
       end
 
       it 'with multiple attributes: no equals and not with no equals and equals' do
         @selector = {readonly: true, foo: false, id: 'good_luck'}
-        @wd_locator = {xpath: ".//*[@readonly and not(@foo) and @id='good_luck']"}
+        @built = {xpath: ".//*[@readonly and not(@foo) and @id='good_luck']"}
         @data_locator = 'Good Luck'
       end
 
@@ -273,13 +272,13 @@ describe Watir::Locators::Element::SelectorBuilder do
 
       it 'with Regexp' do
         @selector = {name: /user/}
-        @wd_locator = {xpath: ".//*[contains(@name, 'user')]"}
+        @built = {xpath: ".//*[contains(@name, 'user')]"}
         @data_locator = 'form'
       end
 
       it 'with multiple Regexp attributes separated by and' do
         @selector = {readonly: /read/, id: /good/}
-        @wd_locator = {xpath: ".//*[contains(@readonly, 'read') and contains(@id, 'good')]"}
+        @built = {xpath: ".//*[contains(@readonly, 'read') and contains(@id, 'good')]"}
         @data_locator = 'Good Luck'
       end
     end
@@ -291,20 +290,20 @@ describe Watir::Locators::Element::SelectorBuilder do
 
       it 'String uses normalize space equals' do
         @selector = {text: 'Add user'}
-        @wd_locator = {xpath: ".//*[normalize-space()='Add user']"}
+        @built = {xpath: ".//*[normalize-space()='Add user']"}
         @data_locator = 'add user'
       end
 
       # Deprecated with :caption
       it 'with caption attribute' do
         @selector = {caption: 'Add user'}
-        @wd_locator = {xpath: ".//*[normalize-space()='Add user']"}
+        @built = {xpath: ".//*[normalize-space()='Add user']"}
         @data_locator = 'add user'
       end
 
       it 'raises exception when text is not a String or Regexp', skip_after: true do
         selector = {text: 7}
-        msg = /expected string_or_regexp, got 7:(Fixnum|Integer)/
+        msg = /expected one of \[String, Regexp\], got 7:(Fixnum|Integer)/
         expect { selector_builder.build(selector) }.to raise_exception TypeError, msg
       end
     end
@@ -316,30 +315,30 @@ describe Watir::Locators::Element::SelectorBuilder do
 
       it 'positive' do
         @selector = {tag_name: 'div', index: 7}
-        @wd_locator = {xpath: "(.//*[local-name()='div'])[8]"}
+        @built = {xpath: "(.//*[local-name()='div'])[8]"}
         @data_locator = 'content'
       end
 
       it 'negative' do
         @selector = {tag_name: 'div', index: -7}
-        @wd_locator = {xpath: "(.//*[local-name()='div'])[last()-6]"}
+        @built = {xpath: "(.//*[local-name()='div'])[last()-6]"}
         @data_locator = 'second div'
       end
 
       it 'last' do
         @selector = {tag_name: 'div', index: -1}
-        @wd_locator = {xpath: "(.//*[local-name()='div'])[last()]"}
+        @built = {xpath: "(.//*[local-name()='div'])[last()]"}
         @data_locator = 'content'
       end
 
       it 'does not return index if it is zero' do
         @selector = {tag_name: 'div', index: 0}
-        @wd_locator = {xpath: ".//*[local-name()='div']"}
+        @built = {xpath: ".//*[local-name()='div']"}
       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
@@ -351,8 +350,8 @@ describe Watir::Locators::Element::SelectorBuilder do
 
       it 'locates the element associated with the label element located by the text of the provided label key' do
         @selector = {label: 'Cars'}
-        @wd_locator = {xpath: ".//*[(@id=//label[normalize-space()='Cars']/@for "\
-"or parent::label[normalize-space()='Cars'])]"}
+        @built = {xpath: ".//*[@id=//label[normalize-space()='Cars']/@for "\
+"or parent::label[normalize-space()='Cars']]"}
         @data_locator = 'cars'
       end
 
@@ -360,7 +359,7 @@ describe Watir::Locators::Element::SelectorBuilder do
         @attributes ||= Watir::Option.attribute_list
 
         @selector = {tag_name: 'option', label: 'Germany'}
-        @wd_locator = {xpath: ".//*[local-name()='option'][@label='Germany']"}
+        @built = {xpath: ".//*[local-name()='option'][@label='Germany']"}
         @data_locator = 'Berliner'
       end
     end
@@ -372,7 +371,7 @@ describe Watir::Locators::Element::SelectorBuilder do
 
       it 'raises exception when not a Symbol', skip_after: true do
         selector = {adjacent: 'foo', index: 0}
-        msg = 'expected Symbol, got "foo":String'
+        msg = 'expected one of [Symbol], got "foo":String'
         expect { selector_builder.build(selector) }.to raise_exception TypeError, msg
       end
 
@@ -386,21 +385,21 @@ describe Watir::Locators::Element::SelectorBuilder do
         it 'with no other arguments' do
           @query_scope = browser.div(id: 'first_sibling')
           @selector = {adjacent: :ancestor, index: 0}
-          @wd_locator = {xpath: './ancestor::*[1]'}
+          @built = {xpath: './ancestor::*[1]'}
           @data_locator = 'parent'
         end
 
         it 'with index' do
           @query_scope = browser.div(id: 'first_sibling')
           @selector = {adjacent: :ancestor, index: 2}
-          @wd_locator = {xpath: './ancestor::*[3]'}
+          @built = {xpath: './ancestor::*[3]'}
           @data_locator = 'grandparent'
         end
 
         it 'with multiple locators' do
           @query_scope = browser.div(id: 'first_sibling')
           @selector = {adjacent: :ancestor, id: true, tag_name: 'div', class: 'ancestor', index: 1}
-          @wd_locator = {xpath: "./ancestor::*[local-name()='div']"\
+          @built = {xpath: "./ancestor::*[local-name()='div']"\
 "[contains(concat(' ', @class, ' '), ' ancestor ')][@id][2]"}
           @data_locator = 'grandparent'
         end
@@ -417,21 +416,21 @@ describe Watir::Locators::Element::SelectorBuilder do
         it 'with no other arguments' do
           @query_scope = browser.div(id: 'first_sibling')
           @selector = {adjacent: :following, index: 0}
-          @wd_locator = {xpath: './following-sibling::*[1]'}
+          @built = {xpath: './following-sibling::*[1]'}
           @data_locator = 'between_siblings1'
         end
 
         it 'with index' do
           @query_scope = browser.div(id: 'first_sibling')
           @selector = {adjacent: :following, index: 2}
-          @wd_locator = {xpath: './following-sibling::*[3]'}
+          @built = {xpath: './following-sibling::*[3]'}
           @data_locator = 'between_siblings2'
         end
 
         it 'with multiple locators' do
           @query_scope = browser.div(id: 'first_sibling')
           @selector = {adjacent: :following, tag_name: 'div', class: 'b', index: 0, id: true}
-          @wd_locator = {xpath: "./following-sibling::*[local-name()='div']"\
+          @built = {xpath: "./following-sibling::*[local-name()='div']"\
 "[contains(concat(' ', @class, ' '), ' b ')][@id][1]"}
           @data_locator = 'second_sibling'
         end
@@ -439,7 +438,7 @@ describe Watir::Locators::Element::SelectorBuilder do
         it 'with text' do
           @query_scope = browser.div(id: 'first_sibling')
           @selector = {adjacent: :following, text: 'Third', index: 0}
-          @wd_locator = {xpath: "./following-sibling::*[normalize-space()='Third'][1]"}
+          @built = {xpath: "./following-sibling::*[normalize-space()='Third'][1]"}
           @data_locator = 'third_sibling'
         end
       end
@@ -448,21 +447,21 @@ describe Watir::Locators::Element::SelectorBuilder do
         it 'with no other arguments' do
           @query_scope = browser.div(id: 'third_sibling')
           @selector = {adjacent: :preceding, index: 0}
-          @wd_locator = {xpath: './preceding-sibling::*[1]'}
+          @built = {xpath: './preceding-sibling::*[1]'}
           @data_locator = 'between_siblings2'
         end
 
         it 'with index' do
           @query_scope = browser.div(id: 'third_sibling')
           @selector = {adjacent: :preceding, index: 2}
-          @wd_locator = {xpath: './preceding-sibling::*[3]'}
+          @built = {xpath: './preceding-sibling::*[3]'}
           @data_locator = 'between_siblings1'
         end
 
         it 'with multiple locators' do
           @query_scope = browser.div(id: 'third_sibling')
           @selector = {adjacent: :preceding, tag_name: 'div', class: 'b', id: true, index: 0}
-          @wd_locator = {xpath: "./preceding-sibling::*[local-name()='div']"\
+          @built = {xpath: "./preceding-sibling::*[local-name()='div']"\
 "[contains(concat(' ', @class, ' '), ' b ')][@id][1]"}
           @data_locator = 'second_sibling'
         end
@@ -470,7 +469,7 @@ describe Watir::Locators::Element::SelectorBuilder do
         it 'with text' do
           @query_scope = browser.div(id: 'third_sibling')
           @selector = {adjacent: :preceding, text: 'Second', index: 0}
-          @wd_locator = {xpath: "./preceding-sibling::*[normalize-space()='Second'][1]"}
+          @built = {xpath: "./preceding-sibling::*[normalize-space()='Second'][1]"}
           @data_locator = 'second_sibling'
         end
       end
@@ -479,21 +478,21 @@ describe Watir::Locators::Element::SelectorBuilder do
         it 'with no other arguments' do
           @query_scope = browser.div(id: 'first_sibling')
           @selector = {adjacent: :child, index: 0}
-          @wd_locator = {xpath: './child::*[1]'}
+          @built = {xpath: './child::*[1]'}
           @data_locator = 'child span'
         end
 
         it 'with index' do
           @query_scope = browser.div(id: 'parent')
           @selector = {adjacent: :child, index: 2}
-          @wd_locator = {xpath: './child::*[3]'}
+          @built = {xpath: './child::*[3]'}
           @data_locator = 'second_sibling'
         end
 
         it 'with multiple locators' do
           @query_scope = browser.div(id: 'parent')
           @selector = {adjacent: :child, tag_name: 'div', class: 'b', id: true, index: 0}
-          @wd_locator = {xpath: "./child::*[local-name()='div']"\
+          @built = {xpath: "./child::*[local-name()='div']"\
 "[contains(concat(' ', @class, ' '), ' b ')][@id][1]"}
           @data_locator = 'second_sibling'
         end
@@ -501,7 +500,7 @@ describe Watir::Locators::Element::SelectorBuilder do
         it 'with text' do
           @query_scope = browser.div(id: 'parent')
           @selector = {adjacent: :child, text: 'Second', index: 0}
-          @wd_locator = {xpath: "./child::*[normalize-space()='Second'][1]"}
+          @built = {xpath: "./child::*[normalize-space()='Second'][1]"}
           @data_locator = 'second_sibling'
         end
       end
@@ -514,7 +513,7 @@ describe Watir::Locators::Element::SelectorBuilder do
 
       it 'locates using tag name, class, attributes and text' do
         @selector = {tag_name: 'div', class: 'content', contenteditable: 'true', text: 'Foo'}
-        @wd_locator = {xpath: ".//*[local-name()='div'][contains(concat(' ', @class, ' '), ' content ')]" \
+        @built = {xpath: ".//*[local-name()='div'][contains(concat(' ', @class, ' '), ' content ')]" \
 "[normalize-space()='Foo'][@contenteditable='true']"}
         @data_locator = 'content'
       end
@@ -527,13 +526,13 @@ describe Watir::Locators::Element::SelectorBuilder do
 
       it 'handles spaces' do
         @selector = {title: /od Lu/}
-        @wd_locator = {xpath: ".//*[contains(@title, 'od Lu')]"}
+        @built = {xpath: ".//*[contains(@title, 'od Lu')]"}
         @data_locator = 'Good Luck'
       end
 
       it 'handles escaped characters' do
         @selector = {src: /ages\/but/}
-        @wd_locator = {xpath: ".//*[contains(@src, 'ages/but')]"}
+        @built = {xpath: ".//*[contains(@src, 'ages/but')]"}
         @data_locator = 'submittable button'
       end
     end
@@ -545,40 +544,36 @@ describe Watir::Locators::Element::SelectorBuilder do
 
       it 'handles wildcards' do
         @selector = {src: /ages.*but/}
-        @wd_locator = {xpath: ".//*[contains(@src, 'ages') and contains(@src, 'but')]"}
+        @built = {xpath: ".//*[contains(@src, 'ages') and contains(@src, 'but')]", src: /ages.*but/}
         @data_locator = 'submittable button'
-        @remaining = {src: /ages.*but/}
       end
 
       it 'handles optional characters' do
         @selector = {src: /ages ?but/}
-        @wd_locator = {xpath: ".//*[contains(@src, 'ages') and contains(@src, 'but')]"}
+        @built = {xpath: ".//*[contains(@src, 'ages') and contains(@src, 'but')]", src: /ages ?but/}
         @data_locator = 'submittable button'
-        @remaining = {src: /ages ?but/}
       end
 
       it 'handles anchors' do
         @selector = {name: /^new_user_image$/}
-        @wd_locator = {xpath: ".//*[contains(@name, 'new_user_image')]"}
+        @built = {xpath: ".//*[contains(@name, 'new_user_image')]", name: /^new_user_image$/}
         @data_locator = 'submittable button'
-        @remaining = {name: /^new_user_image$/}
       end
 
       it 'handles beginning anchor' do
         @selector = {src: /^i/}
-        @wd_locator = {xpath: ".//*[starts-with(@src, 'i')]"}
+        @built = {xpath: ".//*[starts-with(@src, 'i')]"}
         @data_locator = 'submittable button'
       end
 
       it 'does not use starts-with if visible locator used' do
         @selector = {id: /^vis/, visible_text: 'shown div'}
-        @wd_locator = {xpath: ".//*[contains(@id, 'vis')]"}
-        @remaining = {id: /^vis/, visible_text: 'shown div'}
+        @built = {xpath: ".//*[contains(@id, 'vis')]", id: /^vis/, visible_text: 'shown div'}
       end
 
       it 'handles case insensitive' do
         @selector = {action: /me/i}
-        @wd_locator = {xpath: './/*[contains(translate(@action,' \
+        @built = {xpath: './/*[contains(translate(@action,' \
 "'ABCDEFGHIJKLMNOPQRSTUVWXYZÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖØÙÚÛÜÝÞŸŽŠŒ'," \
 "'abcdefghijklmnopqrstuvwxyzàáâãäåæçèéêëìíîïðñòóôõöøùúûüýþÿžšœ'), 'me')]"}
         @data_locator = 'form'
@@ -589,49 +584,43 @@ describe Watir::Locators::Element::SelectorBuilder do
     context 'returns locators that can not be directly translated' do
       it 'attribute with complicated Regexp at end' do
         @selector = {action: /me$/}
-        @wd_locator = {xpath: ".//*[contains(@action, 'me')]"}
-        @remaining = {action: /me$/}
+        @built = {xpath: ".//*[contains(@action, 'me')]", action: /me$/}
       end
 
       it 'class with complicated Regexp' do
         @selector = {class: /he?r/}
-        @wd_locator = {xpath: ".//*[contains(@class, 'h') and contains(@class, 'r')]"}
-        @remaining = {class: [/he?r/]}
+        @built = {xpath: ".//*[contains(@class, 'h') and contains(@class, 'r')]", class: [/he?r/]}
       end
 
       it 'text with any Regexp' do
         @selector = {text: /Add/}
-        @wd_locator = {xpath: './/*'}
-        @remaining = {text: /Add/}
+        @built = {xpath: './/*', text: /Add/}
       end
 
       it 'visible' do
         @selector = {tag_name: 'div', visible: true}
-        @wd_locator = {xpath: ".//*[local-name()='div']"}
-        @remaining = {visible: true}
+        @built = {xpath: ".//*[local-name()='div']", visible: true}
       end
 
       it 'not visible' do
         @selector = {tag_name: 'span', visible: false}
-        @wd_locator = {xpath: ".//*[local-name()='span']"}
-        @remaining = {visible: false}
+        @built = {xpath: ".//*[local-name()='span']", visible: false}
       end
 
       it 'visible text' do
         @selector = {tag_name: 'span', visible_text: 'foo'}
-        @wd_locator = {xpath: ".//*[local-name()='span']"}
-        @remaining = {visible_text: 'foo'}
+        @built = {xpath: ".//*[local-name()='span']", visible_text: 'foo'}
       end
 
       it 'raises exception when visible is not boolean', skip_after: true do
         selector = {visible: 'foo'}
-        msg = 'expected boolean, got "foo":String'
+        msg = 'expected one of [TrueClass, FalseClass], got "foo":String'
         expect { selector_builder.build(selector) }.to raise_exception TypeError, msg
       end
 
       it 'raises exception when visible text is not a String or Regexp', skip_after: true do
         selector = {visible_text: 7}
-        msg = /expected string_or_regexp, got 7:(Fixnum|Integer)/
+        msg = /expected one of \[String, Regexp\], got 7:(Fixnum|Integer)/
         expect { selector_builder.build(selector) }.to raise_exception TypeError, msg
       end
     end