capybara-webkit 1.14.0 → 1.15.0

data/src/WebPage.h

@@ -50,7 +50,7 @@ class WebPage : public QWebPage {
     QVariantMap pageHeaders();
     QByteArray body();
     QString contentType();
-    void mouseEvent(QEvent::Type type, const QPoint &position, Qt::MouseButton button);
+    void mouseEvent(QEvent::Type type, const QPoint &position, Qt::MouseButton button, Qt::KeyboardModifiers modifiers = Qt::NoModifier);
     bool clickTest(QWebElement element, int absoluteX, int absoluteY);
     void resize(int, int);
     int modalCount();

data/src/WebPageManager.cpp

@@ -81,14 +81,14 @@ void WebPageManager::removePage(WebPage *page) {
 
 void WebPageManager::emitLoadStarted() {
   if (m_started.empty()) {
-    logger() << "Load started";
+    log() << "Load started";
     emit loadStarted();
   }
   m_started += qobject_cast<WebPage *>(sender());
 }
 
 void WebPageManager::requestCreated(QByteArray &url, QNetworkReply *reply) {
-  logger() << "Started request to" << url;
+  log() << "Started request to" << url;
   if (reply->isFinished())
     replyFinished(reply);
   else {
@@ -110,7 +110,7 @@ void WebPageManager::handleReplyFinished() {
 
 void WebPageManager::replyFinished(QNetworkReply *reply) {
   int status = reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt();
-  logger() << "Received" << status << "from" << reply->url().toString();
+  log() << "Received" << status << "from" << reply->url().toString();
   m_pendingReplies.removeAll(reply);
 }
 
@@ -119,7 +119,7 @@ void WebPageManager::replyDestroyed(QObject *reply) {
 }
 
 void WebPageManager::setPageStatus(bool success) {
-  logger() << "Page finished with" << success;
+  log() << "Page finished with" << success;
   m_started.remove(qobject_cast<WebPage *>(sender()));
   m_success = success && m_success;
   if (m_started.empty()) {
@@ -128,7 +128,7 @@ void WebPageManager::setPageStatus(bool success) {
 }
 
 void WebPageManager::emitPageFinished() {
-  logger() << "Load finished";
+  log() << "Load finished";
   emit pageFinished(m_success);
   m_success = true;
 }
@@ -151,7 +151,7 @@ void WebPageManager::setTimeout(int timeout) {
 
 void WebPageManager::reset() {
   foreach(QNetworkReply *reply, m_pendingReplies) {
-    logger() << "Aborting request to" << reply->url().toString();
+    log() << "Aborting request to" << reply->url().toString();
     reply->abort();
   }
   m_pendingReplies.clear();
@@ -191,9 +191,9 @@ bool WebPageManager::isLoading() const {
   return false;
 }
 
-QDebug WebPageManager::logger() const {
+QDebug WebPageManager::log() const {
   if (m_loggingEnabled) {
-    return qCritical();
+    return qCritical() << qPrintable(QTime::currentTime().toString("hh:mm:ss.zzz"));
   } else {
     return QDebug(m_ignoredOutput);
   }

data/src/WebPageManager.h

@@ -33,7 +33,7 @@ class WebPageManager : public QObject {
     void reset();
     NetworkCookieJar *cookieJar();
     bool isLoading() const;
-    QDebug logger() const;
+    QDebug log() const;
     void enableLogging();
     void replyFinished(QNetworkReply *reply);
     NetworkAccessManager *networkAccessManager();

data/src/capybara.js

@@ -7,7 +7,15 @@ Capybara = {
   invoke: function () {
     try {
       if (CapybaraInvocation.functionName == "leftClick") {
-        return this["verifiedClickPosition"].apply(this, CapybaraInvocation.arguments);
+        var args = CapybaraInvocation.arguments;
+        var leftClickOptions = this["verifiedClickPosition"].apply(this, args);
+        leftClickOptions["keys"] = JSON.parse(args[1]);
+        offset = JSON.parse(args[2]);
+        if (offset && offset.x && offset.y){
+          leftClickOptions["absoluteX"] = leftClickOptions["absoluteLeft"] + offset.x;
+          leftClickOptions["absoluteY"] = leftClickOptions["absoluteTop"] + offset.y;
+        }
+        return leftClickOptions;
       } else {
         return this[CapybaraInvocation.functionName].apply(this, CapybaraInvocation.arguments);
       }
@@ -66,7 +74,8 @@ Capybara = {
 
   text: function (index) {
     var node = this.getNode(index);
-    var type = (node.type || node.tagName).toLowerCase();
+    var type = node instanceof HTMLFormElement ? 'form' : (node.type || node.tagName).toLowerCase();
+
     if (!this.isNodeVisible(node)) {
       return '';
     } else if (type == "textarea") {
@@ -84,22 +93,15 @@ Capybara = {
 
   attribute: function (index, name) {
     var node = this.getNode(index);
-    switch(name) {
-    case 'checked':
-      return node.checked;
-      break;
-
-    case 'disabled':
-      return node.disabled;
-      break;
-
-    case 'multiple':
-      return node.multiple;
-      break;
-
-    default:
+    if (node.hasAttribute(name)) {
       return node.getAttribute(name);
     }
+    return void 0;
+  },
+
+  property: function (index, name) {
+    var node = this.getNode(index);
+    return node[name];
   },
 
   hasAttribute: function(index, name) {
@@ -214,22 +216,28 @@ Capybara = {
     return pos;
   },
 
-  click: function (index, action) {
+  click: function (index, action, keys, offset) {
     var pos = this.verifiedClickPosition(index);
-    action(pos.absoluteX, pos.absoluteY);
+    keys = keys ? JSON.parse(keys) : [];
+    offset = offset ? JSON.parse(offset) : {};
+    if (offset && (offset.x != null) && (offset.y != null)){
+      action(pos.absoluteLeft + offset.x, pos.absoluteTop + offset.y, keys);
+    } else {
+      action(pos.absoluteX, pos.absoluteY, keys);
+    }
   },
 
-  leftClick: function (index) {
-    this.click(index, CapybaraInvocation.leftClick);
+  leftClick: function (index, keys, offset) {
+    this.click(index, CapybaraInvocation.leftClick, keys, offset);
   },
 
-  doubleClick: function(index) {
-    this.click(index, CapybaraInvocation.leftClick);
-    this.click(index, CapybaraInvocation.doubleClick);
+  doubleClick: function(index, keys, offset) {
+    this.click(index, CapybaraInvocation.leftClick, keys, offset);
+    this.click(index, CapybaraInvocation.doubleClick, keys, offset);
   },
 
-  rightClick: function(index) {
-    this.click(index, CapybaraInvocation.rightClick);
+  rightClick: function(index, keys, offset) {
+    this.click(index, CapybaraInvocation.rightClick, keys, offset);
   },
 
   hover: function (index) {
@@ -255,12 +263,18 @@ Capybara = {
   },
 
   isNodeVisible: function(node) {
-    while (node) {
-      var style = node.ownerDocument.defaultView.getComputedStyle(node, null);
-      if (style.getPropertyValue('display') == 'none' || style.getPropertyValue('visibility') == 'hidden')
-        return false;
+    var style = node.ownerDocument.defaultView.getComputedStyle(node, null);
+    // Only check computed visibility style on current node since it
+    // will inherit from nearest ancestor with a setting and overrides
+    // any farther ancestors
+    if (style.getPropertyValue('visibility') == 'hidden' || style.getPropertyValue('display') == 'none')
+      return false;
 
-      node = node.parentElement;
+    // Must check CSS display setting for all ancestors
+    while (node = node.parentElement) {
+      style = node.ownerDocument.defaultView.getComputedStyle(node, null);
+      if (style.getPropertyValue('display') == 'none' )
+        return false;
     }
     return true;
   },
@@ -390,30 +404,39 @@ Capybara = {
     elem.focus();
   },
 
-  selectOption: function(index) {
+  selectOption: function(index){
+    this._setOption(index, true);
+  },
+
+  unselectOption: function(index){
+    this._setOption(index, false);
+  },
+
+  _setOption: function(index, state) {
     var optionNode = this.getNode(index);
     var selectNode = optionNode.parentNode;
+    if (selectNode.tagName == "OPTGROUP")
+      selectNode = selectNode.parentNode;
 
     if (optionNode.disabled)
       return;
 
+    if ((!selectNode.multiple) && (!state))
+      return;
+
     // click on select list
     this.triggerOnNode(selectNode, 'mousedown');
     selectNode.focus();
-    this.triggerOnNode(selectNode, 'mouseup');
-    this.triggerOnNode(selectNode, 'click');
+    this.triggerOnNode(selectNode, 'input');
 
-    // select option from list
-    this.triggerOnNode(optionNode, 'mousedown');
-    optionNode.selected = true;
-    this.triggerOnNode(selectNode, 'change');
-    this.triggerOnNode(optionNode, 'mouseup');
-    this.triggerOnNode(optionNode, 'click');
-  },
+    // select/deselect option from list
+    if (optionNode.selected != state){
+      optionNode.selected = state;
+      this.triggerOnNode(selectNode, 'change');
+    }
 
-  unselectOption: function(index) {
-    this.getNode(index).selected = false;
-    this.trigger(index, "change");
+    this.triggerOnNode(selectNode, 'mouseup');
+    this.triggerOnNode(selectNode, 'click');
   },
 
   centerPosition: function(element) {
@@ -493,12 +516,16 @@ Capybara = {
       return {'element-581e-422e-8be1-884c4e116226': this.registerNode(arg)};
     } else if (arg === null) {
       return undefined;
+    } else if (arg instanceof Date){
+      return arg;
     } else if ( typeof arg == 'object' ) {
       this._visitedObjects.push(arg);
+      var result = {};
       for(var _k in arg){
-        arg[_k] = this.wrapResult(arg[_k]);
+        result[_k] = this.wrapResult(arg[_k]);
       }
       this._visitedObjects.pop();
+      return result;
     }
     return arg;
   }

data/src/find_command.h

@@ -8,6 +8,7 @@ CHECK_COMMAND(FindXpath)
 CHECK_COMMAND(Reset)
 CHECK_COMMAND(Node)
 CHECK_COMMAND(Evaluate)
+CHECK_COMMAND(EvaluateAsync)
 CHECK_COMMAND(Execute)
 CHECK_COMMAND(FrameFocus)
 CHECK_COMMAND(Header)
@@ -48,6 +49,7 @@ CHECK_COMMAND(WindowSize)
 CHECK_COMMAND(WindowMaximize)
 CHECK_COMMAND(GoBack)
 CHECK_COMMAND(GoForward)
+CHECK_COMMAND(Refresh)
 CHECK_COMMAND(AcceptAlert)
 CHECK_COMMAND(FindModal)
 CHECK_COMMAND(SetUnknownUrlMode)

data/src/webkit_server.pro

@@ -17,6 +17,7 @@ HEADERS = \
   AcceptAlert.h \
   GoForward.h \
   GoBack.h \
+  Refresh.h \
   WindowMaximize.h \
   WindowSize.h \
   WindowCommand.h \
@@ -46,6 +47,7 @@ HEADERS = \
   Node.h \
   JavascriptInvocation.h \
   Evaluate.h \
+  EvaluateAsync.h \
   Execute.h \
   FrameFocus.h \
   Response.h \
@@ -100,6 +102,7 @@ SOURCES = \
   AcceptAlert.cpp \
   GoForward.cpp \
   GoBack.cpp \
+  Refresh.cpp \
   WindowMaximize.cpp \
   WindowSize.cpp \
   WindowCommand.cpp \
@@ -130,6 +133,7 @@ SOURCES = \
   Node.cpp \
   JavascriptInvocation.cpp \
   Evaluate.cpp \
+  EvaluateAsync.cpp \
   Execute.cpp \
   FrameFocus.cpp \
   Response.cpp \

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capybara-webkit
 version: !ruby/object:Gem::Version
-  version: 1.14.0
+  version: 1.15.0
 platform: ruby
 authors:
 - thoughtbot
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-26 00:00:00.000000000 Z
+date: 2018-02-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
@@ -21,20 +21,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.3.0
+        version: '2.3'
     - - "<"
       - !ruby/object:Gem::Version
-        version: 2.14.0
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.3.0
+        version: '2.3'
     - - "<"
       - !ruby/object:Gem::Version
-        version: 2.14.0
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
@@ -109,16 +109,16 @@ dependencies:
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: launchy
   requirement: !ruby/object:Gem::Requirement
@@ -155,8 +155,7 @@ files:
 - bin/Info.plist
 - capybara-webkit.gemspec
 - extconf.rb
-- gemfiles/2.13.gemfile
-- gemfiles/2.7.gemfile
+- gemfiles/2.15.gemfile
 - gemfiles/master.gemfile
 - lib/capybara-webkit.rb
 - lib/capybara/webkit.rb
@@ -180,8 +179,10 @@ files:
 - spec/driver_resize_window_spec.rb
 - spec/driver_spec.rb
 - spec/errors_spec.rb
+- spec/fixtures/exit_text.rb
 - spec/fixtures/fake_server.sh
 - spec/integration/session_spec.rb
+- spec/node_spec.rb
 - spec/selenium_compatibility_spec.rb
 - spec/self_signed_ssl_cert.rb
 - spec/server_spec.rb
@@ -224,6 +225,8 @@ files:
 - src/ErrorMessage.h
 - src/Evaluate.cpp
 - src/Evaluate.h
+- src/EvaluateAsync.cpp
+- src/EvaluateAsync.h
 - src/Execute.cpp
 - src/Execute.h
 - src/FindCss.cpp
@@ -286,6 +289,8 @@ files:
 - src/NullCommand.h
 - src/PageLoadingCommand.cpp
 - src/PageLoadingCommand.h
+- src/Refresh.cpp
+- src/Refresh.h
 - src/Render.cpp
 - src/Render.h
 - src/RequestHandler.cpp
@@ -385,8 +390,28 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements:
 - Qt >= 4.8
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.7.4
 signing_key: 
 specification_version: 4
 summary: Headless Webkit driver for Capybara
-test_files: []
+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/exit_text.rb
+- spec/fixtures/fake_server.sh
+- spec/integration/session_spec.rb
+- spec/node_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

data/gemfiles/2.13.gemfile

@@ -1,11 +0,0 @@
-# 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.13.0"
-gem "addressable", "< 2.5.0", :platforms=>[:ruby_19, :jruby_19]
-gem "nokogiri", "< 1.7.0", :platforms=>[:ruby_19, :jruby_19]
-
-gemspec :path=>"../"