capybara-webkit 1.11.1 → 1.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c4e5cb098e565dd288fa0a9d862e9d828dd72888
-  data.tar.gz: ae04f2c076495ac1783489cb5be48a41dd9734c2
+  metadata.gz: efdcc01079f8576da25de8dff0b6c127170509e5
+  data.tar.gz: 48a04c108401162206fb5961fd2fa44fabd18e2d
 SHA512:
-  metadata.gz: 4a334d6048f9faa8911699c37f220045e2254382bf7dc2fd6663ad38065eeb15a27a708120ebaa14561aba9f9c43a7bf10627ceda86faa5c1ef75e2a09d5adca
-  data.tar.gz: e1461ccb3414bfdc080058607767f5bd67f77869b4da2911dfe7a4670356d625a30f100e7c612543c0e1741c4d07ea07a4bb46dc9acd57469646a5aa29404ba6
+  metadata.gz: 234683f1ab1be1f2c7a1ddbdcac6c0389b705a385947e5a86d142b92d6317f6ad4e9fce7d19a55e07f398f3822bd1dcb214d92295301b74c38d72fb6479a6f1c
+  data.tar.gz: 9b6ad7da59e67012182e27044619b229674f961429cf272dc0c96298eac4fee1fd3aed74c15dbaf7c2db44b724b510b0a99542e9b0abbc7b87a8584b9fa66ce8

data/.travis.yml

@@ -1,3 +1,5 @@
+sudo: required
+dist: trusty
 language: ruby
 rvm:
   - 1.9.3
@@ -11,7 +13,8 @@ env:
   global:
     - BUNDLE_JOBS=4
     - NOKOGIRI_USE_SYSTEM_LIBRARIES=true
-    - QMAKE=/usr/lib/x86_64-linux-gnu/qt4/bin/qmake
+    - QMAKE=/usr/lib/x86_64-linux-gnu/qt5/bin/qmake
+    - JAVA_OPTS=-Djava.security.egd=file:/dev/urandom
 addons:
   apt:
     sources:
@@ -22,19 +25,18 @@ addons:
 matrix:
   include:
     - rvm: 1.9.3
-      gemfile: gemfiles/2.6.gemfile
-      env: QMAKE=/usr/lib/x86_64-linux-gnu/qt5/bin/qmake
+      gemfile: gemfiles/2.7.gemfile
+      env: QMAKE=/usr/lib/x86_64-linux-gnu/qt4/bin/qmake
     - rvm: 1.9.3
-      gemfile: gemfiles/2.5.gemfile
-      env: QMAKE=/usr/lib/x86_64-linux-gnu/qt5/bin/qmake
-    - rvm: 2.2
+      gemfile: gemfiles/2.11.gemfile
+      env: QMAKE=/usr/lib/x86_64-linux-gnu/qt4/bin/qmake
+    - rvm: 2.3.1
       gemfile: gemfiles/master.gemfile
-      env: QMAKE=/usr/lib/x86_64-linux-gnu/qt5/bin/qmake
   allow_failures:
     - gemfile: gemfiles/master.gemfile
 gemfile:
-  - gemfiles/2.6.gemfile
-  - gemfiles/2.5.gemfile
+  - gemfiles/2.7.gemfile
+  - gemfiles/2.11.gemfile
 before_install:
   - gem install bundler
 install: bundle

data/Appraisals

@@ -1,9 +1,13 @@
-appraise "2.6" do
-  gem "capybara", "~> 2.6.0"
-end
-
 appraise "2.7" do
   gem "capybara", "~> 2.7.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.11" do
+  gem "capybara", "~> 2.11.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

data/Gemfile

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

data/Gemfile.lock

@@ -1,71 +1,61 @@
 PATH
   remote: .
   specs:
-    capybara-webkit (1.11.1)
-      capybara (>= 2.3.0, < 2.8.0)
+    capybara-webkit (1.12.0)
+      capybara (>= 2.3.0, < 2.13.0)
       json
 
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.3.6)
-    appraisal (0.4.0)
+    addressable (2.5.0)
+      public_suffix (~> 2.0, >= 2.0.2)
+    appraisal (0.4.1)
       bundler
       rake
-    capybara (2.5.0)
+    capybara (2.11.0)
+      addressable
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
       xpath (~> 2.0)
-    childprocess (0.5.5)
-      ffi (~> 1.0, >= 1.0.11)
-    diff-lcs (1.2.4)
-    ffi (1.9.8)
-    ffi (1.9.8-java)
-    ffi (1.9.8-x86-mingw32)
+    diff-lcs (1.2.5)
+    ffi (1.9.14-java)
     json (1.8.3)
-    launchy (2.4.2)
+    json (1.8.3-java)
+    launchy (2.4.3)
       addressable (~> 2.3)
-    launchy (2.4.2-java)
+    launchy (2.4.3-java)
       addressable (~> 2.3)
       spoon (~> 0.0.1)
-    mime-types (2.6.1)
-    mini_magick (3.2.1)
-      subexec (~> 0.0.4)
-    mini_portile2 (2.0.0)
-    multi_json (1.11.0)
-    nokogiri (1.6.7.2)
-      mini_portile2 (~> 2.0.0.rc2)
-    rack (1.6.4)
-    rack-protection (1.3.2)
+    mime-types (2.99.3)
+    mini_magick (4.6.0)
+    mini_portile2 (2.1.0)
+    nokogiri (1.7.0.1)
+      mini_portile2 (~> 2.1.0)
+    public_suffix (2.0.5)
+    rack (1.6.5)
+    rack-protection (1.5.3)
       rack
     rack-test (0.6.3)
       rack (>= 1.0)
-    rake (0.9.2)
-    rspec (2.14.1)
-      rspec-core (~> 2.14.0)
-      rspec-expectations (~> 2.14.0)
-      rspec-mocks (~> 2.14.0)
-    rspec-core (2.14.4)
-    rspec-expectations (2.14.1)
+    rake (11.3.0)
+    rspec (2.99.0)
+      rspec-core (~> 2.99.0)
+      rspec-expectations (~> 2.99.0)
+      rspec-mocks (~> 2.99.0)
+    rspec-core (2.99.2)
+    rspec-expectations (2.99.2)
       diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.14.3)
-    rubyzip (1.1.7)
-    selenium-webdriver (2.45.0)
-      childprocess (~> 0.5)
-      multi_json (~> 1.0)
-      rubyzip (~> 1.0)
-      websocket (~> 1.0)
-    sinatra (1.3.5)
-      rack (~> 1.4)
-      rack-protection (~> 1.3)
-      tilt (~> 1.3, >= 1.3.3)
-    spoon (0.0.4)
+    rspec-mocks (2.99.4)
+    sinatra (1.4.7)
+      rack (~> 1.5)
+      rack-protection (~> 1.4)
+      tilt (>= 1.3, < 3)
+    spoon (0.0.6)
       ffi
-    subexec (0.0.4)
-    tilt (1.3.3)
-    websocket (1.2.1)
+    tilt (2.0.5)
     xpath (2.0.0)
       nokogiri (~> 1.3)
 
@@ -77,13 +67,13 @@ PLATFORMS
 DEPENDENCIES
   appraisal (~> 0.4.0)
   capybara-webkit!
+  json (< 2.0)
   launchy
   mime-types (< 3.0)
   mini_magick
-  rake
-  rspec (~> 2.14.0)
-  selenium-webdriver
+  rake (< 12.0.0)
+  rspec (~> 2.14)
   sinatra
 
 BUNDLED WITH
-   1.11.2
+   1.13.6

data/README.md

@@ -11,7 +11,7 @@ Qt Dependency and Installation Issues
 
 capybara-webkit depends on a WebKit implementation from Qt, a cross-platform
 development toolkit. You'll need to download the Qt libraries to build and
-install the gem. You can find instructions for downloading and installing QT on
+install the gem. You can find instructions for downloading and installing Qt on
 the
 [capybara-webkit wiki](https://github.com/thoughtbot/capybara-webkit/wiki/Installing-Qt-and-compiling-capybara-webkit).
 capybara-webkit requires Qt version 4.8 or greater.
@@ -39,7 +39,7 @@ If you don't have any luck there, please post to [Stack Overflow]. Please don't
 open a Github issue for a system-specific compiler issue.
 
 [Reporting Crashes]: https://github.com/thoughtbot/capybara-webkit/wiki/Reporting-Crashes
-[capybara-webkit wiki]: https://github.com/thoughtbot/capybara-webkit/wiki
+[wiki]: https://github.com/thoughtbot/capybara-webkit/wiki
 [Stack Overflow]: http://stackoverflow.com/questions/tagged/capybara-webkit
 
 CI

data/capybara-webkit.gemspec

@@ -19,16 +19,17 @@ Gem::Specification.new do |s|
 
   s.required_ruby_version = ">= 1.9.0"
 
-  s.add_runtime_dependency("capybara", ">= 2.3.0", "< 2.8.0")
+  s.requirements << "Qt >= 4.8"
+
+  s.add_runtime_dependency("capybara", ">= 2.3.0", "< 2.13.0")
   s.add_runtime_dependency("json")
 
-  s.add_development_dependency("rspec", "~> 2.14.0")
+  s.add_development_dependency("rspec", "~> 2.14")
   # Sinatra is used by Capybara's TestApp
   s.add_development_dependency("sinatra")
   s.add_development_dependency("mini_magick")
-  s.add_development_dependency("rake")
+  s.add_development_dependency("rake", "< 12.0.0")
   s.add_development_dependency("appraisal", "~> 0.4.0")
-  s.add_development_dependency("selenium-webdriver")
   s.add_development_dependency("launchy")
 end
 

data/gemfiles/2.11.gemfile

@@ -0,0 +1,11 @@
+# This file was generated by Appraisal
+
+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", "~> 2.11.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/2.7.gemfile

@@ -3,6 +3,9 @@
 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", "~> 2.7.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

@@ -3,6 +3,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"
 
 gemspec :path=>"../"

data/lib/capybara/webkit/browser.rb

@@ -223,13 +223,13 @@ https://github.com/thoughtbot/capybara-webkit/wiki/Reporting-Crashes
       MESSAGE
     end
 
-    def evaluate_script(script)
-      json = command('Evaluate', script)
+    def evaluate_script(script, *args)
+      json = command('Evaluate', script, args.to_json)
       JSON.parse("[#{json}]").first
     end
 
-    def execute_script(script)
-      command('Execute', script)
+    def execute_script(script, *args)
+      command('Execute', script, args.to_json)
     end
 
     def render(path, width, height)

data/lib/capybara/webkit/driver.rb

@@ -76,13 +76,18 @@ module Capybara::Webkit
       @browser.title
     end
 
-    def execute_script(script)
-      value = @browser.execute_script script
-      value.empty? ? nil : value
+    def execute_script(script, *args)
+      value = @browser.execute_script(script, *encode_args(args))
+
+      if value.empty?
+        nil
+      else
+        value
+      end
     end
 
-    def evaluate_script(script)
-      @browser.evaluate_script script
+    def evaluate_script(script, *args)
+      @browser.evaluate_script(script, *encode_args(args))
     end
 
     def console_messages
@@ -144,6 +149,21 @@ module Capybara::Webkit
       end
     end
 
+    def switch_to_frame(frame)
+      case frame
+      when :top
+        begin
+          loop { @browser.frame_focus }
+        rescue Capybara::Webkit::InvalidResponseError => e
+          raise unless e.message =~ /Already at parent frame/
+        end
+      when :parent
+        @browser.frame_focus
+      else
+        @browser.frame_focus(frame)
+      end
+    end
+
     def within_window(selector)
       current_window = current_window_handle
       switch_to_window(selector)
@@ -391,5 +411,15 @@ module Capybara::Webkit
         "This option is global and can be configured once" \
         " (not in a `before` or `setup` block)."
     end
+
+    def encode_args(args)
+      args.map do |arg|
+        if arg.is_a?(Capybara::Webkit::Node)
+          { ELEMENT: arg.native }.to_json
+        else
+          arg.to_json
+        end
+      end
+    end
   end
 end

data/lib/capybara/webkit/node.rb

@@ -114,11 +114,13 @@ module Capybara::Webkit
     end
 
     def disabled?
-      if %w(option optgroup).include? tag_name
-        self['disabled'] || find_xpath("parent::*")[0].disabled?
-      else
-        self['disabled']
-      end
+      xpath = "parent::optgroup[@disabled] | " \
+        "ancestor::select[@disabled] | " \
+        "parent::fieldset[@disabled] | " \
+        "ancestor::*[not(self::legend) or " \
+        "preceding-sibling::legend][parent::fieldset[@disabled]]"
+
+      self["disabled"] || !find_xpath(xpath).empty?
     end
 
     def path

data/lib/capybara/webkit/version.rb

@@ -1,7 +1,7 @@
 module Capybara
   module Driver
     class Webkit
-      VERSION = "1.11.1".freeze
+      VERSION = "1.12.0".freeze
     end
   end
 end

data/lib/capybara_webkit_builder.rb

@@ -45,7 +45,7 @@ module CapybaraWebkitBuilder
   end
 
   def qmake
-    sh("#{make_bin} qmake")
+    make "qmake"
   end
 
   def path_to_binary
@@ -58,7 +58,7 @@ module CapybaraWebkitBuilder
   end
 
   def build
-    sh(make_bin) or return false
+    make or return false
 
     FileUtils.mkdir("bin") unless File.directory?("bin")
     FileUtils.cp(path_to_binary, "bin", :preserve => true)
@@ -89,4 +89,17 @@ module CapybaraWebkitBuilder
     build &&
     clean
   end
+
+  def make(target = "")
+    env_hide("CDPATH") { sh("#{make_bin} #{target}") }
+  end
+
+  def env_hide(name)
+    @stored_env ||= {}
+    @stored_env[name] = ENV.delete(name)
+
+    yield
+  ensure
+    ENV[name] = @stored_env[name]
+  end
 end

data/spec/driver_spec.rb

@@ -62,12 +62,25 @@ describe Capybara::Webkit::Driver do
               </head>
               <body>
                 <script type="text/javascript">
-                  document.write("<p id='farewell'>goodbye</p>");
+                  document.write("<p id='farewell'>goodbye</p><iframe id='g' src='/iframe2'></iframe>");
                 </script>
               </body>
             </html>
           HTML
         end
+
+        get '/iframe2' do
+          <<-HTML
+            <html>
+              <head>
+                <title>Frame 2</title>
+              </head>
+              <body>
+                <div>In frame 2</div>
+              </body>
+            </html>
+          HTML
+        end
       end
     end
 
@@ -95,6 +108,37 @@ describe Capybara::Webkit::Driver do
       end
     end
 
+    it "switches to frame by element" do
+      frame = driver.find_xpath('//iframe').first
+      element = double(Capybara::Node::Base, base: frame)
+      driver.switch_to_frame(element)
+      driver.find_xpath("//*[contains(., 'goodbye')]").should_not be_empty
+      driver.switch_to_frame(:parent)
+    end
+
+    it "can switch back to the parent frame" do
+      frame = driver.find_xpath('//iframe').first
+      element = double(Capybara::Node::Base, base: frame)
+      driver.switch_to_frame(element)
+      driver.switch_to_frame(:parent)
+      driver.find_xpath("//*[contains(., 'greeting')]").should_not be_empty
+      driver.find_xpath("//*[contains(., 'goodbye')]").should be_empty
+    end
+
+    it "can switch to the top frame" do
+      frame = driver.find_xpath('//iframe').first
+      element = double(Capybara::Node::Base, base: frame)
+      driver.switch_to_frame(element)
+      frame2 = driver.find_xpath('//iframe[@id="g"]').first
+      element2 = double(Capybara::Node::Base, base: frame2)
+      driver.switch_to_frame(element2)
+      driver.find_xpath("//div[contains(., 'In frame 2')]").should_not be_empty
+      driver.switch_to_frame(:top)
+      driver.find_xpath("//*[contains(., 'greeting')]").should_not be_empty
+      driver.find_xpath("//*[contains(., 'goodbye')]").should be_empty
+      driver.find_xpath("//div[contains(., 'In frame 2')]").should be_empty
+    end
+
     it "raises error for missing frame by index" do
       expect { driver.within_frame(1) { } }.
         to raise_error(Capybara::Webkit::InvalidResponseError)
@@ -528,6 +572,38 @@ describe Capybara::Webkit::Driver do
         to raise_error(Capybara::Webkit::InvalidResponseError)
     end
 
+    it "passes arguments to executed Javascript" do
+      driver.execute_script(%<document.getElementById('greeting').innerHTML = arguments[0]>, "My argument")
+      driver.find_xpath("//p[contains(., 'My argument')]").should_not be_empty
+    end
+
+    it "passes multiple arguments to executed Javascript" do
+      driver.execute_script(
+        %<document.getElementById('greeting').innerHTML = arguments[0] + arguments[1] + arguments[2].color>,
+        "random", 4, {color: 'red'})
+      driver.find_xpath("//p[contains(., 'random4red')]").should_not be_empty
+    end
+
+    it "passes page elements to executed Javascript" do
+      greeting = driver.find_xpath("//p[@id='greeting']").first
+      driver.execute_script(%<arguments[0].innerHTML = arguments[1]>, greeting, "new content")
+      driver.find_xpath("//p[@id='greeting'][contains(., 'new content')]").should_not be_empty
+    end
+
+    it "passes arguments to evaaluated Javascript" do
+      driver.evaluate_script(%<arguments[0]>, 3).should eq 3
+    end
+
+    it "passes multiple arguments to evaluated Javascript" do
+      driver.evaluate_script(%<arguments[0] + arguments[1] + arguments[2].num>, 3, 4, {num: 5}).should eq 12
+    end
+
+    it "passes page elements to evaluated Javascript" do
+      greeting = driver.find_xpath("//p[@id='greeting']").first
+      driver.evaluate_script(%<arguments[1].innerHTML = arguments[0]; arguments[2]>, "newer content", greeting, 7).should eq 7
+      driver.find_xpath("//p[@id='greeting'][contains(., 'newer content')]").should_not be_empty
+    end
+
     it "doesn't raise an error for Javascript that doesn't return anything" do
       lambda { driver.execute_script(%<(function () { "returns nothing" })()>) }.
         should_not raise_error
@@ -726,7 +802,7 @@ describe Capybara::Webkit::Driver do
                 </head>
                 <body>
                   <script type="text/javascript">
-                    alert('First alert'); 
+                    alert('First alert');
                   </script>
                   <input type="button" onclick="alert('Second alert')" name="test"/>
                 </body>
@@ -764,12 +840,12 @@ describe Capybara::Webkit::Driver do
       end
 
       it 'finds two alert windows in a row' do
-        driver.accept_modal(:alert, text: 'First alert') do 
+        driver.accept_modal(:alert, text: 'First alert') do
           visit('/double')
         end
 
         expect {
-          driver.accept_modal(:alert, text: 'Boom') do 
+          driver.accept_modal(:alert, text: 'Boom') do
             driver.find_xpath("//input").first.click
           end
         }.to raise_error Capybara::ModalNotFound, "Unable to find modal dialog with Boom"
@@ -2795,7 +2871,7 @@ CACHE MANIFEST
         visit("/")
 
         expect(stderr).to include("http://example.com/path")
-        expect(stderr).not_to include(driver.current_url)        
+        expect(stderr).not_to include(driver.current_url)
       end
 
       it "can block unknown hosts" do
@@ -3140,7 +3216,7 @@ CACHE MANIFEST
       end
     end
 
-    it "reports and relaunches on reset" do
+    it "reports and relaunches on reset", skip_on_windows: true, skip_on_jruby: true do
       connection = fork_connection
       Process.kill "KILL", connection.pid
       expect { driver.reset! }.to raise_error(Capybara::Webkit::CrashError)

data/spec/fixtures/fake_server.sh

@@ -0,0 +1,3 @@
+#!/bin/sh
+
+sleep 1

data/spec/server_spec.rb

@@ -36,7 +36,7 @@ describe Capybara::Webkit::Connection do
   end
 
   it "raises an error if the server is not ready", skip_on_windows: true do
-    server_path = "sleep 1"
+    server_path = File.expand_path(File.join(__FILE__, "..", "fixtures", "fake_server.sh"))
     stub_const("Capybara::Webkit::Server::SERVER_PATH", server_path)
     start_timeout = 0.5
     stub_const(
@@ -45,11 +45,7 @@ describe Capybara::Webkit::Connection do
     )
 
     error_string =
-      if defined?(::JRUBY_VERSION)
-        "#{server_path} failed to start."
-      else
-        "#{server_path} failed to start after #{start_timeout} seconds."
-      end
+      "#{server_path} failed to start after #{start_timeout} seconds."
 
     expect { start_server }.
       to raise_error(Capybara::Webkit::ConnectionError, error_string)

data/src/Evaluate.cpp

@@ -8,7 +8,26 @@ Evaluate::Evaluate(WebPageManager *manager, QStringList &arguments, QObject *par
 }
 
 void Evaluate::start() {
-  QVariant result = page()->currentFrame()->evaluateJavaScript(arguments()[0]);
+  QString script = arguments()[0];
+  QString jsonArgs;
+  if (arguments().length()>1){
+    jsonArgs = arguments()[1];
+  } else {
+    jsonArgs ="[]";
+  }
+  QString eval_script = QString("(function(){"
+                           "   for(var i=0; i<arguments.length; i++) {"
+                           "     arguments[i] = JSON.parse(arguments[i]);"
+                           "     if (arguments[i]['ELEMENT']) {"
+                           "       arguments[i] = Capybara.getNode(arguments[i]['ELEMENT']);"
+                           "     };"
+                           "   };"
+                           "   return eval(\"%1\");"
+                           "   }).apply(null, %2)").arg(script.replace("\"","\\\"").remove("\n"), jsonArgs);
+  QObject invocation_stub;
+  invocation_stub.setProperty("allowUnattached", false);
+  page()->currentFrame()->addToJavaScriptWindowObject("CapybaraInvocation", &invocation_stub);
+  QVariant result = page()->currentFrame()->evaluateJavaScript(eval_script);
   JsonSerializer serializer;
   finish(true, serializer.serialize(result));
 }

data/src/Execute.cpp

@@ -7,7 +7,24 @@ Execute::Execute(WebPageManager *manager, QStringList &arguments, QObject *paren
 }
 
 void Execute::start() {
-  QString script = arguments()[0] + QString("; 'success'");
+  QString jsonArgs;
+  if (arguments().length()>1){
+    jsonArgs = arguments()[1];
+  } else {
+    jsonArgs ="[]";
+  }
+  QString script = QString("(function(){"
+                           "   for(var i=0; i<arguments.length; i++) {"
+                           "     arguments[i] = JSON.parse(arguments[i]);"
+                           "     if (arguments[i]['ELEMENT']) {"
+                           "       arguments[i] = Capybara.getNode(arguments[i]['ELEMENT']);"
+                           "     };"
+                           "   };"
+                           "   %1 }).apply(null, %2); 'success'").arg(arguments()[0], jsonArgs);
+
+  QObject invocation_stub;
+  invocation_stub.setProperty("allowUnattached", false);
+  page()->currentFrame()->addToJavaScriptWindowObject("CapybaraInvocation", &invocation_stub);
   QVariant result = page()->currentFrame()->evaluateJavaScript(script);
   if (result.isValid()) {
     finish(true);

data/src/FrameFocus.cpp

@@ -8,7 +8,6 @@ FrameFocus::FrameFocus(WebPageManager *manager, QStringList &arguments, QObject
 }
 
 void FrameFocus::start() {
-  findFrames();
   switch(arguments().length()) {
     case 1:
       focusId(arguments()[0]);
@@ -26,8 +25,10 @@ void FrameFocus::findFrames() {
 }
 
 void FrameFocus::focusIndex(int index) {
+  findFrames();
   if (isFrameAtIndex(index)) {
     frames[index]->setFocus();
+    page()->setCurrentFrameParent(frames[index]->parentFrame());
     success();
   } else {
     frameNotFound();
@@ -39,9 +40,11 @@ bool FrameFocus::isFrameAtIndex(int index) {
 }
 
 void FrameFocus::focusId(QString name) {
+  findFrames();
   for (int i = 0; i < frames.length(); i++) {
     if (frames[i]->frameName().compare(name) == 0) {
       frames[i]->setFocus();
+      page()->setCurrentFrameParent(frames[i]->parentFrame());
       success();
       return;
     }
@@ -51,10 +54,13 @@ void FrameFocus::focusId(QString name) {
 }
 
 void FrameFocus::focusParent() {
-  if (page()->currentFrame()->parentFrame() == 0) {
+  // if (page()->currentFrame()->parentFrame() == 0) {
+  if (page()->currentFrameParent() == 0) {
     finish(false, new ErrorMessage("Already at parent frame."));
   } else {
-    page()->currentFrame()->parentFrame()->setFocus();
+    // page()->currentFrame()->parentFrame()->setFocus();
+    page()->currentFrameParent()->setFocus();
+    page()->setCurrentFrameParent(page()->currentFrameParent()->parentFrame());
     success();
   }
 }

data/src/JavascriptInvocation.cpp

@@ -37,8 +37,14 @@ InvocationResult JavascriptInvocation::invoke(QWebFrame *frame) {
   QVariant result = frame->evaluateJavaScript("Capybara.invoke()");
   if (getError().isValid())
     return InvocationResult(getError(), true);
-  else
+  else {
+    if (functionName() == "leftClick") {
+      // Don't trigger the left click from JS incase the frame closes
+      QVariantMap qm = result.toMap();
+      leftClick(qm["absoluteX"].toInt(), qm["absoluteY"].toInt());
+    }
     return InvocationResult(result);
+  }
 }
 
 void JavascriptInvocation::leftClick(int x, int y) {

data/src/Node.cpp

@@ -11,6 +11,9 @@ void Node::start() {
   QString functionName = functionArguments.takeFirst();
   QString allowUnattached = functionArguments.takeFirst();
   InvocationResult result = page()->invokeCapybaraFunction(functionName, allowUnattached == "true", functionArguments);
+  if (functionName == "focus") {
+    page()->setCurrentFrameParent(page()->currentFrame()->parentFrame());
+  }
   finish(&result);
 }
 

data/src/WebPage.cpp

@@ -21,6 +21,7 @@ WebPage::WebPage(WebPageManager *manager, QObject *parent) : QWebPage(parent) {
   m_uuid = QUuid::createUuid().toString();
   m_confirmAction = true;
   m_promptAction = false;
+  m_currentFrameParent = 0;
 
   setForwardUnsupportedContent(true);
   loadJavascript();
@@ -255,6 +256,7 @@ bool WebPage::javaScriptPrompt(QWebFrame *frame, const QString &message, const Q
 
 void WebPage::loadStarted() {
   m_loading = true;
+  m_currentFrameParent = currentFrame()->parentFrame();
   m_errorPageMessage = QString();
 }
 
@@ -485,3 +487,13 @@ void WebPage::addModalMessage(bool expectedType, const QString &message, const Q
     m_modalMessages << QString();
   emit modalReady();
 }
+
+QWebFrame* WebPage::currentFrameParent() {
+  return m_currentFrameParent;
+}
+
+void WebPage::setCurrentFrameParent(QWebFrame* frame) {
+  m_currentFrameParent = frame;
+}
+
+

data/src/WebPage.h

@@ -55,6 +55,8 @@ class WebPage : public QWebPage {
     void resize(int, int);
     int modalCount();
     QString modalMessage();
+    void setCurrentFrameParent(QWebFrame* frame);
+    QWebFrame* currentFrameParent();
 
   public slots:
     bool shouldInterruptJavaScript();
@@ -105,6 +107,7 @@ class WebPage : public QWebPage {
     QList<QVariantMap> m_modalResponses;
     QStringList m_modalMessages;
     void addModalMessage(bool, const QString &, const QRegExp &);
+    QWebFrame* m_currentFrameParent;
 };
 
 #endif //_WEBPAGE_H

data/src/capybara.js

@@ -5,7 +5,11 @@ Capybara = {
 
   invoke: function () {
     try {
-      return this[CapybaraInvocation.functionName].apply(this, CapybaraInvocation.arguments);
+      if (CapybaraInvocation.functionName == "leftClick") {
+        return this["verifiedClickPosition"].apply(this, CapybaraInvocation.arguments);
+      } else {
+        return this[CapybaraInvocation.functionName].apply(this, CapybaraInvocation.arguments);
+      }
     } catch (e) {
       CapybaraInvocation.error = e;
     }
@@ -204,12 +208,17 @@ Capybara = {
     throw new Capybara.UnpositionedElement(this.pathForNode(node), visible);
   },
 
-  click: function (index, action) {
+  verifiedClickPosition: function (index) {
     var node = this.getNode(index);
     node.scrollIntoViewIfNeeded();
     var pos = this.clickPosition(node);
     CapybaraInvocation.hover(pos.relativeX, pos.relativeY);
     this.expectNodeAtPosition(node, pos);
+    return pos;
+  },
+
+  click: function (index, action) {
+    var pos = this.verifiedClickPosition(index);
     action(pos.absoluteX, pos.absoluteY);
   },
 

data/src/webkit_server.pro

@@ -1,6 +1,9 @@
 TEMPLATE = app
 TARGET = webkit_server
 DESTDIR = .
+QMAKE_CXXFLAGS += $$(CXXFLAGS)
+QMAKE_CFLAGS += $$(CFLAGS)
+QMAKE_LFLAGS += $$(LDFLAGS)
 PROJECT_DIR = $$_PRO_FILE_PWD_
 BUILD_DIR = $${PROJECT_DIR}/build
 PRECOMPILED_DIR = $${BUILD_DIR}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capybara-webkit
 version: !ruby/object:Gem::Version
-  version: 1.11.1
+  version: 1.12.0
 platform: ruby
 authors:
 - thoughtbot
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-04 00:00:00.000000000 Z
+date: 2017-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
@@ -24,7 +24,7 @@ dependencies:
         version: 2.3.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 2.8.0
+        version: 2.13.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -34,7 +34,7 @@ dependencies:
         version: 2.3.0
     - - "<"
       - !ruby/object:Gem::Version
-        version: 2.8.0
+        version: 2.13.0
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
@@ -55,14 +55,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.14.0
+        version: '2.14'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.14.0
+        version: '2.14'
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
@@ -95,16 +95,16 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 12.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 12.0.0
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
@@ -119,20 +119,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.4.0
-- !ruby/object:Gem::Dependency
-  name: selenium-webdriver
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: launchy
   requirement: !ruby/object:Gem::Requirement
@@ -169,7 +155,7 @@ files:
 - bin/Info.plist
 - capybara-webkit.gemspec
 - extconf.rb
-- gemfiles/2.6.gemfile
+- gemfiles/2.11.gemfile
 - gemfiles/2.7.gemfile
 - gemfiles/master.gemfile
 - lib/capybara-webkit.rb
@@ -194,6 +180,7 @@ files:
 - spec/driver_resize_window_spec.rb
 - spec/driver_spec.rb
 - spec/errors_spec.rb
+- spec/fixtures/fake_server.sh
 - spec/integration/session_spec.rb
 - spec/selenium_compatibility_spec.rb
 - spec/self_signed_ssl_cert.rb
@@ -395,9 +382,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-requirements: []
+requirements:
+- Qt >= 4.8
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Headless Webkit driver for Capybara
@@ -411,6 +399,7 @@ test_files:
 - spec/driver_resize_window_spec.rb
 - spec/driver_spec.rb
 - spec/errors_spec.rb
+- spec/fixtures/fake_server.sh
 - spec/integration/session_spec.rb
 - spec/selenium_compatibility_spec.rb
 - spec/self_signed_ssl_cert.rb
@@ -419,4 +408,3 @@ test_files:
 - spec/support/app_runner.rb
 - spec/support/matchers/include_response.rb
 - spec/support/output_writer.rb
-has_rdoc: 

data/gemfiles/2.6.gemfile

@@ -1,8 +0,0 @@
-# This file was generated by Appraisal
-
-source "https://rubygems.org"
-
-gem "mime-types", "< 3.0", :platforms=>[:ruby_19, :jruby_19]
-gem "capybara", "~> 2.6.0"
-
-gemspec :path=>"../"