capybara-webkit 1.14.0 → 1.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: adb3d932baa61a8938f10d7262631a313584a190
-  data.tar.gz: df339e2e1777df21576775f21a38188a972edb62
+SHA256:
+  metadata.gz: f98f26d98fee3ba5650659c14fee6a562e6229a3bc67eb031b1854c3a846e115
+  data.tar.gz: e5ff61d1a3c60ac7d95a5ede81da61ba9cfd5a322993297875fb3b7bec832bcf
 SHA512:
-  metadata.gz: 3154fa91673bf59aa710a48ed94ed93d2da7f3e2146e15cd9f99f952ac440b6b49b6784cbcc063ffe05dd4aa38c3108296fc14244ea316662c1d8000de0f870a
-  data.tar.gz: 08883b67a4e99e083eb65bfeee24d00d0775626d16d905c1a86aaa2e2f6e712b8efcd7b13c0f50e328f95d7ac016ae23375f69ffe755aede97f17f6eba28aa83
+  metadata.gz: fcdf7fc7c653219f05a956f3c4d273d48f20fce6a59b5938c7333f5fc78b31ea13a531617d80928576847c7c99916fea09708d9dca087d4737090d47a28cb311
+  data.tar.gz: 211921dbfcde185453e09ea907c9c435ece722a50169b92a73b471a74bf0e33148113a9508b8324a3bcd8ac4c02d302e88d93819fd2d5e4c0ba7c6d04e46b7c3

data/.travis.yml

@@ -2,10 +2,9 @@ sudo: required
 dist: trusty
 language: ruby
 rvm:
-  - 1.9.3
-  - 2.1
   - 2.2
-  - jruby-19mode
+  - 2.4
+  - 2.5
 notifications:
   email: false
 script: xvfb-run bundle exec rake
@@ -25,18 +24,18 @@ addons:
 matrix:
   include:
     - rvm: 1.9.3
-      gemfile: gemfiles/2.7.gemfile
-      env: QMAKE=/usr/lib/x86_64-linux-gnu/qt4/bin/qmake
-    - rvm: 1.9.3
-      gemfile: gemfiles/2.13.gemfile
+      gemfile: gemfiles/2.15.gemfile
       env: QMAKE=/usr/lib/x86_64-linux-gnu/qt4/bin/qmake
+    - rvm: jruby-19mode
+      gemfile: gemfiles/2.15.gemfile
     - rvm: 2.3.3
       gemfile: gemfiles/master.gemfile
+    - rvm: jruby-9.1.13.0
+      gemfile: Gemfile
   allow_failures:
     - gemfile: gemfiles/master.gemfile
 gemfile:
-  - gemfiles/2.7.gemfile
-  - gemfiles/2.13.gemfile
+  - Gemfile
 before_install:
   - gem install bundler
 install: bundle

data/Appraisals

@@ -1,16 +1,10 @@
-appraise "2.7" do
-  gem "capybara", "~> 2.7.0"
-  gem "rspec", "~> 2.14.0"
-  gem 'addressable', '< 2.5.0', :platforms=>[:ruby_19, :jruby_19] # 2.5 requires public_suffix which requires ruby 2.0
-  gem 'nokogiri', '< 1.7.0', :platforms=>[:ruby_19, :jruby_19] # 1.7.0 requires ruby 2.1+
-end
-
-appraise "2.13" do
-  gem "capybara", "~> 2.13.0"
+appraise "2.15" do
+  gem "capybara", "~> 2.15.0"
   gem 'addressable', '< 2.5.0', :platforms=>[:ruby_19, :jruby_19] # 2.5 requires public_suffix which requires ruby 2.0
   gem 'nokogiri', '< 1.7.0', :platforms=>[:ruby_19, :jruby_19] # 1.7.0 requires ruby 2.1+
 end
 
 appraise "master" do
   gem "capybara", github: "jnicklas/capybara"
+  gem "puma"
 end

data/Gemfile

@@ -1,5 +1,4 @@
 source "https://rubygems.org"
 
 gemspec
-gem "mime-types", "< 3.0", platforms: [:ruby_19, :jruby_19]
 gem "json", "< 2.0", :platforms=>[:ruby_19, :jruby_19]

data/Gemfile.lock

@@ -2,24 +2,25 @@ PATH
   remote: .
   specs:
     capybara-webkit (1.14.0)
-      capybara (>= 2.3.0, < 2.14.0)
+      capybara (>= 2.3, < 4.0)
       json
 
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.5.0)
-      public_suffix (~> 2.0, >= 2.0.2)
-    appraisal (0.4.1)
+    addressable (2.5.2)
+      public_suffix (>= 2.0.2, < 4.0)
+    appraisal (2.2.0)
       bundler
       rake
-    capybara (2.13.0)
+      thor (>= 0.14.0)
+    capybara (2.17.0)
       addressable
-      mime-types (>= 1.16)
+      mini_mime (>= 0.1.3)
       nokogiri (>= 1.3.3)
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
-      xpath (~> 2.0)
+      xpath (>= 2.0, < 4.0)
     diff-lcs (1.3)
     ffi (1.9.18-java)
     json (1.8.6)
@@ -29,43 +30,43 @@ GEM
     launchy (2.4.3-java)
       addressable (~> 2.3)
       spoon (~> 0.0.1)
-    mime-types (2.99.3)
-    mini_magick (4.6.1)
-    mini_portile2 (2.1.0)
-    nokogiri (1.7.1)
-      mini_portile2 (~> 2.1.0)
-    nokogiri (1.7.1-java)
-    nokogiri (1.7.1-x86-mingw32)
-      mini_portile2 (~> 2.1.0)
-    public_suffix (2.0.5)
-    rack (1.6.5)
-    rack-protection (1.5.3)
+    mini_magick (4.8.0)
+    mini_mime (1.0.0)
+    mini_portile2 (2.3.0)
+    mustermann (1.0.1)
+    nokogiri (1.8.1)
+      mini_portile2 (~> 2.3.0)
+    public_suffix (3.0.0)
+    rack (2.0.3)
+    rack-protection (2.0.0)
       rack
-    rack-test (0.6.3)
-      rack (>= 1.0)
+    rack-test (0.8.2)
+      rack (>= 1.0, < 3)
     rake (11.3.0)
-    rspec (3.5.0)
-      rspec-core (~> 3.5.0)
-      rspec-expectations (~> 3.5.0)
-      rspec-mocks (~> 3.5.0)
-    rspec-core (3.5.4)
-      rspec-support (~> 3.5.0)
-    rspec-expectations (3.5.0)
+    rspec (3.7.0)
+      rspec-core (~> 3.7.0)
+      rspec-expectations (~> 3.7.0)
+      rspec-mocks (~> 3.7.0)
+    rspec-core (3.7.0)
+      rspec-support (~> 3.7.0)
+    rspec-expectations (3.7.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
-    rspec-mocks (3.5.0)
+      rspec-support (~> 3.7.0)
+    rspec-mocks (3.7.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.5.0)
-    rspec-support (3.5.0)
-    sinatra (1.4.8)
-      rack (~> 1.5)
-      rack-protection (~> 1.4)
-      tilt (>= 1.3, < 3)
+      rspec-support (~> 3.7.0)
+    rspec-support (3.7.0)
+    sinatra (2.0.0)
+      mustermann (~> 1.0)
+      rack (~> 2.0)
+      rack-protection (= 2.0.0)
+      tilt (~> 2.0)
     spoon (0.0.6)
       ffi
-    tilt (2.0.7)
-    xpath (2.0.0)
-      nokogiri (~> 1.3)
+    thor (0.20.0)
+    tilt (2.0.8)
+    xpath (3.0.0)
+      nokogiri (~> 1.8)
 
 PLATFORMS
   java
@@ -73,15 +74,14 @@ PLATFORMS
   x86-mingw32
 
 DEPENDENCIES
-  appraisal (~> 0.4.0)
+  appraisal
   capybara-webkit!
   json (< 2.0)
   launchy
-  mime-types (< 3.0)
   mini_magick
   rake (< 12.0.0)
   rspec (~> 3.5)
   sinatra
 
 BUNDLED WITH
-   1.14.5
+   1.16.0

data/NEWS.md

@@ -1,3 +1,17 @@
+New for 1.15.0:
+
+* Fire events on select when options is within an optgroup
+* Support threadsafe/per session config mode
+* Support for Capybara 2.15
+* Support #refresh
+* Work around form fields overriding form element methods
+* Explicitly shutdown webkit_server when shutting down
+* Only override font in Qt versions where it's needed
+* Make select elements generate the events specified by WebDriver spec
+* Node#[] prefers properties over attributes
+* Add time to logging
+* Don't check node ancestors for CSS visibility setting
+
 New for 1.14.0:
 
 * Fix the 'Reset' command in debug builds (on Windows)

data/README.md

@@ -1,8 +1,8 @@
 capybara-webkit
 ===============
 
-[![Build Status](https://secure.travis-ci.org/thoughtbot/capybara-webkit.png?branch=master)](https://travis-ci.org/thoughtbot/capybara-webkit)
-[![Code Climate](https://codeclimate.com/github/thoughtbot/capybara-webkit.png)](https://codeclimate.com/github/thoughtbot/capybara-webkit)
+[![Build Status](https://secure.travis-ci.org/thoughtbot/capybara-webkit.svg?branch=master)](https://travis-ci.org/thoughtbot/capybara-webkit)
+[![Code Climate](https://codeclimate.com/github/thoughtbot/capybara-webkit.svg)](https://codeclimate.com/github/thoughtbot/capybara-webkit)
 
 A [capybara](https://github.com/jnicklas/capybara) driver that uses [WebKit](http://webkit.org) via [QtWebKit](http://trac.webkit.org/wiki/QtWebKit).
 

data/capybara-webkit.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |s|
 
   s.requirements << "Qt >= 4.8"
 
-  s.add_runtime_dependency("capybara", ">= 2.3.0", "< 2.14.0")
+  s.add_runtime_dependency("capybara", ">= 2.3", "< 4.0")
   s.add_runtime_dependency("json")
 
   s.add_development_dependency("rspec", "~> 3.5")
@@ -29,7 +29,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency("sinatra")
   s.add_development_dependency("mini_magick")
   s.add_development_dependency("rake", "< 12.0.0")
-  s.add_development_dependency("appraisal", "~> 0.4.0")
+  s.add_development_dependency("appraisal")
   s.add_development_dependency("launchy")
 end
 

data/gemfiles/2.15.gemfile

@@ -0,0 +1,10 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "json", "< 2.0", platforms: [:ruby_19, :jruby_19]
+gem "capybara", "~> 2.15.0"
+gem "addressable", "< 2.5.0", platforms: [:ruby_19, :jruby_19]
+gem "nokogiri", "< 1.7.0", platforms: [:ruby_19, :jruby_19]
+
+gemspec path: "../"

data/gemfiles/master.gemfile

@@ -2,8 +2,7 @@
 
 source "https://rubygems.org"
 
-gem "mime-types", "< 3.0", :platforms=>[:ruby_19, :jruby_19]
-gem "json", "< 2.0", :platforms=>[:ruby_19, :jruby_19]
-gem "capybara", :github=>"jnicklas/capybara"
+gem "capybara", github: "jnicklas/capybara"
+gem "puma"
 
-gemspec :path=>"../"
+gemspec path: "../"

data/lib/capybara/webkit/browser.rb

@@ -84,7 +84,7 @@ module Capybara::Webkit
     def frame_focus(selector=nil)
       if selector.respond_to?(:base)
         selector.base.invoke("focus_frame")
-      elsif selector.is_a? Fixnum
+      elsif selector.is_a? Integer
         command("FrameFocus", "", selector.to_s)
       elsif selector
         command("FrameFocus", selector)
@@ -134,7 +134,7 @@ module Capybara::Webkit
     end
 
     def get_window_handles
-      JSON.parse(command('GetWindowHandles'))
+      JSON.parse(command("GetWindowHandles"))
     end
 
     def window_handles
@@ -144,7 +144,7 @@ module Capybara::Webkit
     end
 
     def get_window_handle
-      command('GetWindowHandle')
+      command("GetWindowHandle")
     end
 
     def window_handle
@@ -236,12 +236,17 @@ https://github.com/thoughtbot/capybara-webkit/wiki/Reporting-Crashes
     end
 
     def evaluate_script(script, *args)
-      json = command('Evaluate', script, args.to_json)
+      json = command("Evaluate", script, args.to_json)
+      JSON.parse("[#{json}]").first
+    end
+
+    def evaluate_async_script(script, *args)
+      json = command("EvaluateAsync", script, args.to_json)
       JSON.parse("[#{json}]").first
     end
 
     def execute_script(script, *args)
-      command('Execute', script, args.to_json)
+      command("Execute", script, args.to_json)
     end
 
     def render(path, width, height)
@@ -289,6 +294,10 @@ https://github.com/thoughtbot/capybara-webkit/wiki/Reporting-Crashes
       command("GoForward")
     end
 
+    def refresh
+      command("Refresh")
+    end
+
     def allow_url(url)
       command("AllowUrl", url)
     end

data/lib/capybara/webkit/driver.rb

@@ -91,6 +91,11 @@ module Capybara::Webkit
       decode_result(result)
     end
 
+    def evaluate_async_script(script, *args)
+      result = @browser.evaluate_async_script(script, *encode_args(args))
+      decode_result(result)
+    end
+
     def console_messages
       @browser.console_messages
     end
@@ -241,6 +246,10 @@ module Capybara::Webkit
       @browser.go_forward
     end
 
+    def refresh
+      @browser.refresh
+    end
+
     def accept_modal(type, options={})
       options = modal_action_options_for_browser(options)
 
@@ -359,7 +368,11 @@ module Capybara::Webkit
     end
 
     def default_wait_time
-      Capybara.respond_to?(:default_max_wait_time) ? Capybara.default_max_wait_time : Capybara.default_wait_time
+      if respond_to?(:session_options) && session_options
+        session_options.default_max_wait_time
+      else
+        Capybara.respond_to?(:default_max_wait_time) ? Capybara.default_max_wait_time : Capybara.default_wait_time
+      end
     end
 
     def find_modal(type, id, options)

data/lib/capybara/webkit/node.rb

@@ -1,7 +1,7 @@
 module Capybara::Webkit
   class Node < Capybara::Driver::Node
-    def initialize(session, base, browser)
-      super(session, base)
+    def initialize(driver, base, browser)
+      super(driver, base)
       @browser = browser
     end
 
@@ -15,16 +15,18 @@ module Capybara::Webkit
     end
 
     def [](name)
-      value = invoke("attribute", name)
-      if name == 'checked' || name == 'disabled' || name == 'multiple'
-        value == 'true'
+      name = name.to_s
+      tn = tag_name
+      if (tn == "img" && name == "src") || (tn == "a" && name == "href")
+        # Although the attribute matters, the property is consistent. Return that in
+        # preference to the attribute for links and images.
+        # if attribute exists get the property
+        val = invoke(:attribute, name) && invoke(:property, name)
       else
-        if invoke("hasAttribute", name) == 'true'
-          value
-        else
-          nil
-        end
+        val = invoke(:property, name)
+        val = invoke(:attribute, name) if val.nil? || val.is_a?(Hash)
       end
+      val
     end
 
     def value
@@ -43,7 +45,8 @@ module Capybara::Webkit
       invoke 'setInnerHTML', value
     end
 
-    def set(value)
+    def set(value, options = {})
+      warn "Options passed to Node#set but capybara-webkit doesn't currently support any - ignoring" unless options.empty?
       invoke "set", *[value].flatten
     end
 
@@ -66,16 +69,16 @@ module Capybara::Webkit
       end
     end
 
-    def click
-      invoke("leftClick")
+    def click(keys = [], offset = {})
+      invoke("leftClick", keys.to_json, offset.to_json)
     end
 
-    def double_click
-      invoke("doubleClick")
+    def double_click(keys = [], offset = {})
+      invoke("doubleClick", keys.to_json, offset.to_json)
     end
 
-    def right_click
-      invoke("rightClick")
+    def right_click(keys = [], offset = {})
+      invoke("rightClick", keys.to_json, offset.to_json)
     end
 
     def hover
@@ -91,15 +94,15 @@ module Capybara::Webkit
     end
 
     def visible?
-      invoke("visible") == "true"
+      invoke("visible") == true
     end
 
     def selected?
-      invoke("selected") == "true"
+      invoke("selected") == true
     end
 
     def checked?
-      self['checked']
+      !!self["checked"]
     end
 
     def disabled?
@@ -139,7 +142,8 @@ module Capybara::Webkit
     end
 
     def invoke(name, *args)
-      @browser.command "Node", name, allow_unattached_nodes?, native, *args
+      result = @browser.command "Node", name, allow_unattached_nodes?, native, *args
+      JSON.parse(result, quirks_mode: true)
     end
 
     def allow_unattached_nodes?
@@ -147,11 +151,14 @@ module Capybara::Webkit
     end
 
     def automatic_reload?
-      Capybara.respond_to?(:automatic_reload) && Capybara.automatic_reload
+      session_option(:automatic_reload)
     end
 
     def attached?
-      @browser.command("Node", "isAttached", native) == "true"
+      warn "[DEPRECATION] The Capybara::Webkit::Node#attached? " \
+        "method is deprecated without replacement."
+      result = @browser.command("Node", "isAttached", native)
+      JSON.parse(result, quirks_mode: true)
     end
 
     def multiple_select?
@@ -159,11 +166,19 @@ module Capybara::Webkit
     end
 
     def ==(other)
-      invoke("equals", other.native) == "true"
+      invoke("equals", other.native)
     end
 
     private
 
+    def session_option(name)
+      if driver.respond_to?(:session_options)
+        driver.session_options.public_send(name)
+      else
+        Capybara.respond_to?(name) && Capybara.public_send(name)
+      end
+    end
+
     def convert_to_named_keys(key)
       if key.is_a? Array
         key.map { |k| convert_to_named_keys(k)}