watir 7.0.0.beta4 → 7.0.0.beta5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 84196be031b435273f620aea6539dfb373602174b861fe624faf8591b3a803b6
-  data.tar.gz: 934de2c077de5657f76fdbc7dc4f6c8c4b9408f278b644b9e01b5c5b7f8d401b
+  metadata.gz: af4906be1ae9d2713b91037006f964eddcac08ccb7a3cc341752132dea109b0f
+  data.tar.gz: 52ece209164c1ff75eeaec71efe8c70f03dd27f4fb1c791761e77c9ac600b333
 SHA512:
-  metadata.gz: 8f51aeb6d0f69bf20150a689b4e29ba5fb6217abd735e9a18c9917ce60dab6810a3d43b10581ae19fb85b23e7231a1cd541fdfd255cc17a80a58c78f308973a6
-  data.tar.gz: 5130d9bc13f3ac40b247756d009813c6cb99584e6744a1f883b3beede4a51099a778549e6e9a15f273784aed5fe1849ac384161947e38dfc770deef0b051ec45
+  metadata.gz: 5623e2ac22fd67b0c7f147333ed0c0e8ce3b87cf66ecb8d40a3f85672ce647d480bfe0114986a83d1a0bdc59510ad2d164c046769eea5c44a12252b3578a4d23
+  data.tar.gz: 9e95f5db40c379040dabb329c64dc4032c9c290193c3804e401cbfaabecec9550fa524c50e6483a9b597240a99f542549c1b823d91c99128dbab16b44f1c4d39

data/CHANGES.md

@@ -1,3 +1,9 @@
+### 7.0.0.beta5 (2021-08-02)
+
+* Add support for passing in Proxy and proxy Hash to Capabilities (#933)
+* Trigger change event when setting values on date and date-time fields (#938)
+* Allow user to obtain Capabilities instance from Browser instance
+
 ### 7.0.0.beta4 (2021-05-29)
 
 * Fix Bug in using negative class names within a collection (#934)

data/lib/watir/browser.rb

@@ -12,7 +12,7 @@ module Watir
     include Scrolling
 
     attr_writer :default_context, :original_window, :locator_namespace, :timer
-    attr_reader :driver, :after_hooks
+    attr_reader :driver, :after_hooks, :capabilities
     alias wd driver # ensures duck typing with Watir::Element
 
     class << self
@@ -42,8 +42,8 @@ module Watir
     def initialize(browser = :chrome, *args)
       case browser
       when ::Symbol, String
-        selenium_args = Capabilities.new(browser, *args).to_args
-        @driver = Selenium::WebDriver.for(*selenium_args)
+        @capabilities = Capabilities.new(browser, *args)
+        @driver = Selenium::WebDriver.for(*@capabilities.to_args)
       when Selenium::WebDriver::Driver
         @driver = browser
       else

data/lib/watir/capabilities.rb

@@ -74,12 +74,26 @@ module Watir
                 end
 
       options.unhandled_prompt_behavior ||= :ignore
+      process_proxy_options(options)
       browser_specific_options(options)
       raise ArgumentError, "#{@options} are unrecognized arguments for Browser constructor" unless @options.empty?
 
       vendor_caps << options
     end
 
+    def process_proxy_options(options)
+      proxy = @options.delete(:proxy)
+      return if proxy.nil?
+
+      proxy &&= Selenium::WebDriver::Proxy.new(proxy) if proxy.is_a?(Hash)
+
+      unless proxy.is_a?(Selenium::WebDriver::Proxy)
+        raise TypeError, "#{proxy} needs to be Selenium Proxy or Hash instance"
+      end
+
+      options.proxy = proxy
+    end
+
     def process_vendor_capabilities(opts)
       return [] unless opts.is_a? Hash
 

data/lib/watir/elements/date_field.rb

@@ -11,7 +11,10 @@ module Watir
       raise ArgumentError, message unless [Date, ::Time].include?(date.class)
 
       date_string = date.strftime('%Y-%m-%d')
-      element_call(:wait_for_writable) { execute_js(:setValue, @element, date_string) }
+      element_call(:wait_for_writable) do
+        execute_js(:setValue, @element, date_string)
+        execute_js(:fireEvent, @element, :change)
+      end
     end
     alias set set!
     alias value= set

data/lib/watir/elements/date_time_field.rb

@@ -11,7 +11,10 @@ module Watir
       raise ArgumentError, message unless [DateTime, ::Time].include?(date.class)
 
       date_time_string = date.strftime('%Y-%m-%dT%H:%M')
-      element_call(:wait_for_writable) { execute_js(:setValue, @element, date_time_string) }
+      element_call(:wait_for_writable) do
+        execute_js(:setValue, @element, date_time_string)
+        execute_js(:fireEvent, @element, :change)
+      end
     end
     alias set set!
     alias value= set

data/lib/watir/version.rb

@@ -1,3 +1,3 @@
 module Watir
-  VERSION = '7.0.0.beta4'.freeze
+  VERSION = '7.0.0.beta5'.freeze
 end

data/lib/watirspec/remote_server.rb

@@ -20,14 +20,10 @@ module WatirSpec
     private
 
     def jar
-      if ENV['LOCAL_SELENIUM']
-        local = File.expand_path('../selenium/buck-out/gen/java/server/src/org/openqa/grid/selenium/selenium.jar')
-      end
-
       if File.exist?(ENV['REMOTE_SERVER_BINARY'] || '')
         ENV['REMOTE_SERVER_BINARY']
-      elsif ENV['LOCAL_SELENIUM'] && File.exist?(local)
-        local
+      elsif ENV['LOCAL_SELENIUM']
+        File.expand_path('../selenium/bazel-bin/java/server/src/org/openqa/selenium/grid/selenium_server_deploy.jar')
       elsif !Dir.glob('*selenium*.jar').empty?
         Dir.glob('*selenium*.jar').first
       else

data/spec/unit/capabilities_spec.rb

@@ -39,6 +39,7 @@ describe Watir::Capabilities do
   # :listener
   # :service      (Built from Hash)
   # :http_client  (Generated or Built from Hash)
+  # :proxy        (Built from Hash and added to :options)
   # :options      (Generated or Built from Hash)
   # :capabilities (incompatible with options)
 
@@ -74,7 +75,7 @@ describe Watir::Capabilities do
       expect(args.last).not_to include(:service)
     end
 
-    context 'service' do
+    describe 'service' do
       it 'uses provided service' do
         halt_service(browser_symbol)
 
@@ -106,7 +107,7 @@ describe Watir::Capabilities do
       end
     end
 
-    context 'http_client' do
+    describe 'http_client' do
       it 'uses default HTTP Client' do
         capabilities = Watir::Capabilities.new(browser_symbol)
         args = capabilities.to_args
@@ -153,7 +154,7 @@ describe Watir::Capabilities do
       }.to raise_exception(ArgumentError, ':capabilities and :options are not both allowed')
     end
 
-    context 'timeout options' do
+    describe 'timeout options' do
       it 'accepts page load and script timeouts in seconds' do
         options = {page_load_timeout: 11,
                    script_timeout: 12}
@@ -203,6 +204,63 @@ describe Watir::Capabilities do
       actual_options = args.last[:capabilities].first
       expect(actual_options.unhandled_prompt_behavior).to eq :accept_and_notify
     end
+
+    describe 'proxy' do
+      it 'adds Selenium Proxy to empty Options' do
+        proxy = Selenium::WebDriver::Proxy.new(http: '127.0.0.1:8080', ssl: '127.0.0.1:443')
+        capabilities = Watir::Capabilities.new(browser_symbol, proxy: proxy)
+        args = capabilities.to_args
+        proxy = args.last[:capabilities].first.proxy
+
+        expect(proxy).to be_a Selenium::WebDriver::Proxy
+        expect(proxy.type).to eq(:manual)
+        expect(proxy.http).to eq('127.0.0.1:8080')
+        expect(proxy.ssl).to eq('127.0.0.1:443')
+      end
+
+      it 'builds a Proxy from Hash for Options' do
+        proxy = {http: '127.0.0.1:8080', ssl: '127.0.0.1:443'}
+        capabilities = Watir::Capabilities.new(browser_symbol, proxy: proxy)
+        args = capabilities.to_args
+        proxy = args.last[:capabilities].first.proxy
+
+        expect(proxy).to be_a Selenium::WebDriver::Proxy
+        expect(proxy.type).to eq(:manual)
+        expect(proxy.http).to eq('127.0.0.1:8080')
+        expect(proxy.ssl).to eq('127.0.0.1:443')
+      end
+
+      it 'builds a Proxy from Hash and adds to Options' do
+        proxy = {http: '127.0.0.1:8080', ssl: '127.0.0.1:443'}
+        options = {unhandled_prompt_behavior: :accept,
+                   page_load_strategy: :eager}
+
+        capabilities = Watir::Capabilities.new(browser_symbol, options: options, proxy: proxy)
+        args = capabilities.to_args
+        actual_options = args.last[:capabilities].first
+
+        expect(actual_options.proxy).to be_a Selenium::WebDriver::Proxy
+        expect(actual_options.proxy.type).to eq(:manual)
+        expect(actual_options.proxy.http).to eq('127.0.0.1:8080')
+        expect(actual_options.proxy.ssl).to eq('127.0.0.1:443')
+        expect(actual_options.unhandled_prompt_behavior).to eq :accept
+        expect(actual_options.page_load_strategy).to eq :eager
+      end
+    end
+
+    it 'errors on bad proxy key' do
+      proxy = {bad_key: 'foo'}
+      capabilities = Watir::Capabilities.new(browser_symbol, proxy: proxy)
+
+      expect { capabilities.to_args }.to raise_error(ArgumentError, /unknown option/)
+    end
+
+    it 'errors on bad proxy object' do
+      capabilities = Watir::Capabilities.new(browser_symbol, proxy: 7)
+      expect {
+        capabilities.to_args
+      }.to raise_exception(TypeError, '7 needs to be Selenium Proxy or Hash instance')
+    end
   end
 
   # Options:
@@ -210,6 +268,7 @@ describe Watir::Capabilities do
   # :service      (Errors)
   # :listener
   # :http_client  (Generated or Built from Hash)
+  # :proxy        (Built from Hash and added to :options)
   # :options      (Generated or Built from Hash)
   # :capabilities (incompatible with options)
 
@@ -266,6 +325,34 @@ describe Watir::Capabilities do
       expect(actual_options.browser_name).to eq 'chrome'
     end
 
+    it 'accepts proxy object' do
+      proxy = Selenium::WebDriver::Proxy.new(http: '127.0.0.1:8080', ssl: '127.0.0.1:443')
+      capabilities = Watir::Capabilities.new(:chrome,
+                                             url: 'https://example.com/wd/hub',
+                                             proxy: proxy)
+      args = capabilities.to_args
+      expect(args.first).to eq :remote
+      proxy = args.last[:capabilities].first.proxy
+      expect(proxy).to be_a Selenium::WebDriver::Proxy
+      expect(proxy.type).to eq(:manual)
+      expect(proxy.http).to eq('127.0.0.1:8080')
+      expect(proxy.ssl).to eq('127.0.0.1:443')
+    end
+
+    it 'accepts proxy Hash' do
+      proxy = {http: '127.0.0.1:8080', ssl: '127.0.0.1:443'}
+      capabilities = Watir::Capabilities.new(:chrome,
+                                             url: 'https://example.com/wd/hub',
+                                             proxy: proxy)
+      args = capabilities.to_args
+      expect(args.first).to eq :remote
+      proxy = args.last[:capabilities].first.proxy
+      expect(proxy).to be_a Selenium::WebDriver::Proxy
+      expect(proxy.type).to eq(:manual)
+      expect(proxy.http).to eq('127.0.0.1:8080')
+      expect(proxy.ssl).to eq('127.0.0.1:443')
+    end
+
     it 'accepts options object' do
       capabilities = Watir::Capabilities.new(:chrome,
                                              url: 'https://example.com/wd/hub',
@@ -316,11 +403,13 @@ describe Watir::Capabilities do
       expect(actual_capabilities.browser_name).to eq 'chrome'
     end
 
-    it 'accepts http client & options objects' do
+    it 'accepts http client & proxy & options objects' do
       client = Watir::HttpClient.new
+      proxy = {http: '127.0.0.1:8080', ssl: '127.0.0.1:443'}
       options = Selenium::WebDriver::Chrome::Options.new(prefs: {foo: 'bar'})
       caps = Watir::Capabilities.new(:chrome,
                                      url: 'https://example.com/wd/hub',
+                                     proxy: proxy,
                                      options: options,
                                      http_client: client)
 
@@ -330,6 +419,11 @@ describe Watir::Capabilities do
       actual_options = args.last[:capabilities].first
       expect(actual_options).to be_a(Selenium::WebDriver::Chrome::Options)
       expect(actual_options.prefs).to eq(foo: 'bar')
+      proxy = args.last[:capabilities].first.proxy
+      expect(proxy).to be_a Selenium::WebDriver::Proxy
+      expect(proxy.type).to eq(:manual)
+      expect(proxy.http).to eq('127.0.0.1:8080')
+      expect(proxy.ssl).to eq('127.0.0.1:443')
     end
 
     it 'raises exception when both options & capabilities defined' do

data/watir.gemspec

@@ -25,7 +25,7 @@ Gem::Specification.new do |s|
   s.executables = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
   s.require_paths = ['lib']
 
-  s.add_dependency 'selenium-webdriver', '>= 4.0.0.beta2'
+  s.add_dependency 'selenium-webdriver', '>= 4.0.0.beta4'
   s.add_runtime_dependency 'regexp_parser', '>= 1.2', '< 3'
 
   s.add_development_dependency 'activesupport', '~> 4.0', '>= 4.1.11' # for pluralization during code generation

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: watir
 version: !ruby/object:Gem::Version
-  version: 7.0.0.beta4
+  version: 7.0.0.beta5
 platform: ruby
 authors:
 - Alex Rodionov
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-05-30 00:00:00.000000000 Z
+date: 2021-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
@@ -18,14 +18,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0.beta2
+        version: 4.0.0.beta4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 4.0.0.beta2
+        version: 4.0.0.beta4
 - !ruby/object:Gem::Dependency
   name: regexp_parser
   requirement: !ruby/object:Gem::Requirement