capybara-webkit 1.14.0 → 1.15.0

data/spec/server_spec.rb

@@ -2,7 +2,8 @@ require "spec_helper"
 require "capybara/webkit/server"
 
 describe Capybara::Webkit::Connection do
-  it "ensures the process ends", skip_on_windows: true, skip_on_jruby: true do
+  it "ensures the process ends when the parent process ends", skip_on_windows: true, skip_on_jruby: true do
+    sleep 1 # Without this sleep popen3 hangs on OSX when running the tests - not really sure why
     read_io, write_io = IO.pipe
 
     fork_pid = fork do
@@ -25,6 +26,12 @@ describe Capybara::Webkit::Connection do
     end
   end
 
+  it "shouldn't output extraneous warnings when exiting", skip_on_windows: true do
+    output_str, status = Open3.capture2e("rspec spec/fixtures/exit_text.rb")
+    expect(status.exitstatus).to eq(0)
+    expect(output_str).not_to include("AsynchronousCloseException")
+  end
+
   it "raises an error if the server has stopped", skip_on_windows: true do
     path = "false"
     stub_const("Capybara::Webkit::Server::SERVER_PATH", path)
@@ -82,7 +89,7 @@ describe Capybara::Webkit::Connection do
     socket.puts script.to_s.bytesize
     socket.print script
 
-    expect(read_io).to include_response "\nhello world"
+    expect(read_io).to include_response /\n\d{2}:\d{2}:\d{2}\.\d{3} hello world/
   end
 
   it "does not forward stderr to nil" do

data/spec/spec_helper.rb

@@ -13,7 +13,7 @@ $webkit_server = Capybara::Webkit::Server.new
 $webkit_connection = Capybara::Webkit::Connection.new(server: $webkit_server)
 $webkit_browser = Capybara::Webkit::Browser.new($webkit_connection)
 
-if ENV['DEBUG']
+if ENV["DEBUG"]
   $webkit_browser.enable_logging
 end
 
@@ -61,6 +61,9 @@ RSpec.configure do |c|
      end
     )
   }
+
+  c.filter_run :focus unless ENV["TRAVIS"]
+  c.run_all_when_everything_filtered = true
 end
 
 def with_env_vars(vars)

data/spec/support/matchers/include_response.rb

@@ -8,7 +8,11 @@ RSpec::Matchers.define :include_response do |expected_response|
 
     while !found_response && IO.select([read_io], nil, nil, read_timeout) do
       response += read_io.read_nonblock(read_bytes)
-      found_response = response.include?(expected_response)
+      found_response = if expected_response.is_a? Regexp
+        response.match(expected_response)
+      else
+        response.include?(expected_response)
+      end
     end
 
     found_response

data/src/CommandFactory.cpp

@@ -5,6 +5,7 @@
 #include "Reset.h"
 #include "Node.h"
 #include "Evaluate.h"
+#include "EvaluateAsync.h"
 #include "Execute.h"
 #include "FrameFocus.h"
 #include "Header.h"
@@ -46,6 +47,7 @@
 #include "WindowMaximize.h"
 #include "GoBack.h"
 #include "GoForward.h"
+#include "Refresh.h"
 #include "AcceptAlert.h"
 #include "FindModal.h"
 #include "SetUnknownUrlMode.h"

data/src/Connection.cpp

@@ -24,7 +24,7 @@ Connection::Connection(QTcpSocket *socket, WebPageManager *manager, QObject *par
 }
 
 void Connection::commandReady(Command *command) {
-  m_manager->logger() << "Received" << command->toString();
+  m_manager->log() << "Received" << command->toString();
   startCommand(command);
 }
 
@@ -65,7 +65,7 @@ void Connection::writeResponse(Response *response) {
   else
     m_socket->write("failure\n");
 
-  m_manager->logger() << "Wrote response" << response->isSuccess() << response->message();
+  m_manager->log() << "Wrote response" << response->isSuccess() << response->message();
 
   QByteArray messageUtf8 = response->message();
   QString messageLength = QString::number(messageUtf8.size()) + "\n";

data/src/Evaluate.cpp

@@ -18,8 +18,8 @@ void Evaluate::start() {
   QString eval_script = QString("(function(){"
                            "   for(var i=0; i<arguments.length; i++) {"
                            "     arguments[i] = JSON.parse(arguments[i]);"
-                           "     var elem_id;"
-                           "     if (elem_id = arguments[i]['element-581e-422e-8be1-884c4e116226']) {"
+                           "     var elem_id = arguments[i]['element-581e-422e-8be1-884c4e116226'];"
+                           "     if (elem_id) {"
                            "       arguments[i] = Capybara.getNode(elem_id);"
                            "     };"
                            "   };"

data/src/EvaluateAsync.cpp

@@ -0,0 +1,54 @@
+#include "EvaluateAsync.h"
+#include "WebPage.h"
+#include "WebPageManager.h"
+#include "JsonSerializer.h"
+#include <iostream>
+
+EvaluateAsync::EvaluateAsync(WebPageManager *manager, QStringList &arguments, QObject *parent) : SocketCommand(manager, arguments, parent) {
+}
+
+void EvaluateAsync::start() {
+  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-1; i++) {"
+                           "     arguments[i] = JSON.parse(arguments[i]);"
+                           "     var elem_id = arguments[i]['element-581e-422e-8be1-884c4e116226'];"
+                           "     if (elem_id) {"
+                           "       arguments[i] = Capybara.getNode(elem_id);"
+                           "     };"
+                           "   };"
+                           "   eval(\"%1\");"
+                           "   return;"
+                           " }).apply(null, %2.concat(function(res){ "
+                           " res = Capybara.wrapResult(res);"
+                           // This isn't necessary in Qt 5.5 but is in older (at least 5.2 on Travis)
+                           " if (res instanceof Array) {"
+                           "    CapybaraAsync['asyncResult(QVariantList)'](res);"
+                           " } else { "
+                           "    CapybaraAsync['asyncResult(QVariant)'](res);"
+                           " }"
+                           " }))").arg(script.replace("\"","\\\"").remove("\n"), jsonArgs);
+  QObject invocation_stub;
+  invocation_stub.setProperty("allowUnattached", false);
+  page()->currentFrame()->addToJavaScriptWindowObject("CapybaraInvocation", &invocation_stub);
+  page()->currentFrame()->addToJavaScriptWindowObject("CapybaraAsync", this);
+  page()->currentFrame()->evaluateJavaScript(eval_script);
+}
+
+void EvaluateAsync::asyncResult(QVariantList result) {
+  JsonSerializer serializer;
+  finish(true, serializer.serialize(result));
+}
+
+void EvaluateAsync::asyncResult(QVariant result) {
+  JsonSerializer serializer;
+  finish(true, serializer.serialize(result));
+}
+
+

data/src/EvaluateAsync.h

@@ -0,0 +1,14 @@
+#include "SocketCommand.h"
+
+#include <QVariantList>
+
+class EvaluateAsync : public SocketCommand {
+  Q_OBJECT
+
+  public:
+    EvaluateAsync(WebPageManager *, QStringList &arguments, QObject *parent = 0);
+    virtual void start();
+    Q_INVOKABLE void asyncResult(QVariant result);
+    Q_INVOKABLE void asyncResult(QVariantList result);
+};
+

data/src/JavascriptInvocation.cpp

@@ -5,6 +5,8 @@
 #include <QEvent>
 #include <QContextMenuEvent>
 
+QMap<QString, Qt::KeyboardModifiers> JavascriptInvocation::m_modifiersMap(JavascriptInvocation::makeModifiersMap());
+
 JavascriptInvocation::JavascriptInvocation(const QString &functionName, bool allowUnattached, const QStringList &arguments, WebPage *page, QObject *parent) : QObject(parent) {
   m_functionName = functionName;
   m_allowUnattached = allowUnattached;
@@ -33,6 +35,7 @@ void JavascriptInvocation::setError(QVariant error) {
 }
 
 InvocationResult JavascriptInvocation::invoke(QWebFrame *frame) {
+
   frame->addToJavaScriptWindowObject("CapybaraInvocation", this);
   QVariant result = frame->evaluateJavaScript("Capybara.invoke()");
   if (getError().isValid())
@@ -41,36 +44,43 @@ InvocationResult JavascriptInvocation::invoke(QWebFrame *frame) {
     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());
+      leftClick(qm["absoluteX"].toInt(), qm["absoluteY"].toInt(), qm["keys"].value<QVariantList>());
     }
     return InvocationResult(result);
   }
 }
 
-void JavascriptInvocation::leftClick(int x, int y) {
+Qt::KeyboardModifiers JavascriptInvocation::modifiers(const QVariantList& keys){
+  Qt::KeyboardModifiers modifiers = Qt::NoModifier;
+  for (int i = 0; i < keys.length(); i++) {
+    modifiers |= m_modifiersMap.value(keys[i].toString(), Qt::NoModifier);
+  }
+  return modifiers;
+}
+
+void JavascriptInvocation::leftClick(int x, int y, QVariantList keys) {
   QPoint mousePos(x, y);
 
-  m_page->mouseEvent(QEvent::MouseButtonPress, mousePos, Qt::LeftButton);
-  m_page->mouseEvent(QEvent::MouseButtonRelease, mousePos, Qt::LeftButton);
+  m_page->mouseEvent(QEvent::MouseButtonPress, mousePos, Qt::LeftButton, modifiers(keys));
+  m_page->mouseEvent(QEvent::MouseButtonRelease, mousePos, Qt::LeftButton, modifiers(keys));
 }
 
-void JavascriptInvocation::rightClick(int x, int y) {
+void JavascriptInvocation::rightClick(int x, int y, QVariantList keys) {
   QPoint mousePos(x, y);
-
-  m_page->mouseEvent(QEvent::MouseButtonPress, mousePos, Qt::RightButton);
+  m_page->mouseEvent(QEvent::MouseButtonPress, mousePos, Qt::RightButton, modifiers(keys));
 
   // swallowContextMenuEvent tries to fire contextmenu event in html page
-  QContextMenuEvent *event = new QContextMenuEvent(QContextMenuEvent::Mouse, mousePos);
+  QContextMenuEvent *event = new QContextMenuEvent(QContextMenuEvent::Mouse, mousePos, QCursor::pos(), modifiers(keys));
   m_page->swallowContextMenuEvent(event);
 
-  m_page->mouseEvent(QEvent::MouseButtonRelease, mousePos, Qt::RightButton);
+  m_page->mouseEvent(QEvent::MouseButtonRelease, mousePos, Qt::RightButton, modifiers(keys));
 }
 
-void JavascriptInvocation::doubleClick(int x, int y) {
+void JavascriptInvocation::doubleClick(int x, int y, QVariantList keys) {
   QPoint mousePos(x, y);
 
-  m_page->mouseEvent(QEvent::MouseButtonDblClick, mousePos, Qt::LeftButton);
-  m_page->mouseEvent(QEvent::MouseButtonRelease, mousePos, Qt::LeftButton);
+  m_page->mouseEvent(QEvent::MouseButtonDblClick, mousePos, Qt::LeftButton, modifiers(keys));
+  m_page->mouseEvent(QEvent::MouseButtonRelease, mousePos, Qt::LeftButton, modifiers(keys));
 }
 
 bool JavascriptInvocation::clickTest(QWebElement element, int absoluteX, int absoluteY) {
@@ -86,6 +96,8 @@ QVariantMap JavascriptInvocation::clickPosition(QWebElement element, int left, i
   QVariantMap m;
   m["relativeX"] = mousePos.x();
   m["relativeY"] = mousePos.y();
+  m["relativeTop"] = boundedBox.top();
+  m["relativeLeft"] = boundedBox.left();
 
   QWebFrame *parent = element.webFrame();
   while (parent) {
@@ -95,7 +107,8 @@ QVariantMap JavascriptInvocation::clickPosition(QWebElement element, int left, i
 
   boundedBox = elementBox.intersected(viewport);
   mousePos = boundedBox.center();
-
+  m["absoluteTop"] = boundedBox.top();
+  m["absoluteLeft"] = boundedBox.left();
   m["absoluteX"] = mousePos.x();
   m["absoluteY"] = mousePos.y();
 
@@ -217,3 +230,14 @@ const QString JavascriptInvocation::render(void) {
   m_page->render(path, QSize(1024, 768));
   return path;
 }
+
+QMap<QString, Qt::KeyboardModifiers> JavascriptInvocation::makeModifiersMap(){
+  QMap<QString, Qt::KeyboardModifiers> map;
+  map["alt"] = Qt::AltModifier;
+  map["control"] = Qt::ControlModifier;
+  map["meta"] = Qt::MetaModifier;
+  map["shift"] = Qt::ShiftModifier;
+  return map;
+}
+
+

data/src/JavascriptInvocation.h

@@ -20,9 +20,9 @@ class JavascriptInvocation : public QObject {
     QString &functionName();
     bool allowUnattached();
     QStringList &arguments();
-    Q_INVOKABLE void leftClick(int x, int y);
-    Q_INVOKABLE void rightClick(int x, int y);
-    Q_INVOKABLE void doubleClick(int x, int y);
+    Q_INVOKABLE void leftClick(int x, int y, QVariantList keys);
+    Q_INVOKABLE void rightClick(int x, int y, QVariantList keys);
+    Q_INVOKABLE void doubleClick(int x, int y, QVariantList keys);
     Q_INVOKABLE bool clickTest(QWebElement element, int absoluteX, int absoluteY);
     Q_INVOKABLE QVariantMap clickPosition(QWebElement element, int left, int top, int width, int height);
     Q_INVOKABLE void hover(int absoluteX, int absoluteY);
@@ -46,5 +46,8 @@ class JavascriptInvocation : public QObject {
     int keyCodeForName(const QString &);
     Qt::Key key_enum;
     Qt::KeyboardModifiers m_currentModifiers;
+    Qt::KeyboardModifiers modifiers(const QVariantList& keys);
+    static QMap<QString, Qt::KeyboardModifiers> makeModifiersMap();
+    static QMap<QString, Qt::KeyboardModifiers> m_modifiersMap;
 };
 

data/src/Node.cpp

@@ -1,6 +1,7 @@
 #include "Node.h"
 #include "WebPage.h"
 #include "WebPageManager.h"
+#include "JsonSerializer.h"
 #include "InvocationResult.h"
 
 Node::Node(WebPageManager *manager, QStringList &arguments, QObject *parent) : JavascriptCommand(manager, arguments, parent) {
@@ -14,7 +15,14 @@ void Node::start() {
   if (functionName == "focus_frame") {
     page()->setCurrentFrameParent(page()->currentFrame()->parentFrame());
   }
-  finish(&result);
+
+  if (result.hasError()) {
+    finish(&result);
+  } else {
+    JsonSerializer serializer;
+    InvocationResult jsonResult = InvocationResult(serializer.serialize(result.result()));
+    finish(&jsonResult);
+  }
 }
 
 QString Node::toString() const {

data/src/PageLoadingCommand.cpp

@@ -14,7 +14,7 @@ PageLoadingCommand::PageLoadingCommand(Command *command, WebPageManager *manager
 }
 
 void PageLoadingCommand::start() {
-  m_manager->logger() << "Started" << m_command->toString();
+  m_manager->log() << "Started" << m_command->toString();
   connect(m_command, SIGNAL(finished(Response *)), this, SLOT(commandFinished(Response *)));
   connect(m_manager, SIGNAL(loadStarted()), this, SLOT(pageLoadingFromCommand()));
   connect(m_manager, SIGNAL(pageFinished(bool)), this, SLOT(pendingLoadFinished(bool)));
@@ -26,7 +26,7 @@ void PageLoadingCommand::pendingLoadFinished(bool success) {
   if (m_pageLoadingFromCommand) {
     m_pageLoadingFromCommand = false;
     if (m_pendingResponse) {
-      m_manager->logger() << "Page load from command finished";
+      m_manager->log() << "Page load from command finished";
       if (m_pageSuccess) {
         emit finished(m_pendingResponse);
       } else {
@@ -38,13 +38,13 @@ void PageLoadingCommand::pendingLoadFinished(bool success) {
 }
 
 void PageLoadingCommand::pageLoadingFromCommand() {
-  m_manager->logger() << m_command->toString() << "started page load";
+  m_manager->log() << m_command->toString() << "started page load";
   m_pageLoadingFromCommand = true;
 }
 
 void PageLoadingCommand::commandFinished(Response *response) {
   disconnect(m_manager, SIGNAL(loadStarted()), this, SLOT(pageLoadingFromCommand()));
-  m_manager->logger() << "Finished" << m_command->toString() << "with response" << response->toString();
+  m_manager->log() << "Finished" << m_command->toString() << "with response" << response->toString();
 
   if (m_pageLoadingFromCommand)
     m_pendingResponse = response;

data/src/Refresh.cpp

@@ -0,0 +1,12 @@
+#include "Refresh.h"
+#include "SocketCommand.h"
+#include "WebPage.h"
+#include "WebPageManager.h"
+
+Refresh::Refresh(WebPageManager *manager, QStringList &arguments, QObject *parent) : SocketCommand(manager, arguments, parent) {
+}
+
+void Refresh::start() {
+  page()->triggerAction(QWebPage::Reload);
+  finish(true);
+}

data/src/Refresh.h

@@ -0,0 +1,10 @@
+#include "SocketCommand.h"
+
+class Refresh : public SocketCommand {
+  Q_OBJECT
+
+  public:
+    Refresh(WebPageManager *, QStringList &arguments, QObject *parent = 0);
+    virtual void start();
+};
+

data/src/TimeoutCommand.cpp

@@ -19,7 +19,7 @@ TimeoutCommand::TimeoutCommand(Command *command, WebPageManager *manager, QObjec
 void TimeoutCommand::start() {
   QApplication::processEvents();
   if (m_manager->isLoading()) {
-    m_manager->logger() << this->toString() << "waiting for load to finish";
+    m_manager->log() << this->toString() << "waiting for load to finish";
     connect(m_manager, SIGNAL(pageFinished(bool)), this, SLOT(pendingLoadFinished(bool)));
     startTimeout();
   } else {

data/src/WebPage.cpp

@@ -25,7 +25,10 @@ WebPage::WebPage(WebPageManager *manager, QObject *parent) : QWebPage(parent) {
 
   setForwardUnsupportedContent(true);
   loadJavascript();
-  setUserStylesheet();
+
+  #if QT_VERSION < QT_VERSION_CHECK(5, 0, 0)
+    setUserStylesheet();
+  #endif
 
   this->setCustomNetworkAccessManager();
 
@@ -174,7 +177,7 @@ void WebPage::javaScriptConsoleMessage(const QString &message, int lineNumber, c
     m["line_number"] = lineNumber;
   }
   m_consoleMessages.append(m);
-  m_manager->logger() << qPrintable(fullMessage);
+  m_manager->log() << qPrintable(fullMessage);
 }
 
 void WebPage::javaScriptAlert(QWebFrame *frame, const QString &message) {
@@ -191,7 +194,7 @@ void WebPage::javaScriptAlert(QWebFrame *frame, const QString &message) {
     addModalMessage(expectedType, message, expectedMessage);
   }
 
-  m_manager->logger() << "ALERT:" << qPrintable(message);
+  m_manager->log() << "ALERT:" << qPrintable(message);
 }
 
 bool WebPage::javaScriptConfirm(QWebFrame *frame, const QString &message) {
@@ -272,9 +275,9 @@ QString WebPage::failureString() {
     return message + m_errorPageMessage;
 }
 
-void WebPage::mouseEvent(QEvent::Type type, const QPoint &position, Qt::MouseButton button) {
+void WebPage::mouseEvent(QEvent::Type type, const QPoint &position, Qt::MouseButton button, Qt::KeyboardModifiers modifiers) {
   m_mousePosition = position;
-  QMouseEvent event(type, position, button, button, Qt::NoModifier);
+  QMouseEvent event(type, position, button, button, modifiers);
   QApplication::sendEvent(this, &event);
 }
 
@@ -488,5 +491,3 @@ QWebFrame* WebPage::currentFrameParent() {
 void WebPage::setCurrentFrameParent(QWebFrame* frame) {
   m_currentFrameParent = frame;
 }
-
-