watir 6.15.1 → 6.16.0

data/lib/watir/locators/button/validator.rb

@@ -1,17 +0,0 @@
-module Watir
-  module Locators
-    class Button
-      class Validator < Element::Validator
-        def validate(element, _tag_name)
-          tag_name = element.tag_name.downcase
-          return unless %w[input button].include?(tag_name)
-
-          # TODO: - Verify this is desired behavior based on https://bugzilla.mozilla.org/show_bug.cgi?id=1290963
-          return if tag_name == 'input' && !Watir::Button::VALID_TYPES.include?(element.attribute(:type).downcase)
-
-          element
-        end
-      end
-    end
-  end
-end

data/lib/watir/locators/cell/locator.rb

@@ -1,13 +0,0 @@
-module Watir
-  module Locators
-    class Cell
-      class Locator < Element::Locator
-        private
-
-        def using_selenium(*)
-          # force watir usage
-        end
-      end
-    end
-  end
-end

data/lib/watir/locators/element/validator.rb

@@ -1,11 +0,0 @@
-module Watir
-  module Locators
-    class Element
-      class Validator
-        def validate(element, tag_name)
-          element.tag_name.downcase =~ /#{tag_name}/
-        end
-      end
-    end
-  end
-end

data/lib/watir/locators/row/locator.rb

@@ -1,13 +0,0 @@
-module Watir
-  module Locators
-    class Row
-      class Locator < Element::Locator
-        private
-
-        def using_selenium(*)
-          # force Watir usage
-        end
-      end
-    end
-  end
-end

data/lib/watir/locators/text_field/locator.rb

@@ -1,31 +0,0 @@
-module Watir
-  module Locators
-    class TextField
-      class Locator < Element::Locator
-        private
-
-        def using_selenium(*)
-          # force Watir usage
-        end
-
-        def matches_values?(element, rx_selector)
-          conversions = %i[text value label visible_text] & rx_selector.keys
-
-          tag_name = nil
-
-          conversions.each do |key|
-            tag_name ||= element.tag_name.downcase
-            correct_key = tag_name == 'input' ? :value : :text
-            rx_selector[correct_key] = rx_selector.delete(key)
-          end
-
-          super
-        end
-
-        def text_regexp_deprecation(*)
-          # does not apply to text_field
-        end
-      end
-    end
-  end
-end

data/lib/watir/locators/text_field/validator.rb

@@ -1,13 +0,0 @@
-module Watir
-  module Locators
-    class TextField
-      class Validator < Element::Validator
-        def validate(element, _tag_name)
-          # Zero for Ruby 2.3, Ruby 2.4+ this evaluates true/false
-          result = element.tag_name.casecmp('input')
-          result.zero? || result.eq(true)
-        end
-      end
-    end
-  end
-end

data/spec/unit/anchor_locator_spec.rb

@@ -1,68 +0,0 @@
-require_relative 'unit_helper'
-
-describe Watir::Locators::Element::Locator do
-  include LocatorSpecHelper
-
-  def locator(selector, attrs)
-    attrs ||= Watir::HTMLElement.attributes
-    element_validator = Watir::Locators::Element::Validator.new
-    selector_builder = Watir::Locators::Anchor::SelectorBuilder.new(attrs)
-    Watir::Locators::Element::Locator.new(browser, selector, selector_builder, element_validator)
-  end
-
-  it 'converts :visible_text with String to :link_text' do
-    link = element(tag_name: 'a')
-    expect_one(:link_text, 'exact text').and_return(link)
-    expect(link).not_to receive(:text) # matching does not validate text
-
-    locate_one(tag_name: 'a', visible_text: 'exact text')
-  end
-
-  it 'converts :visible_text with basic Regexp to :partial_link_text' do
-    link = element(tag_name: 'a')
-    expect_one(:partial_link_text, 'partial text').and_return(link)
-    expect(link).not_to receive(:text) # matching does not validate text
-
-    locate_one(tag_name: 'a', visible_text: /partial text/)
-  end
-
-  it 'does not convert :visible_text with complex Regexp' do
-    elements = [
-      element(tag_name: 'a', text: 'other text'),
-      element(tag_name: 'a', text: 'matching complex!text')
-    ]
-    expect_all(:xpath, ".//*[local-name()='a']").and_return(elements)
-
-    expect(locate_one(tag_name: 'a', visible_text: /complex.text/)).to eq(elements[1])
-  end
-
-  it 'does not convert :visible_text with casefold Regexp' do
-    elements = [
-      element(tag_name: 'a', text: 'other text'),
-      element(tag_name: 'a', text: 'partial text')
-    ]
-    expect_all(:xpath, ".//*[local-name()='a']").and_return(elements)
-
-    expect(locate_one(tag_name: 'a', visible_text: /partial text/i)).to eq(elements[1])
-  end
-
-  it 'does not convert :visible_text with String and other locators' do
-    els = [
-      element(tag_name: 'a', attributes: {class: 'klass', name: 'abc'}, text: 'other text'),
-      element(tag_name: 'a', attributes: {class: 'klass', name: 'abc'}, text: 'exact text')
-    ]
-    expect_all(:xpath, ".//*[local-name()='a'][contains(concat(' ', @class, ' '), ' klass ')][@name]").and_return(els)
-
-    expect(locate_one(tag_name: 'a', class: 'klass', name: /a|.c/,  visible_text: 'exact text')).to eq(els[1])
-  end
-
-  it 'does not convert :visible_text with Regexp and other locators' do
-    els = [
-      element(tag_name: 'a', attributes: {class: 'klass', name: 'abc'}, text: 'other text'),
-      element(tag_name: 'a', attributes: {class: 'klass', name: 'abc'}, text: 'partial text')
-    ]
-    expect_all(:xpath, ".//*[local-name()='a'][contains(concat(' ', @class, ' '), ' klass ')][@name]").and_return(els)
-
-    expect(locate_one(tag_name: 'a', class: 'klass', name: /a|.c/, visible_text: /partial text/)).to eq(els[1])
-  end
-end

data/spec/watirspec/selector_builder/button_spec.rb

@@ -1,250 +0,0 @@
-require 'watirspec_helper'
-
-describe Watir::Locators::Button::SelectorBuilder do
-  let(:attributes) { Watir::HTMLElement.attribute_list }
-  let(:scope_tag_name) { nil }
-  let(:selector_builder) { described_class.new(attributes) }
-  let(:uppercase) { 'ABCDEFGHIJKLMNOPQRSTUVWXYZÀÁÂÃÄÅÆÇÈÉÊËÌÍÎÏÐÑÒÓÔÕÖØÙÚÛÜÝÞŸŽŠŒ' }
-  let(:lowercase) { 'abcdefghijklmnopqrstuvwxyzàáâãäåæçèéêëìíîïðñòóôõöøùúûüýþÿžšœ' }
-  let(:default_types) do
-    "translate(@type,'#{uppercase}','#{lowercase}')='button' or" \
-" translate(@type,'#{uppercase}','#{lowercase}')='reset' or"\
-" translate(@type,'#{uppercase}','#{lowercase}')='submit' or"\
-" translate(@type,'#{uppercase}','#{lowercase}')='image'"
-  end
-
-  describe '#build' do
-    after(:each) do |example|
-      next if example.metadata[:skip_after]
-
-      @query_scope ||= browser
-      expect(selector_builder.build(@selector)).to eq @built
-
-      next unless @data_locator || @tag_name
-
-      expect { @located = @query_scope.wd.first(@built) }.not_to raise_exception
-
-      if @data_locator
-        expect(@located.attribute('data-locator')).to eq(@data_locator)
-      else
-        expect {
-          expect(@located.tag_name).to eq @tag_name
-        }.not_to raise_exception
-      end
-    end
-
-    it 'without any arguments' do
-      browser.goto(WatirSpec.url_for('forms_with_input_elements.html'))
-      @selector = {}
-      @built = {xpath: ".//*[(local-name()='button') or (local-name()='input' and (#{default_types}))]"}
-      @data_locator = 'user submit'
-    end
-
-    context 'with type' do
-      before(:each) { browser.goto(WatirSpec.url_for('forms_with_input_elements.html')) }
-
-      it 'false only locates with button without a type' do
-        @selector = {type: false}
-        @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}
-        @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'}
-        @built = {xpath: ".//*[(local-name()='button' and " \
-"translate(@type,'#{uppercase}','#{lowercase}')='reset') or " \
-"(local-name()='input' and (translate(@type,'#{uppercase}','#{lowercase}')='reset'))]"}
-        @data_locator = 'reset'
-      end
-
-      it 'raises exception when a non-button type input is specified', skip_after: true do
-        selector = {type: 'checkbox'}
-        msg = 'Button Elements can not be located by input type: checkbox'
-        expect { selector_builder.build(selector) }
-          .to raise_exception Watir::Exception::LocatorException, msg
-      end
-    end
-
-    context 'with xpath or css' do
-      before(:each) do
-        browser.goto(WatirSpec.url_for('forms_with_input_elements.html'))
-      end
-
-      it 'returns tag name and type to the locator' do
-        @selector = {xpath: '#disabled_button', tag_name: 'input', type: 'submit'}
-        @built = {xpath: '#disabled_button', tag_name: 'input', type: 'submit'}
-      end
-    end
-
-    context 'with text' do
-      before(:each) { browser.goto(WatirSpec.url_for('forms_with_input_elements.html')) }
-
-      it 'locates value of input element with String' do
-        @selector = {text: 'Button'}
-        @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'}
-        @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/}
-        @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/}
-        @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/}
-        @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/}
-        @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$/}
-        @built = {xpath: ".//*[(local-name()='button' and contains(text(), 'foo')) or " \
-"(local-name()='input' and (#{default_types}) and contains(@value, 'foo'))]", text: /^foo$/}
-      end
-    end
-
-    context 'with value' do
-      before(:each) { browser.goto(WatirSpec.url_for('forms_with_input_elements.html')) }
-
-      it 'input element value with String' do
-        @selector = {value: 'Preview'}
-        @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'}
-        @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/}
-        @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/}
-        @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'}
-        @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/}
-        @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$/}
-        @built = {xpath: ".//*[(local-name()='button') or (local-name()='input' and (#{default_types}))]" \
-"[contains(text(), 'foo') or contains(@value, 'foo')]", value: /^foo$/}
-      end
-    end
-
-    context 'with index' do
-      before(:each) do
-        browser.goto(WatirSpec.url_for('forms_with_input_elements.html'))
-      end
-
-      it 'positive' do
-        @selector = {index: 3}
-        @built = {xpath: "(.//*[(local-name()='button') or (local-name()='input' and (#{default_types}))])[4]"}
-        @data_locator = 'preview'
-      end
-
-      it 'negative' do
-        @selector = {index: -4}
-        @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}
-        @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}
-        @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 one of \[(Integer|Fixnum)\], got "foo":String/
-        expect { selector_builder.build(selector) }.to raise_exception TypeError, msg
-      end
-    end
-
-    context 'with multiple locators' do
-      before(:each) do
-        browser.goto(WatirSpec.url_for('forms_with_input_elements.html'))
-      end
-
-      it 'locates using class and attributes' do
-        @selector = {class: 'image', name: 'new_user_image', src: true}
-        @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
-    end
-
-    it 'delegates adjacent to Element SelectorBuilder' do
-      browser.goto(WatirSpec.url_for('forms_with_input_elements.html'))
-      @query_scope = browser.element(id: 'new_user_button').locate
-
-      @selector = {adjacent: :ancestor, index: 2}
-      @built = {xpath: './ancestor::*[3]'}
-      @data_locator = 'body'
-    end
-  end
-end

data/spec/watirspec/selector_builder/cell_spec.rb

@@ -1,92 +0,0 @@
-require 'watirspec_helper'
-
-describe Watir::Locators::Cell::SelectorBuilder do
-  let(:attributes) { Watir::HTMLElement.attribute_list }
-  let(:selector_builder) { described_class.new(attributes) }
-
-  describe '#build' do
-    after(:each) do |example|
-      next if example.metadata[:skip_after]
-
-      @query_scope ||= browser.element(id: 'gregory').locate
-
-      expect(selector_builder.build(@selector)).to eq @built
-
-      next unless @data_locator || @tag_name
-
-      expect { @located = @query_scope.wd.first(@built) }.not_to raise_exception
-
-      if @data_locator
-        expect(@located.attribute('data-locator')).to eq(@data_locator)
-      else
-        expect {
-          expect(@located.tag_name).to eq @tag_name
-        }.not_to raise_exception
-      end
-    end
-
-    it 'without any arguments' do
-      browser.goto(WatirSpec.url_for('tables.html'))
-      @selector = {}
-      @built = {xpath: "./*[local-name()='th' or local-name()='td']"}
-      @data_locator = 'first cell'
-    end
-
-    context 'with index' do
-      before(:each) do
-        browser.goto(WatirSpec.url_for('tables.html'))
-      end
-
-      it 'positive' do
-        @selector = {index: 3}
-        @built = {xpath: "(./*[local-name()='th' or local-name()='td'])[4]"}
-        @data_locator = 'after tax'
-      end
-
-      it 'negative' do
-        @selector = {index: -3}
-        @built = {xpath: "(./*[local-name()='th' or local-name()='td'])[last()-2]"}
-        @data_locator = 'before tax'
-      end
-
-      it 'last' do
-        @selector = {index: -1}
-        @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}
-        @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 one of \[(Integer|Fixnum)\], got "foo":String/
-        expect { selector_builder.build(selector) }.to raise_exception TypeError, msg
-      end
-    end
-
-    context 'with multiple locators' do
-      before(:each) do
-        browser.goto(WatirSpec.url_for('tables.html'))
-      end
-
-      it 'attribute and text' do
-        @selector = {headers: /before_tax/, text: '5 934'}
-        @built = {xpath: "./*[local-name()='th' or local-name()='td']" \
-"[normalize-space()='5 934'][contains(@headers, 'before_tax')]"}
-        @data_locator = 'before tax'
-      end
-    end
-
-    it 'delegates adjacent to Element SelectorBuilder' do
-      @query_scope = browser.element(id: 'p3').locate
-
-      @selector = {adjacent: :ancestor, index: 2}
-      @built = {xpath: './ancestor::*[3]'}
-      @data_locator = 'top table'
-    end
-  end
-end