watir 6.6.2 → 6.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f821e322222ce615fe8e9c02b6a5fcbf783c22e8
-  data.tar.gz: b822b4d6fb0de96a76ffcb7c61f33640ef24c724
+  metadata.gz: 972d136a4af0abe48641cb7703820f8d15dc82a2
+  data.tar.gz: 41014e0e2977544fa86468ee3c91bb38e58f4f1c
 SHA512:
-  metadata.gz: 933376823cd73c75e48a570972058dc32653ea54460fff9683073b42a19f242270f2eb6917bc108a9e8ddf84deabb390df6fb6e626f31b6fae55d4544e1da563
-  data.tar.gz: 8132f6f936389fa572d981581c4c8ab893ea76e796a042d1ee32c6516a58241df2c4091d3c795b0ec6eeb36ec0e8d69c17d61b9beae598eb1e1feec055ac0238
+  metadata.gz: ba15ccf0f48236f3ab0df7523f562c1b19698c46a87b441229b0ff6fe24ab4749d145bce682ba166bfb5fa67d28f5177ffce6c0c5110d88e2f698be35db4cd1b
+  data.tar.gz: 54f53d8896b34ae1e6462b03347686e2fb16affc6e8e9f58bae598649a7f45b7f7de6186bc62aa1abf7881eb8ce0912b19adaf81c4bace186eabe01cbf89482e

data/CHANGES.md

@@ -1,3 +1,8 @@
+### 6.6.3 (2017-08-09)
+
+* Fix bug preventing usage of remote driver (#614)
+* HTML Element attribute support updated to HTML 5.1 
+
 ### 6.6.2 (2017-08-08)
 
 * Fix bug preventing headless operation (#611)

data/Rakefile

@@ -17,7 +17,7 @@ namespace :spec do
 end
 
 {
-  html: 'https://www.whatwg.org/specs/web-apps/current-work/',
+  html: 'https://www.w3.org/TR/html/single-page.html',
   svg: 'http://www.w3.org/TR/SVG2/single-page.html'
 }.each do |type, spec_uri|
   namespace type do

data/lib/watir/capabilities.rb

@@ -4,10 +4,16 @@ module Watir
     attr_reader :options
 
     def initialize(browser, options = {})
-      @browser = browser == :remote ? @options.delete(:browser).to_sym : browser.to_sym
+      @options = options.dup
+      @browser = if browser == :remote && @options.key?(:browser)
+                   @options.delete(:browser)
+                 elsif browser == :remote && @options.key?(:desired_capabilities)
+                   @options[:desired_capabilities].browser_name.to_sym
+                 else
+                   browser.to_sym
+                 end
       @selenium_browser = browser == :remote || options[:url] ? :remote : browser
 
-      @options = options.dup
       @selenium_opts = {}
     end
 

data/lib/watir/elements/html_elements.rb

@@ -6,30 +6,14 @@ module Watir
     attribute("Boolean", :translate?, :translate)
     attribute(String, :dir, :dir)
     attribute(String, :dataset, :dataset)
-    attribute("Boolean", :item_scope?, :itemScope)
-    attribute(String, :item_type, :itemType)
-    attribute(String, :item_id, :itemId)
-    attribute(String, :item_ref, :itemRef)
-    attribute(String, :item_prop, :itemProp)
-    attribute(String, :properties, :properties)
-    attribute(String, :item_value, :itemValue)
     attribute("Boolean", :hidden?, :hidden)
     attribute(Integer, :tab_index, :tabIndex)
     attribute(String, :access_key, :accessKey)
-    attribute(String, :access_key_label, :accessKeyLabel)
     attribute("Boolean", :draggable?, :draggable)
     attribute(String, :dropzone, :dropzone)
     attribute(String, :context_menu, :contextMenu)
     attribute("Boolean", :spellcheck?, :spellcheck)
-    attribute(String, :command_type, :commandType)
-    attribute(String, :command_label, :commandLabel)
-    attribute(String, :command_icon, :commandIcon)
-    attribute("Boolean", :command_hidden?, :commandHidden)
-    attribute("Boolean", :command_disabled?, :commandDisabled)
-    attribute("Boolean", :command_checked?, :commandChecked)
     attribute(String, :onabort, :onabort)
-    attribute(String, :onautocomplete, :onautocomplete)
-    attribute(String, :onautocompleteerror, :onautocompleteerror)
     attribute(String, :onblur, :onblur)
     attribute(String, :oncancel, :oncancel)
     attribute(String, :oncanplay, :oncanplay)
@@ -69,7 +53,7 @@ module Watir
     attribute(String, :onmouseout, :onmouseout)
     attribute(String, :onmouseover, :onmouseover)
     attribute(String, :onmouseup, :onmouseup)
-    attribute(String, :onmousewheel, :onmousewheel)
+    attribute(String, :onwheel, :onwheel)
     attribute(String, :onpause, :onpause)
     attribute(String, :onplay, :onplay)
     attribute(String, :onplaying, :onplaying)
@@ -82,7 +66,6 @@ module Watir
     attribute(String, :onseeking, :onseeking)
     attribute(String, :onselect, :onselect)
     attribute(String, :onshow, :onshow)
-    attribute(String, :onsort, :onsort)
     attribute(String, :onstalled, :onstalled)
     attribute(String, :onsubmit, :onsubmit)
     attribute(String, :onsuspend, :onsuspend)
@@ -90,6 +73,9 @@ module Watir
     attribute(String, :ontoggle, :ontoggle)
     attribute(String, :onvolumechange, :onvolumechange)
     attribute(String, :onwaiting, :onwaiting)
+    attribute(String, :oncopy, :oncopy)
+    attribute(String, :oncut, :oncut)
+    attribute(String, :onpaste, :onpaste)
     attribute(String, :content_editable, :contentEditable)
     attribute("Boolean", :content_editable?, :isContentEditable)
   end
@@ -122,8 +108,10 @@ module Watir
     attribute(String, :ononline, :ononline)
     attribute(String, :onpagehide, :onpagehide)
     attribute(String, :onpageshow, :onpageshow)
+    attribute(String, :onrejectionhandled, :onrejectionhandled)
     attribute(String, :onpopstate, :onpopstate)
     attribute(String, :onstorage, :onstorage)
+    attribute(String, :onunhandledrejection, :onunhandledrejection)
     attribute(String, :onunload, :onunload)
   end
   class FrameSetCollection < ElementCollection
@@ -184,19 +172,13 @@ module Watir
     attribute("Boolean", :async?, :async)
     attribute("Boolean", :defer?, :defer)
     attribute(String, :cross_origin, :crossOrigin)
+    attribute(String, :nonce, :nonce)
     attribute(String, :event, :event)
     attribute(String, :for, :htmlFor)
   end
   class ScriptCollection < ElementCollection
   end
 
-  class Dialog < HTMLElement
-    attribute("Boolean", :open?, :open)
-    attribute(String, :return_value, :returnValue)
-  end
-  class DialogCollection < ElementCollection
-  end
-
   class MenuItem < HTMLElement
     attribute(String, :type, :type)
     attribute(String, :label, :label)
@@ -205,7 +187,6 @@ module Watir
     attribute("Boolean", :checked?, :checked)
     attribute(String, :radiogroup, :radiogroup)
     attribute("Boolean", :default?, :default)
-    attribute(String, :command, :command)
   end
   class MenuItemCollection < ElementCollection
   end
@@ -432,8 +413,6 @@ module Watir
     attribute(String, :value, :value)
     attribute(String, :value_as_date, :valueAsDate)
     attribute(Float, :value_as_number, :valueAsNumber)
-    attribute(Float, :value_low, :valueLow)
-    attribute(Float, :value_high, :valueHigh)
     attribute(Integer, :width, :width)
     attribute("Boolean", :will_validate?, :willValidate)
     attribute(String, :validity, :validity)
@@ -492,7 +471,6 @@ module Watir
   class TableHeaderCell < TableCell
     attribute(String, :scope, :scope)
     attribute(String, :abbr, :abbr)
-    attribute(String, :sorted, :sorted)
   end
   class TableHeaderCellCollection < ElementCollection
   end
@@ -545,7 +523,6 @@ module Watir
     attribute(String, :t_head, :tHead)
     attribute(String, :t_foot, :tFoot)
     attribute(String, :t_bodies, :tBodies)
-    attribute("Boolean", :sortable?, :sortable)
     attribute(String, :align, :align)
     attribute(String, :border, :border)
     attribute(String, :frame, :frame)
@@ -565,12 +542,21 @@ module Watir
     attribute(String, :shape, :shape)
     attribute(String, :target, :target)
     attribute(String, :download, :download)
-    attribute(String, :ping, :ping)
     attribute(String, :rel, :rel)
     attribute(String, :rel_list, :relList)
     attribute(String, :hreflang, :hreflang)
     attribute(String, :type, :type)
     attribute("Boolean", :no_href?, :noHref)
+    attribute(String, :href, :href)
+    attribute(String, :origin, :origin)
+    attribute(String, :protocol, :protocol)
+    attribute(String, :username, :username)
+    attribute(String, :password, :password)
+    attribute(String, :host, :host)
+    attribute(String, :hostname, :hostname)
+    attribute(String, :port, :port)
+    attribute(String, :pathname, :pathname)
+    attribute(String, :search, :search)
   end
   class AreaCollection < ElementCollection
   end
@@ -604,8 +590,6 @@ module Watir
     attribute("Boolean", :ended?, :ended)
     attribute("Boolean", :autoplay?, :autoplay)
     attribute("Boolean", :loop?, :loop)
-    attribute(String, :media_group, :mediaGroup)
-    attribute(String, :controller, :controller)
     attribute("Boolean", :controls?, :controls)
     attribute(Float, :volume, :volume)
     attribute("Boolean", :muted?, :muted)
@@ -658,7 +642,6 @@ module Watir
     attribute(String, :type, :type)
     attribute("Boolean", :type_must_match?, :typeMustMatch)
     attribute(String, :name, :name)
-    attribute(String, :use_map, :useMap)
     attribute(String, :form, :form)
     attribute(String, :width, :width)
     attribute(String, :height, :height)
@@ -676,6 +659,7 @@ module Watir
     attribute(Integer, :vspace, :vspace)
     attribute(String, :code_base, :codeBase)
     attribute(String, :code_type, :codeType)
+    attribute(String, :use_map, :useMap)
     attribute(String, :border, :border)
   end
   class ObjectCollection < ElementCollection
@@ -697,7 +681,6 @@ module Watir
     attribute(String, :srcdoc, :srcdoc)
     attribute(String, :name, :name)
     attribute(String, :sandbox, :sandbox)
-    attribute("Boolean", :seamless?, :seamless)
     attribute("Boolean", :allow_fullscreen?, :allowFullscreen)
     attribute(String, :width, :width)
     attribute(String, :height, :height)
@@ -706,7 +689,6 @@ module Watir
     attribute(String, :align, :align)
     attribute(String, :scrolling, :scrolling)
     attribute(String, :frame_border, :frameBorder)
-    attribute(String, :long_desc, :longDesc)
     attribute(String, :margin_height, :marginHeight)
     attribute(String, :margin_width, :marginWidth)
   end
@@ -732,7 +714,6 @@ module Watir
     attribute(String, :align, :align)
     attribute(Integer, :hspace, :hspace)
     attribute(Integer, :vspace, :vspace)
-    attribute(String, :long_desc, :longDesc)
     attribute(String, :border, :border)
   end
   class ImageCollection < ElementCollection
@@ -786,16 +767,25 @@ module Watir
   class Anchor < HTMLElement
     attribute(String, :target, :target)
     attribute(String, :download, :download)
-    attribute(String, :ping, :ping)
     attribute(String, :rel, :rel)
+    attribute(String, :rev, :rev)
     attribute(String, :rel_list, :relList)
     attribute(String, :hreflang, :hreflang)
     attribute(String, :type, :type)
     attribute(String, :coords, :coords)
     attribute(String, :charset, :charset)
     attribute(String, :name, :name)
-    attribute(String, :rev, :rev)
     attribute(String, :shape, :shape)
+    attribute(String, :href, :href)
+    attribute(String, :origin, :origin)
+    attribute(String, :protocol, :protocol)
+    attribute(String, :username, :username)
+    attribute(String, :password, :password)
+    attribute(String, :host, :host)
+    attribute(String, :hostname, :hostname)
+    attribute(String, :port, :port)
+    attribute(String, :pathname, :pathname)
+    attribute(String, :search, :search)
   end
   class AnchorCollection < ElementCollection
   end
@@ -885,8 +875,10 @@ module Watir
     attribute(String, :ononline, :ononline)
     attribute(String, :onpagehide, :onpagehide)
     attribute(String, :onpageshow, :onpageshow)
+    attribute(String, :onrejectionhandled, :onrejectionhandled)
     attribute(String, :onpopstate, :onpopstate)
     attribute(String, :onstorage, :onstorage)
+    attribute(String, :onunhandledrejection, :onunhandledrejection)
     attribute(String, :onunload, :onunload)
   end
   class BodyCollection < ElementCollection
@@ -894,8 +886,8 @@ module Watir
 
   class Style < HTMLElement
     attribute(String, :media, :media)
+    attribute(String, :nonce, :nonce)
     attribute(String, :type, :type)
-    attribute("Boolean", :scoped?, :scoped)
   end
   class StyleCollection < ElementCollection
   end
@@ -1210,16 +1202,6 @@ module Watir
     end
     Watir.tag_to_class[:dfn] = HTMLElement
 
-    # @return [Dialog]
-    def dialog(*args)
-      Dialog.new(self, extract_selector(args).merge(tag_name: "dialog"))
-    end
-    # @return [DialogCollection]
-    def dialogs(*args)
-      DialogCollection.new(self, extract_selector(args).merge(tag_name: "dialog"))
-    end
-    Watir.tag_to_class[:dialog] = Dialog
-
     # @return [Div]
     def div(*args)
       Div.new(self, extract_selector(args).merge(tag_name: "div"))
@@ -1410,16 +1392,6 @@ module Watir
     end
     Watir.tag_to_class[:header] = HTMLElement
 
-    # @return [HTMLElement]
-    def hgroup(*args)
-      HTMLElement.new(self, extract_selector(args).merge(tag_name: "hgroup"))
-    end
-    # @return [HTMLElementCollection]
-    def hgroups(*args)
-      HTMLElementCollection.new(self, extract_selector(args).merge(tag_name: "hgroup"))
-    end
-    Watir.tag_to_class[:hgroup] = HTMLElement
-
     # @return [HR]
     def hr(*args)
       HR.new(self, extract_selector(args).merge(tag_name: "hr"))
@@ -1700,6 +1672,16 @@ module Watir
     end
     Watir.tag_to_class[:param] = Param
 
+    # @return [Picture]
+    def picture(*args)
+      Picture.new(self, extract_selector(args).merge(tag_name: "picture"))
+    end
+    # @return [PictureCollection]
+    def pictures(*args)
+      PictureCollection.new(self, extract_selector(args).merge(tag_name: "picture"))
+    end
+    Watir.tag_to_class[:picture] = Picture
+
     # @return [Pre]
     def pre(*args)
       Pre.new(self, extract_selector(args).merge(tag_name: "pre"))
@@ -1730,6 +1712,16 @@ module Watir
     end
     Watir.tag_to_class[:q] = Quote
 
+    # @return [HTMLElement]
+    def rb(*args)
+      HTMLElement.new(self, extract_selector(args).merge(tag_name: "rb"))
+    end
+    # @return [HTMLElementCollection]
+    def rbs(*args)
+      HTMLElementCollection.new(self, extract_selector(args).merge(tag_name: "rb"))
+    end
+    Watir.tag_to_class[:rb] = HTMLElement
+
     # @return [HTMLElement]
     def rp(*args)
       HTMLElement.new(self, extract_selector(args).merge(tag_name: "rp"))
@@ -1750,6 +1742,16 @@ module Watir
     end
     Watir.tag_to_class[:rt] = HTMLElement
 
+    # @return [HTMLElement]
+    def rtc(*args)
+      HTMLElement.new(self, extract_selector(args).merge(tag_name: "rtc"))
+    end
+    # @return [HTMLElementCollection]
+    def rtcs(*args)
+      HTMLElementCollection.new(self, extract_selector(args).merge(tag_name: "rtc"))
+    end
+    Watir.tag_to_class[:rtc] = HTMLElement
+
     # @return [HTMLElement]
     def ruby(*args)
       HTMLElement.new(self, extract_selector(args).merge(tag_name: "ruby"))

data/lib/watir/generator/base/spec_extractor.rb

@@ -2,7 +2,7 @@ module Watir
   module Generator
     class Base::SpecExtractor
 
-      IDL_SELECTOR = "//pre[@class='idl']"
+      IDL_SELECTOR = "//pre[contains(@class, 'idl')]".freeze
 
       class InterfaceNotFound < StandardError; end
 

data/lib/watir/generator/base/visitor.rb

@@ -89,7 +89,7 @@ module Watir
         members = interface.members
         members += interface.implements.flat_map(&:members)
 
-        members.select { |e| e.kind_of?(WebIDL::Ast::Attribute) }
+        members.select { |e| e.kind_of?(WebIDL::Ast::Attribute) }.uniq(&:name)
       end
 
       def collection_class(name)
@@ -144,7 +144,8 @@ module Watir
              'Document', 'DocumentFragment', 'DOMTokenList', 'DOMSettableTokenList',
              'DOMStringMap', 'HTMLPropertiesCollection', /HTML.*Element/, /HTML.*Collection/,
              'CSSStyleDeclaration',  /.+List$/, 'Date', 'Element', /DOM.+ReadOnly/,
-             /SVGAnimated.+/, /SVG.*Element/, /SVG.*Collection/, 'SVGViewSpec'
+             /SVGAnimated.+/, /SVG.*Element/, /SVG.*Collection/, 'SVGViewSpec',
+             'Object', 'USVString'
           # probably completely wrong.
           String
         else

data/lib/watir/generator/html/spec_extractor.rb

@@ -6,8 +6,8 @@ module Watir
 
       def extract_interface_map
         # http://www.whatwg.org/specs/web-apps/current-work/#elements-1
-        table = @doc.search("//h3[@id='elements-3']/following-sibling::table[1]").first
-        table or raise "could not find elements-3 table"
+        table = @doc.search("//h3[@id='index-elements']/following-sibling::table[1]").first
+        table or raise "could not find index-elements table"
 
         @interface_map = {}
 

data/spec/browser_spec.rb

@@ -89,6 +89,17 @@ describe Watir::Browser do
             new_browser.close
           end
 
+          it "uses remote client when specifying remote" do
+            opts = {desired_capabilities: Selenium::WebDriver::Remote::Capabilities.chrome,
+                    url: url}
+            WatirSpec.implementation.browser_args = [:remote, opts]
+            new_browser = WatirSpec.new_browser
+            server_url = new_browser.driver.instance_variable_get('@bridge').http.instance_variable_get('@server_url')
+            expect(server_url).to eq URI.parse(url)
+
+            new_browser.close
+          end
+
           not_compliant_on :headless do
             it "accepts Chrome::Options instance as :options" do
               chrome_opts = Selenium::WebDriver::Chrome::Options.new(emulation: {userAgent: 'foo;bar'})

data/watir.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name        = 'watir'
-  s.version     = '6.6.2'
+  s.version     = '6.6.3'
   s.platform    = Gem::Platform::RUBY
   s.authors     = ['Alex Rodionov', 'Titus Fortner']
   s.email       = ['p0deje@gmail.com', 'titusfortner@gmail.com']
@@ -25,7 +25,7 @@ It facilitates the writing of automated tests by mimicing the behavior of a user
 
   s.add_development_dependency 'rspec', '~> 3.0'
   s.add_development_dependency 'yard', '> 0.8.2.1'
-  s.add_development_dependency 'webidl', '>= 0.1.5'
+  s.add_development_dependency 'webidl', '>= 0.2.0'
   s.add_development_dependency 'rake', '~> 0.9.2'
   s.add_development_dependency 'fuubar'
   s.add_development_dependency 'nokogiri'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: watir
 version: !ruby/object:Gem::Version
-  version: 6.6.2
+  version: 6.6.3
 platform: ruby
 authors:
 - Alex Rodionov
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-08 00:00:00.000000000 Z
+date: 2017-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
@@ -65,14 +65,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.5
+        version: 0.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.5
+        version: 0.2.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement