capybara-webkit 1.13.0 → 1.14.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8f6bbf1dc179252a2f808fee415bcf4f94f3b0e0
-  data.tar.gz: 320d1b94e5241d9aca6195f246487d018bc2d4d9
+  metadata.gz: adb3d932baa61a8938f10d7262631a313584a190
+  data.tar.gz: df339e2e1777df21576775f21a38188a972edb62
 SHA512:
-  metadata.gz: cfe1194befdf9b3792390dab329ff59dab8ea834e132cf6d6c56d8f7a4df4748164593a5dd51c21c553b6a0c801f8bd6a9f0134b9b87d41a780c9a5d0dff75ff
-  data.tar.gz: 27309b5dcd287b804d83c97c64bcc9f11bdac110891160ace21bb908ab8b7b68b9691165c226e87a5d1d7fb5c5a180e49ded3f1f44c75e46b6e4e720f3f32127
+  metadata.gz: 3154fa91673bf59aa710a48ed94ed93d2da7f3e2146e15cd9f99f952ac440b6b49b6784cbcc063ffe05dd4aa38c3108296fc14244ea316662c1d8000de0f870a
+  data.tar.gz: 08883b67a4e99e083eb65bfeee24d00d0775626d16d905c1a86aaa2e2f6e712b8efcd7b13c0f50e328f95d7ac016ae23375f69ffe755aede97f17f6eba28aa83

data/.gitignore

@@ -1,6 +1,8 @@
 *.swp
 bin/webkit_server*
 test/testwebkitserver
+test/moc_predefs.h
+test/target_wrapper.sh
 *.swo
 *~
 *.o

data/.travis.yml

@@ -28,7 +28,7 @@ matrix:
       gemfile: gemfiles/2.7.gemfile
       env: QMAKE=/usr/lib/x86_64-linux-gnu/qt4/bin/qmake
     - rvm: 1.9.3
-      gemfile: gemfiles/2.12.gemfile
+      gemfile: gemfiles/2.13.gemfile
       env: QMAKE=/usr/lib/x86_64-linux-gnu/qt4/bin/qmake
     - rvm: 2.3.3
       gemfile: gemfiles/master.gemfile
@@ -36,7 +36,7 @@ matrix:
     - gemfile: gemfiles/master.gemfile
 gemfile:
   - gemfiles/2.7.gemfile
-  - gemfiles/2.12.gemfile
+  - gemfiles/2.13.gemfile
 before_install:
   - gem install bundler
 install: bundle

data/Appraisals

@@ -5,8 +5,8 @@ appraise "2.7" do
   gem 'nokogiri', '< 1.7.0', :platforms=>[:ruby_19, :jruby_19] # 1.7.0 requires ruby 2.1+
 end
 
-appraise "2.12" do
-  gem "capybara", "~> 2.12.0"
+appraise "2.13" do
+  gem "capybara", "~> 2.13.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

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    capybara-webkit (1.13.0)
-      capybara (>= 2.3.0, < 2.13.0)
+    capybara-webkit (1.14.0)
+      capybara (>= 2.3.0, < 2.14.0)
       json
 
 GEM
@@ -13,7 +13,7 @@ GEM
     appraisal (0.4.1)
       bundler
       rake
-    capybara (2.12.0)
+    capybara (2.13.0)
       addressable
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
@@ -21,7 +21,7 @@ GEM
       rack-test (>= 0.5.4)
       xpath (~> 2.0)
     diff-lcs (1.3)
-    ffi (1.9.17-java)
+    ffi (1.9.18-java)
     json (1.8.6)
     json (1.8.6-java)
     launchy (2.4.3)
@@ -30,12 +30,12 @@ GEM
       addressable (~> 2.3)
       spoon (~> 0.0.1)
     mime-types (2.99.3)
-    mini_magick (4.6.0)
+    mini_magick (4.6.1)
     mini_portile2 (2.1.0)
-    nokogiri (1.7.0.1)
+    nokogiri (1.7.1)
       mini_portile2 (~> 2.1.0)
-    nokogiri (1.7.0.1-java)
-    nokogiri (1.7.0.1-x86-mingw32)
+    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)
@@ -63,7 +63,7 @@ GEM
       tilt (>= 1.3, < 3)
     spoon (0.0.6)
       ffi
-    tilt (2.0.6)
+    tilt (2.0.7)
     xpath (2.0.0)
       nokogiri (~> 1.3)
 
@@ -84,4 +84,4 @@ DEPENDENCIES
   sinatra
 
 BUNDLED WITH
-   1.14.3
+   1.14.5

data/NEWS.md

@@ -1,3 +1,13 @@
+New for 1.14.0:
+
+* Fix the 'Reset' command in debug builds (on Windows)
+* Check for Windows platform in a jruby compatible way
+* Include qtwebkitversion.h to work in newer qtwebkit
+* Support Capybara 2.13 and fix some hound warnings
+* Support returning elements from evaluate_script
+* Support most of the keys specified by Capybara for Node#send_keys
+* Fix issue with switching to the same frame twice in a row
+
 New for 1.13.0:
 
 * Allow JavaScript errors to be raised as Ruby exceptions

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.13.0")
+  s.add_runtime_dependency("capybara", ">= 2.3.0", "< 2.14.0")
   s.add_runtime_dependency("json")
 
   s.add_development_dependency("rspec", "~> 3.5")

data/gemfiles/{2.12.gemfile → 2.13.gemfile}

@@ -4,7 +4,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", "~> 2.12.0"
+gem "capybara", "~> 2.13.0"
 gem "addressable", "< 2.5.0", :platforms=>[:ruby_19, :jruby_19]
 gem "nokogiri", "< 1.7.0", :platforms=>[:ruby_19, :jruby_19]
 

data/lib/capybara/webkit/browser.rb

@@ -83,7 +83,7 @@ module Capybara::Webkit
 
     def frame_focus(selector=nil)
       if selector.respond_to?(:base)
-        selector.base.invoke('focus')
+        selector.base.invoke("focus_frame")
       elsif selector.is_a? Fixnum
         command("FrameFocus", "", selector.to_s)
       elsif selector

data/lib/capybara/webkit/driver.rb

@@ -87,7 +87,8 @@ module Capybara::Webkit
     end
 
     def evaluate_script(script, *args)
-      @browser.evaluate_script(script, *encode_args(args))
+      result = @browser.evaluate_script(script, *encode_args(args))
+      decode_result(result)
     end
 
     def console_messages
@@ -419,11 +420,26 @@ module Capybara::Webkit
     def encode_args(args)
       args.map do |arg|
         if arg.is_a?(Capybara::Webkit::Node)
-          { ELEMENT: arg.native }.to_json
+          { "element-581e-422e-8be1-884c4e116226" => arg.native }.to_json
         else
           arg.to_json
         end
       end
     end
+
+    def decode_result(result)
+      case result
+      when Array
+        result.map { |r| decode_result(r) }
+      when Hash
+        if element_ref = result["element-581e-422e-8be1-884c4e116226"]
+          Capybara::Webkit::Node.new(self, element_ref, @browser)
+        else
+          result.each { |k, v| result[k] = decode_result(v) }
+        end
+      else
+        result
+      end
+    end
   end
 end

data/lib/capybara/webkit/node.rb

@@ -48,20 +48,9 @@ module Capybara::Webkit
     end
 
     def send_keys(*keys)
-      invoke("sendKeys", keys.map { |key|
-        case key
-        when :space
-          " "
-        when :enter
-          "\r"
-        when :backspace
-          "\b"
-        when String
-          key.to_s
-        else
-          raise Capybara::NotSupportedByDriverError.new, "Unrecognized key(s) in #{key}"
-        end
-      }.join)
+      # Currently unsupported keys specified by Capybara
+      # :separator
+      invoke("sendKeys", convert_to_named_keys(keys).to_json)
     end
 
     def select_option
@@ -172,5 +161,46 @@ module Capybara::Webkit
     def ==(other)
       invoke("equals", other.native) == "true"
     end
+
+    private
+
+    def convert_to_named_keys(key)
+      if key.is_a? Array
+        key.map { |k| convert_to_named_keys(k)}
+      else
+        case key
+        when :cancel, :help, :backspace, :tab, :clear, :return, :enter, :insert, :delete, :pause, :escape,
+             :space, :end, :home, :left, :up, :right, :down, :semicolon,
+             :f1, :f2, :f3, :f4, :f5, :f6, :f7, :f8, :f9, :f10, :f11, :f12,
+             :shift, :control, :alt, :meta
+          { "key" => key.to_s.capitalize }
+        when :equals
+          { "key" => "Equal" }
+        when :page_up
+          { "key" => "PageUp" }
+        when :page_down
+          { "key" => "PageDown" }
+        when :numpad0, :numpad1, :numpad2, :numpad3, :numpad4,
+             :numpad5, :numpad6, :numpad7, :numpad9, :numpad9
+          { "key" => key[-1], "modifier" => "keypad" }
+        when :multiply
+          { "key" => "Asterisk", "modifier" => "keypad" }
+        when :divide
+          { "key" => "Slash", "modifier" => "keypad" }
+        when :add
+          { "key" => "Plus", "modifier" => "keypad" }
+        when :subtract
+          { "key" => "Minus", "modifier" => "keypad" }
+        when :decimal
+          { "key" => "Period", "modifier" => "keypad" }
+        when :command
+          { "key" => "Meta" }
+        when String
+          key.to_s
+        else
+          raise Capybara::NotSupportedByDriverError.new
+        end
+      end
+    end
   end
 end

data/lib/capybara/webkit/version.rb

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

data/lib/capybara_webkit_builder.rb

@@ -49,8 +49,7 @@ module CapybaraWebkitBuilder
   end
 
   def path_to_binary
-    case RUBY_PLATFORM
-    when /mingw32/
+    if Gem.win_platform?
       "src/debug/webkit_server.exe"
     else
       "src/webkit_server"

data/spec/driver_spec.rb

@@ -522,6 +522,21 @@ describe Capybara::Webkit::Driver do
       expect(result).to eq 1.5
     end
 
+    it "evaluates Javascript and returns an element" do
+      result = driver.evaluate_script(%<document.getElementById('greeting')>)
+      expect(result).to eq driver.find_css("#greeting").first
+    end
+
+    it "evaluates Javascript and returns a structure containing elements" do
+      result = driver.evaluate_script(%<({ 'a': document.getElementById('greeting'), 'b': { 'c': document.querySelectorAll('#greeting, #checktest') } })>)
+      expect(result).to eq(
+        "a" => driver.find_css("#greeting").first,
+        "b" => {
+          "c" => driver.find_css("#greeting, #checktest")
+        },
+      )
+    end
+
     it "evaluates Javascript and returns null" do
       result = driver.evaluate_script(%<(function () {})()>)
       expect(result).to eq nil
@@ -1273,6 +1288,17 @@ describe Capybara::Webkit::Driver do
             <input type="radio" id="only-radio" value="1"/>
             <button type="reset">Reset Form</button>
           </form>
+          <div id="key_events"></div>
+          <script>
+            var form = document.getElementsByTagName('form')[0];
+            var output = document.getElementById('key_events');
+            form.addEventListener('keydown', function(e){
+              output.innerHTML = output.innerHTML + " d:" + (e.key || e.which);
+            });
+            form.addEventListener('keyup', function(e){
+              output.innerHTML = output.innerHTML + " u:" + (e.key || e.which);
+            });
+          </script>
         </body></html>
       HTML
     end
@@ -1341,6 +1367,21 @@ describe Capybara::Webkit::Driver do
         input.send_keys(*[:backspace])
         expect(input.value).to eq "do"
       end
+
+      it "should support :modifiers" do
+        input = driver.find_xpath("//input").first
+        input.send_keys("abc", [:shift, :left], "def")
+        expect(input.value).to eq "abdef"
+        input.send_keys([:control, "a"], [:shift, "upper"])
+        expect(input.value).to eq "UPPER"
+      end
+
+      it "releases modifiers correctly" do
+        input = driver.find_xpath("//input").first
+        input.send_keys("a", [:shift, :left], "a")
+        event_text = driver.find_css("#key_events").first.text
+        expect(event_text).to eq "d:65 u:65 d:16 d:37 u:37 u:16 d:65 u:65"
+      end
     end
 
     let(:monkey_option)   { driver.find_xpath("//option[@id='select-option-monkey']").first }

data/spec/integration/session_spec.rb

@@ -325,6 +325,16 @@ describe Capybara::Session do
         end
       end
     end
+
+    it "can swap to the same frame multiple times" do
+      subject.visit("/")
+      subject.within_frame("a_frame") do
+        expect(subject).to have_content("Page A")
+      end
+      subject.within_frame("a_frame") do
+        expect(subject).to have_content("Page A")
+      end
+    end
   end
 
   context 'click tests' do

data/spec/spec_helper.rb

@@ -52,15 +52,13 @@ RSpec.configure do |c|
   # Accessing unattached nodes is allowed when reload is disabled - Legacy behavior
   # Node#send_keys does not support modifiers and only supports a subset of special keys
   c.filter_run_excluding :full_description => lambda { |description, metadata|
-    (description !~ /Capybara::Session webkit node #send_keys should send a string of keys to an element/) && (
-        description =~ /Capybara::Session webkit node #send_keys/ ||
-        description =~ /Capybara::Session webkit node #reload without automatic reload should not automatically reload/ ||
-      if Gem::Version.new(Capybara::VERSION) < Gem::Version.new("2.12.0")
-        description =~ /Capybara::Session webkit Capybara::Window\s*#(size|resize_to|maximize|close.*no_such_window_error|send_keys)/ ||
-        description =~ /Capybara::Session webkit node\s*#set should allow me to change the contents of a contenteditable elements child/
-      else
-        description =~ /Capybara::Session webkit Capybara::Window\s*#close.*no_such_window_error/
-      end
+    (description =~ /Capybara::Session webkit node #reload without automatic reload should not automatically reload/ ||
+     if Gem::Version.new(Capybara::VERSION) < Gem::Version.new("2.12.0")
+       description =~ /Capybara::Session webkit Capybara::Window\s*#(size|resize_to|maximize|close.*no_such_window_error)/ ||
+       description =~ /Capybara::Session webkit node\s*#set should allow me to change the contents of a contenteditable elements child/
+     else
+       description =~ /Capybara::Session webkit Capybara::Window\s*#close.*no_such_window_error/
+     end
     )
   }
 end

data/src/Evaluate.cpp

@@ -18,12 +18,14 @@ void Evaluate::start() {
   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']);"
+                           "     var elem_id;"
+                           "     if (elem_id = arguments[i]['element-581e-422e-8be1-884c4e116226']) {"
+                           "       arguments[i] = Capybara.getNode(elem_id);"
                            "     };"
                            "   };"
-                           "   return eval(\"%1\");"
-                           "   }).apply(null, %2)").arg(script.replace("\"","\\\"").remove("\n"), jsonArgs);
+                           "   var _result = eval(\"%1\");"
+                           "   return Capybara.wrapResult(_result);"
+                           " }).apply(null, %2)").arg(script.replace("\"","\\\"").remove("\n"), jsonArgs);
   QObject invocation_stub;
   invocation_stub.setProperty("allowUnattached", false);
   page()->currentFrame()->addToJavaScriptWindowObject("CapybaraInvocation", &invocation_stub);

data/src/Execute.cpp

@@ -16,8 +16,9 @@ void Execute::start() {
   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']);"
+                           "     var elem_id;"
+                           "     if (elem_id = arguments[i]['element-581e-422e-8be1-884c4e116226']) {"
+                           "       arguments[i] = Capybara.getNode(elem_id);"
                            "     };"
                            "   };"
                            "   %1 }).apply(null, %2); 'success'").arg(arguments()[0], jsonArgs);

data/src/JavascriptInvocation.cpp

@@ -134,14 +134,79 @@ int JavascriptInvocation::keyCodeFor(const QChar &key) {
   }
 }
 
+int JavascriptInvocation::keyCodeForName(const QString &keyName) {
+  const QMetaObject &mo = JavascriptInvocation::staticMetaObject;
+  int prop_index = mo.indexOfProperty("key_enum");
+  QMetaProperty metaProperty = mo.property(prop_index);
+  QMetaEnum metaEnum = metaProperty.enumerator();
+
+  QByteArray array ((QString("Key_") + keyName).toStdString().c_str());
+  return metaEnum.keyToValue(array);
+  // return Qt::Key_unknown;
+}
+
 void JavascriptInvocation::keypress(QChar key) {
   int keyCode = keyCodeFor(key);
-  QKeyEvent event(QKeyEvent::KeyPress, keyCode, Qt::NoModifier, key);
+  QKeyEvent event(QKeyEvent::KeyPress, keyCode, m_currentModifiers, (m_currentModifiers ? QString() : key));
+  QApplication::sendEvent(m_page, &event);
+  event = QKeyEvent(QKeyEvent::KeyRelease, keyCode, m_currentModifiers);
+  QApplication::sendEvent(m_page, &event);
+}
+
+void JavascriptInvocation::namedKeypress(QString keyName, QString modifiers){
+  Qt::KeyboardModifiers key_modifiers(m_currentModifiers);
+  if (modifiers == "Keypad") {
+    key_modifiers |= Qt::KeypadModifier;
+  };
+  int keyCode = keyCodeForName(keyName);
+  QKeyEvent event(QKeyEvent::KeyPress, keyCode, key_modifiers);
   QApplication::sendEvent(m_page, &event);
-  event = QKeyEvent(QKeyEvent::KeyRelease, keyCode, Qt::NoModifier, key);
+  event = QKeyEvent(QKeyEvent::KeyRelease, keyCode, key_modifiers);
   QApplication::sendEvent(m_page, &event);
 }
 
+void JavascriptInvocation::namedKeydown(QString keyName){
+  int keyCode = keyCodeForName(keyName);
+  QKeyEvent event(QKeyEvent::KeyPress, keyCode, m_currentModifiers);
+  QApplication::sendEvent(m_page, &event);
+
+  switch(keyCode){
+    case Qt::Key_Shift:
+      m_currentModifiers |= Qt::ShiftModifier;
+      break;
+    case Qt::Key_Control:
+        m_currentModifiers |= Qt::ControlModifier;
+        break;
+    case Qt::Key_Alt:
+      m_currentModifiers |= Qt::AltModifier;
+      break;
+    case Qt::Key_Meta:
+      m_currentModifiers |= Qt::MetaModifier;
+      break;
+  };
+}
+
+void JavascriptInvocation::namedKeyup(QString keyName){
+  int keyCode = keyCodeForName(keyName);
+  QKeyEvent event(QKeyEvent::KeyRelease, keyCode, m_currentModifiers, 0);
+  QApplication::sendEvent(m_page, &event);
+
+  switch(keyCode){
+    case Qt::Key_Shift:
+      m_currentModifiers &= ~Qt::ShiftModifier;
+      break;
+    case Qt::Key_Control:
+        m_currentModifiers &= ~Qt::ControlModifier;
+        break;
+    case Qt::Key_Alt:
+      m_currentModifiers &= ~Qt::AltModifier;
+      break;
+    case Qt::Key_Meta:
+      m_currentModifiers &= ~Qt::MetaModifier;
+      break;
+  };
+}
+
 const QString JavascriptInvocation::render(void) {
   QString pathTemplate =
     QDir::temp().absoluteFilePath("./click_failed_XXXXXX.png");

data/src/JavascriptInvocation.h

@@ -13,6 +13,7 @@ class JavascriptInvocation : public QObject {
   Q_PROPERTY(bool allowUnattached READ allowUnattached)
   Q_PROPERTY(QStringList arguments READ arguments)
   Q_PROPERTY(QVariant error READ getError WRITE setError)
+  Q_PROPERTY(Qt::Key key_enum)
 
   public:
     JavascriptInvocation(const QString &functionName, bool allowUnattached, const QStringList &arguments, WebPage *page, QObject *parent = 0);
@@ -26,6 +27,9 @@ class JavascriptInvocation : public QObject {
     Q_INVOKABLE QVariantMap clickPosition(QWebElement element, int left, int top, int width, int height);
     Q_INVOKABLE void hover(int absoluteX, int absoluteY);
     Q_INVOKABLE void keypress(QChar);
+    Q_INVOKABLE void namedKeydown(QString keyName);
+    Q_INVOKABLE void namedKeyup(QString keyName);
+    Q_INVOKABLE void namedKeypress(QString keyName, QString modifiers);
     Q_INVOKABLE const QString render(void);
     QVariant getError();
     void setError(QVariant error);
@@ -39,5 +43,8 @@ class JavascriptInvocation : public QObject {
     QVariant m_error;
     void hover(const QPoint &);
     int keyCodeFor(const QChar &);
+    int keyCodeForName(const QString &);
+    Qt::Key key_enum;
+    Qt::KeyboardModifiers m_currentModifiers;
 };
 

data/src/Node.cpp

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

data/src/Version.h

@@ -1,5 +1,9 @@
 #include "SocketCommand.h"
 
+#ifndef QTWEBKIT_VERSION_STR
+#include "qtwebkitversion.h"
+#endif
+
 class Version : public SocketCommand {
   Q_OBJECT
 

data/src/WebPage.cpp

@@ -40,13 +40,6 @@ WebPage::WebPage(WebPageManager *manager, QObject *parent) : QWebPage(parent) {
   settings()->setAttribute(QWebSettings::JavascriptCanOpenWindows, true);
   settings()->setAttribute(QWebSettings::JavascriptCanCloseWindows, true);
   settings()->setAttribute(QWebSettings::LocalStorageDatabaseEnabled, true);
-
-  if(QFileInfo("tmp").isDir()) {
-    settings()->setAttribute(QWebSettings::OfflineWebApplicationCacheEnabled, true);
-    settings()->setOfflineWebApplicationCachePath("tmp");
-  }
-
-  createWindow();
 }
 
 void WebPage::createWindow() {

data/src/WebPageManager.cpp

@@ -7,12 +7,14 @@
 #include "MissingContentHeaderRequestHandler.h"
 #include "UnknownUrlHandler.h"
 #include "NetworkRequestFactory.h"
+#include <QWebSettings>
 
 WebPageManager::WebPageManager(QObject *parent) : QObject(parent) {
   m_ignoreSslErrors = false;
   m_cookieJar = new NetworkCookieJar(this);
   m_success = true;
   m_loggingEnabled = false;
+  m_isCacheInitialized = false;
   m_ignoredOutput = new QFile(this);
   m_timeout = -1;
   m_customHeadersRequestHandler = new CustomHeadersRequestHandler(
@@ -55,6 +57,9 @@ WebPage *WebPageManager::currentPage() const {
 
 WebPage *WebPageManager::createPage() {
   WebPage *page = new WebPage(this);
+  initOfflineWebApplicationCache();
+  page->createWindow();
+
   connect(page, SIGNAL(loadStarted()),
           this, SLOT(emitLoadStarted()));
   connect(page, SIGNAL(pageFinished(bool)),
@@ -217,3 +222,11 @@ void WebPageManager::allowUrl(const QString &url) {
 void WebPageManager::blockUrl(const QString &url) {
   m_blacklistedRequestHandler->blockUrl(url);
 }
+
+void WebPageManager::initOfflineWebApplicationCache() {
+  if (!m_isCacheInitialized && QFileInfo("tmp").isDir()) {
+    QWebSettings::globalSettings()->setAttribute(QWebSettings::OfflineWebApplicationCacheEnabled, true);
+    QWebSettings::globalSettings()->setOfflineWebApplicationCachePath("tmp");
+    m_isCacheInitialized = true;
+  }
+}

data/src/WebPageManager.h

@@ -57,6 +57,7 @@ class WebPageManager : public QObject {
   private:
     void emitPageFinished();
     static void handleDebugMessage(QtMsgType type, const char *message);
+    void initOfflineWebApplicationCache();
 
     QList<WebPage *> m_pages;
     QList<QNetworkReply *> m_pendingReplies;
@@ -66,6 +67,7 @@ class WebPageManager : public QObject {
     QSet<WebPage *> m_started;
     bool m_success;
     bool m_loggingEnabled;
+    bool m_isCacheInitialized;
     QFile *m_ignoredOutput;
     int m_timeout;
     NetworkAccessManager *m_networkAccessManager;

data/src/capybara.js

@@ -2,6 +2,7 @@ Capybara = {
   nextIndex: 0,
   nodes: {},
   attachedFiles: [],
+  keyModifiersStack: [],
 
   invoke: function () {
     try {
@@ -36,9 +37,7 @@ Capybara = {
     var node;
     var results = [];
     while (node = iterator.iterateNext()) {
-      this.nextIndex++;
-      this.nodes[this.nextIndex] = node;
-      results.push(this.nextIndex);
+      results.push(this.registerNode(node));
     }
     return results.join(",");
   },
@@ -47,9 +46,7 @@ Capybara = {
     var elements = reference.querySelectorAll(selector);
     var results = [];
     for (var i = 0; i < elements.length; i++) {
-      this.nextIndex++;
-      this.nodes[this.nextIndex] = elements[i];
-      results.push(this.nextIndex);
+      results.push(this.registerNode(elements[i]));
     }
     return results.join(",");
   },
@@ -285,17 +282,45 @@ Capybara = {
     return true;
   },
 
-  sendKeys: function (index, keys) {
-    var strindex, length;
-
+  sendKeys: function (elem_index, json_keys) {
+    var idx, length, keys;
+    keys = JSON.parse(json_keys);
     length = keys.length;
 
     if (length) {
-      this.focus(index);
+      this.focus(elem_index);
     }
 
-    for (strindex = 0; strindex < length; strindex++) {
-      CapybaraInvocation.keypress(keys[strindex]);
+    for (idx = 0; idx < length; idx++) {
+      this._sendKeys(keys[idx]);
+    }
+  },
+
+  _sendKeys: function(keys) {
+    if (typeof keys == "string") {
+      var str_len = keys.length;
+      var str_idx;
+      for (str_idx = 0; str_idx < str_len; str_idx++) {
+        CapybaraInvocation.keypress(keys[str_idx]);
+      }
+    } else if (Array.isArray(keys)) {
+      this.keyModifiersStack.push([]);
+      var idx;
+      for (idx = 0; idx < keys.length; idx++) {
+        this._sendKeys(keys[idx]);
+      }
+      var mods = this.keyModifiersStack.pop();
+      while (mods.length) {
+        CapybaraInvocation.namedKeyup(mods.pop().key);
+      }
+    } else {
+      key = keys.key;
+      if (["Shift", "Control", "Alt", "Meta"].indexOf(key) > -1){
+        CapybaraInvocation.namedKeydown(key);
+        this.keyModifiersStack[this.keyModifiersStack.length-1].push(keys);
+      } else {
+        CapybaraInvocation.namedKeypress(key, keys.modifier);
+      }
     }
   },
 
@@ -357,6 +382,14 @@ Capybara = {
     this.getNode(index).focus();
   },
 
+  focus_frame: function(index) {
+    var elem = this.getNode(index);
+    if (elem === document.activeElement) {
+      elem.blur();
+    }
+    elem.focus();
+  },
+
   selectOption: function(index) {
     var optionNode = this.getNode(index);
     var selectNode = optionNode.parentNode;
@@ -440,9 +473,34 @@ Capybara = {
     mouseTrigger('mousemove', options);
     mouseTrigger('mouseup', options);
   },
-
+  registerNode: function(node) {
+    this.nextIndex++;
+    this.nodes[this.nextIndex] = node;
+    return this.nextIndex;
+  },
   equals: function(index, targetIndex) {
     return this.getNode(index) === this.getNode(targetIndex);
+  },
+  _visitedObjects: [],
+  wrapResult: function(arg) {
+    if (this._visitedObjects.indexOf(arg) >= 0) { return '(cyclic structure)'; }
+    if (arg instanceof NodeList) { arg = Array.prototype.slice.call(arg, 0); }
+    if (Array.isArray(arg)) {
+      for(var _j = 0; _j < arg.length; _j++) {
+        arg[_j] = this.wrapResult(arg[_j]);
+      }
+    } else if (arg && arg.nodeType == 1 && arg.tagName) {
+      return {'element-581e-422e-8be1-884c4e116226': this.registerNode(arg)};
+    } else if (arg === null) {
+      return undefined;
+    } else if ( typeof arg == 'object' ) {
+      this._visitedObjects.push(arg);
+      for(var _k in arg){
+        arg[_k] = this.wrapResult(arg[_k]);
+      }
+      this._visitedObjects.pop();
+    }
+    return arg;
   }
 };
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capybara-webkit
 version: !ruby/object:Gem::Version
-  version: 1.13.0
+  version: 1.14.0
 platform: ruby
 authors:
 - thoughtbot
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-20 00:00:00.000000000 Z
+date: 2017-03-26 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.13.0
+        version: 2.14.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.13.0
+        version: 2.14.0
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
@@ -155,7 +155,7 @@ files:
 - bin/Info.plist
 - capybara-webkit.gemspec
 - extconf.rb
-- gemfiles/2.12.gemfile
+- gemfiles/2.13.gemfile
 - gemfiles/2.7.gemfile
 - gemfiles/master.gemfile
 - lib/capybara-webkit.rb
@@ -385,26 +385,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements:
 - Qt >= 4.8
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Headless Webkit driver for Capybara
-test_files:
-- spec/browser_spec.rb
-- spec/capybara_webkit_builder_spec.rb
-- spec/configuration_spec.rb
-- spec/connection_spec.rb
-- spec/cookie_jar_spec.rb
-- spec/driver_rendering_spec.rb
-- 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
-- spec/server_spec.rb
-- spec/spec_helper.rb
-- spec/support/app_runner.rb
-- spec/support/matchers/include_response.rb
-- spec/support/output_writer.rb
+test_files: []