capybara-webkit 0.13.2 → 0.14.0

data/src/NoOpReply.cpp

@@ -0,0 +1,32 @@
+#include <QTimer>
+#include "NoOpReply.h"
+
+NoOpReply::NoOpReply(QNetworkRequest &request, QObject *parent) : QNetworkReply(parent) {
+  open(ReadOnly | Unbuffered);
+  setAttribute(QNetworkRequest::HttpStatusCodeAttribute, 200);
+  setHeader(QNetworkRequest::ContentLengthHeader, QVariant(0));
+  setHeader(QNetworkRequest::ContentTypeHeader, QVariant(QString("text/plain")));
+  setUrl(request.url());
+
+  QTimer::singleShot( 0, this, SIGNAL(readyRead()) );
+  QTimer::singleShot( 0, this, SIGNAL(finished()) );
+}
+
+void NoOpReply::abort() {
+  // NO-OP
+}
+
+qint64 NoOpReply::bytesAvailable() const {
+  return 0;
+}
+
+bool NoOpReply::isSequential() const {
+  return true;
+}
+
+qint64 NoOpReply::readData(char *data, qint64 maxSize) {
+  Q_UNUSED(data);
+  Q_UNUSED(maxSize);
+  return 0;
+}
+

data/src/NoOpReply.h

@@ -0,0 +1,18 @@
+#include <QNetworkReply>
+#include <QNetworkRequest>
+
+class NoOpReply : public QNetworkReply {
+  Q_OBJECT
+
+  public: 
+    NoOpReply(QNetworkRequest &request, QObject *parent = 0);
+
+    void abort();
+    qint64 bytesAvailable() const;
+    bool isSequential() const;
+
+  protected:
+    qint64 readData(char *data, qint64 maxSize);
+
+};
+

data/src/Node.cpp

@@ -10,7 +10,7 @@ void Node::start() {
   QString functionName = functionArguments.takeFirst();
   QVariant result = page()->invokeCapybaraFunction(functionName, functionArguments);
   QString attributeValue = result.toString();
-  emit finished(new Response(true, attributeValue));
+  emitFinished(true, attributeValue);
 }
 
 QString Node::toString() const {

data/src/NullCommand.cpp

@@ -8,6 +8,6 @@ NullCommand::NullCommand(QString name, QObject *parent) : Command(parent) {
 
 void NullCommand::start() {
   QString failure = QString("[Capybara WebKit] Unknown command: ") + m_name + "\n";
-  emit finished(new Response(false, failure));
+  emitFinished(false, failure);
 }
 

data/src/PageLoadingCommand.cpp

@@ -9,13 +9,14 @@ PageLoadingCommand::PageLoadingCommand(Command *command, WebPageManager *manager
   m_pageLoadingFromCommand = false;
   m_pageSuccess = true;
   m_pendingResponse = NULL;
-  connect(m_manager, SIGNAL(loadStarted()), this, SLOT(pageLoadingFromCommand()));
-  connect(m_manager, SIGNAL(pageFinished(bool)), this, SLOT(pendingLoadFinished(bool)));
+  m_command->setParent(this);
 }
 
 void PageLoadingCommand::start() {
   m_manager->logger() << "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)));
   m_command->start();
 };
 
@@ -29,7 +30,7 @@ void PageLoadingCommand::pendingLoadFinished(bool success) {
         emit finished(m_pendingResponse);
       } else {
         QString message = m_manager->currentPage()->failureString();
-        emit finished(new Response(false, message));
+        emitFinished(false, message);
       }
     }
   }
@@ -43,7 +44,7 @@ void PageLoadingCommand::pageLoadingFromCommand() {
 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_command->deleteLater();
+
   if (m_pageLoadingFromCommand)
     m_pendingResponse = response;
   else

data/src/Render.cpp

@@ -15,5 +15,5 @@ void Render::start() {
 
   bool result = page()->render( imagePath );
 
-  emit finished(new Response(result));
+  emitFinished(result);
 }

data/src/Reset.cpp

@@ -10,6 +10,6 @@ void Reset::start() {
 
   manager()->reset();
 
-  emit finished(new Response(true));
+  emitFinished(true);
 }
 

data/src/ResizeWindow.cpp

@@ -12,6 +12,6 @@ void ResizeWindow::start() {
   QSize size(width, height);
   page()->setViewportSize(size);
 
-  emit finished(new Response(true));
+  emitFinished(true);
 }
 

data/src/Response.cpp

@@ -1,17 +1,17 @@
 #include "Response.h"
 #include <iostream>
 
-Response::Response(bool success, QString message) {
+Response::Response(bool success, QString message, QObject *parent) : QObject(parent) {
   m_success = success;
   m_message = message.toUtf8();
 }
 
-Response::Response(bool success, QByteArray message) {
+Response::Response(bool success, QByteArray message, QObject *parent) : QObject(parent) {
   m_success = success;
   m_message = message;
 }
 
-Response::Response(bool success) {
+Response::Response(bool success, QObject *parent) : QObject(parent) {
   m_success = success;
 }
 

data/src/Response.h

@@ -1,11 +1,17 @@
+#ifndef RESPONSE_H
+#define RESPONSE_H
+
+#include <QObject>
 #include <QString>
 #include <QByteArray>
 
-class Response {
+class Response : public QObject {
+  Q_OBJECT
+
   public:
-    Response(bool success, QString message);
-    Response(bool success, QByteArray message);
-    Response(bool success);
+    Response(bool success, QString message, QObject *parent);
+    Response(bool success, QByteArray message, QObject *parent);
+    Response(bool success, QObject *parent);
     bool isSuccess() const;
     QByteArray message() const;
     QString toString() const;
@@ -14,3 +20,6 @@ class Response {
     bool m_success;
     QByteArray m_message;
 };
+
+#endif
+

data/src/SetConfirmAction.cpp

@@ -7,5 +7,5 @@ SetConfirmAction::SetConfirmAction(WebPageManager *manager, QStringList &argumen
 void SetConfirmAction::start()
 {
   page()->setConfirmAction(arguments()[0]);
-  emit finished(new Response(true));
+  emitFinished(true);
 }

data/src/SetCookie.cpp

@@ -11,5 +11,5 @@ void SetCookie::start()
   QList<QNetworkCookie> cookies = QNetworkCookie::parseCookies(arguments()[0].toAscii());
   NetworkCookieJar *jar = manager()->cookieJar();
   jar->overwriteCookies(cookies);
-  emit finished(new Response(true));
+  emitFinished(true);
 }

data/src/SetPromptAction.cpp

@@ -7,5 +7,5 @@ SetPromptAction::SetPromptAction(WebPageManager *manager, QStringList &arguments
 void SetPromptAction::start()
 {
   page()->setPromptAction(arguments()[0]);
-  emit finished(new Response(true));
+  emitFinished(true);
 }

data/src/SetPromptText.cpp

@@ -7,5 +7,5 @@ SetPromptText::SetPromptText(WebPageManager *manager, QStringList &arguments, QO
 void SetPromptText::start()
 {
   page()->setPromptText(arguments()[0]);
-  emit finished(new Response(true));
+  emitFinished(true);
 }

data/src/SetProxy.cpp

@@ -1,7 +1,7 @@
 #include "SetProxy.h"
 #include "WebPage.h"
 #include "WebPageManager.h"
-#include <QNetworkAccessManager>
+#include "NetworkAccessManager.h"
 #include <QNetworkProxy>
 
 SetProxy::SetProxy(WebPageManager *manager, QStringList &arguments, QObject *parent) : SocketCommand(manager, arguments, parent) {}
@@ -19,5 +19,5 @@ void SetProxy::start()
                           arguments()[3]);
 
   page()->networkAccessManager()->setProxy(proxy);
-  emit finished(new Response(true));
+  emitFinished(true);
 }

data/src/SetSkipImageLoading.cpp

@@ -8,5 +8,5 @@ SetSkipImageLoading::SetSkipImageLoading(WebPageManager *manager, QStringList &a
 
 void SetSkipImageLoading::start() {
   page()->setSkipImageLoading(arguments().contains("true"));
-  emit finished(new Response(true));
+  emitFinished(true);
 }

data/src/SetTimeout.cpp

@@ -11,9 +11,9 @@ void SetTimeout::start() {
 
   if (ok) {
     manager()->setTimeout(timeout);
-    emit finished(new Response(true));
+    emitFinished(true);
   } else {
-    emit finished(new Response(false, QString("Invalid value for timeout")));
+    emitFinished(false, QString("Invalid value for timeout"));
   }
 }
 

data/src/SetUrlBlacklist.cpp

@@ -0,0 +1,15 @@
+
+#include "SetUrlBlacklist.h"
+#include "WebPageManager.h"
+#include "WebPage.h"
+#include "NetworkAccessManager.h"
+
+SetUrlBlacklist::SetUrlBlacklist(WebPageManager *manager, QStringList &arguments, QObject *parent) : SocketCommand(manager, arguments, parent) {
+}
+
+void SetUrlBlacklist::start() {
+  NetworkAccessManager* networkAccessManager = page()->networkAccessManager();
+  networkAccessManager->setUrlBlacklist(arguments());
+  emitFinished(true);
+}
+

data/src/SetUrlBlacklist.h

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

data/src/Status.cpp

@@ -8,6 +8,6 @@ Status::Status(WebPageManager *manager, QStringList &arguments, QObject *parent)
 
 void Status::start() {
   int status = page()->getLastStatus();
-  emit finished(new Response(true, QString::number(status)));
+  emitFinished(true, QString::number(status));
 }
 

data/src/TimeoutCommand.cpp

@@ -3,17 +3,20 @@
 #include "WebPageManager.h"
 #include "WebPage.h"
 #include <QTimer>
+#include <QApplication>
 
 TimeoutCommand::TimeoutCommand(Command *command, WebPageManager *manager, QObject *parent) : Command(parent) {
   m_command = command;
   m_manager = manager;
   m_timer = new QTimer(this);
   m_timer->setSingleShot(true);
+  m_command->setParent(this);
   connect(m_timer, SIGNAL(timeout()), this, SLOT(commandTimeout()));
   connect(m_manager, SIGNAL(loadStarted()), this, SLOT(pageLoadingFromCommand()));
 }
 
 void TimeoutCommand::start() {
+  QApplication::processEvents();
   if (m_manager->isLoading()) {
     m_manager->logger() << this->toString() << "waiting for load to finish";
     connect(m_manager, SIGNAL(pageFinished(bool)), this, SLOT(pendingLoadFinished(bool)));
@@ -36,13 +39,13 @@ void TimeoutCommand::startTimeout() {
 }
 
 void TimeoutCommand::pendingLoadFinished(bool success) {
+  disconnect(m_manager, SIGNAL(pageFinished(bool)), this, SLOT(pendingLoadFinished(bool)));
   if (success) {
     startCommand();
   } else {
     disconnect(m_timer, SIGNAL(timeout()), this, SLOT(commandTimeout()));
     disconnect(m_manager, SIGNAL(loadStarted()), this, SLOT(pageLoadingFromCommand()));
-    disconnect(m_manager, SIGNAL(pageFinished(bool)), this, SLOT(pendingLoadFinished(bool)));
-    emit finished(new Response(false, m_manager->currentPage()->failureString()));
+    emitFinished(false, m_manager->currentPage()->failureString());
   }
 }
 
@@ -55,15 +58,12 @@ void TimeoutCommand::commandTimeout() {
   disconnect(m_manager, SIGNAL(pageFinished(bool)), this, SLOT(pendingLoadFinished(bool)));
   disconnect(m_command, SIGNAL(finished(Response *)), this, SLOT(commandFinished(Response *)));
   m_manager->currentPage()->triggerAction(QWebPage::Stop);
-  m_command->deleteLater();
-  emit finished(new Response(false, QString("timeout")));
+  emit finished(new Response(false, QString("timeout"), this));
 }
 
 void TimeoutCommand::commandFinished(Response *response) {
   disconnect(m_timer, SIGNAL(timeout()), this, SLOT(commandTimeout()));
   disconnect(m_manager, SIGNAL(loadStarted()), this, SLOT(pageLoadingFromCommand()));
-  disconnect(m_manager, SIGNAL(pageFinished(bool)), this, SLOT(pendingLoadFinished(bool)));
-  m_command->deleteLater();
   emit finished(response);
 }
 

data/src/TimeoutCommand.h

@@ -26,9 +26,6 @@ class TimeoutCommand : public Command {
     void pageLoadingFromCommand();
     void pendingLoadFinished(bool);
 
-  signals:
-    void finished(Response *response);
-
   protected:
     void startCommand();
     void startTimeout();

data/src/UnsupportedContentHandler.cpp

@@ -10,17 +10,14 @@ UnsupportedContentHandler::UnsupportedContentHandler(WebPage *page, QNetworkRepl
 void UnsupportedContentHandler::renderNonHtmlContent() {
   QByteArray text = m_reply->readAll();
   m_page->mainFrame()->setContent(text, QString("text/plain"), m_reply->url());
-  m_page->networkAccessManagerFinishedReply(m_reply);
-  m_page->loadFinished(true);
+  m_page->unsupportedContentFinishedReply(m_reply);
   this->deleteLater();
 }
 
 void UnsupportedContentHandler::waitForReplyToFinish() {
   connect(m_reply, SIGNAL(finished()), this, SLOT(replyFinished()));
-  disconnect(m_page, SIGNAL(loadFinished(bool)), m_page, SLOT(loadFinished(bool)));
 }
 
 void UnsupportedContentHandler::replyFinished() {
   renderNonHtmlContent();
-  connect(m_page, SIGNAL(loadFinished(bool)), m_page, SLOT(loadFinished(bool)));
 }

data/src/Visit.cpp

@@ -9,5 +9,5 @@ Visit::Visit(WebPageManager *manager, QStringList &arguments, QObject *parent) :
 void Visit::start() {
   QUrl requestedUrl = QUrl::fromEncoded(arguments()[0].toUtf8(), QUrl::StrictMode);
   page()->currentFrame()->load(QUrl(requestedUrl));
-  emit finished(new Response(true));
+  emitFinished(true);
 }

data/src/WebPage.cpp

@@ -14,6 +14,7 @@ WebPage::WebPage(WebPageManager *manager, QObject *parent) : QWebPage(parent) {
   m_failed = false;
   m_manager = manager;
   m_uuid = QUuid::createUuid().toString();
+  m_unsupportedContentLoaded = false;
 
   setForwardUnsupportedContent(true);
   loadJavascript();
@@ -33,7 +34,6 @@ WebPage::WebPage(WebPageManager *manager, QObject *parent) : QWebPage(parent) {
   resetWindowSize();
 
   settings()->setAttribute(QWebSettings::JavascriptCanOpenWindows, true);
-  currentFrame()->setUrl(QUrl("about:blank"));
 }
 
 void WebPage::resetWindowSize() {
@@ -45,18 +45,15 @@ void WebPage::setCustomNetworkAccessManager() {
   NetworkAccessManager *manager = new NetworkAccessManager(this);
   manager->setCookieJar(m_manager->cookieJar());
   this->setNetworkAccessManager(manager);
-  connect(manager, SIGNAL(finished(QNetworkReply *)), this, SLOT(networkAccessManagerFinishedReply(QNetworkReply *)));
   connect(manager, SIGNAL(sslErrors(QNetworkReply *, QList<QSslError>)),
           this, SLOT(handleSslErrorsForReply(QNetworkReply *, QList<QSslError>)));
-  connect(manager, SIGNAL(requestCreated(QByteArray &, QNetworkReply *)), this, SLOT(networkAccessManagerCreatedRequest(QByteArray &, QNetworkReply *)));
+  connect(manager, SIGNAL(requestCreated(QByteArray &, QNetworkReply *)),
+          SIGNAL(requestCreated(QByteArray &, QNetworkReply *)));
 }
 
-void WebPage::networkAccessManagerCreatedRequest(QByteArray &url, QNetworkReply *reply) {
-  emit requestCreated(url, reply);
-}
-
-void WebPage::networkAccessManagerFinishedReply(QNetworkReply *reply) {
-  emit replyFinished(reply);
+void WebPage::unsupportedContentFinishedReply(QNetworkReply *reply) {
+  m_unsupportedContentLoaded = true;
+  m_manager->replyFinished(reply);
 }
 
 void WebPage::loadJavascript() {
@@ -73,7 +70,7 @@ void WebPage::loadJavascript() {
 }
 
 void WebPage::setUserStylesheet() {
-  QString data = QString("* { font-family: 'Arial' ! important; }").toUtf8().toBase64();
+  QString data = QString("*, :first-line, :first-letter, :before, :after { font-family: 'Arial' ! important; }").toUtf8().toBase64();
   QUrl url = QUrl(QString("data:text/css;charset=utf-8;base64,") + data);
   settings()->setUserStyleSheetUrl(url);
 }
@@ -86,20 +83,20 @@ QString WebPage::userAgentForUrl(const QUrl &url ) const {
   }
 }
 
-QString WebPage::consoleMessages() {
-  return m_consoleMessages.join("\n");
+QVariantList WebPage::consoleMessages() {
+  return m_consoleMessages;
 }
 
-QString WebPage::alertMessages() {
-  return m_alertMessages.join("\n");
+QVariantList WebPage::alertMessages() {
+  return m_alertMessages;
 }
 
-QString WebPage::confirmMessages() {
-  return m_confirmMessages.join("\n");
+QVariantList WebPage::confirmMessages() {
+  return m_confirmMessages;
 }
 
-QString WebPage::promptMessages() {
-  return m_promptMessages.join("\n");
+QVariantList WebPage::promptMessages() {
+  return m_promptMessages;
 }
 
 void WebPage::setUserAgent(QString userAgent) {
@@ -134,17 +131,22 @@ QVariant WebPage::invokeCapybaraFunction(QString &name, const QStringList &argum
 }
 
 void WebPage::javaScriptConsoleMessage(const QString &message, int lineNumber, const QString &sourceID) {
-  QString fullMessage = QString::number(lineNumber) + "|" + message;
-  if (!sourceID.isEmpty())
-    fullMessage = sourceID + "|" + fullMessage;
-  m_consoleMessages.append(fullMessage);
-  std::cout << qPrintable(fullMessage) << std::endl;
+  QVariantMap m;
+  m["message"] = message;
+  QString fullMessage = QString(message);
+  if (!sourceID.isEmpty()) {
+    fullMessage = sourceID + "|" + QString::number(lineNumber) + "|" + fullMessage;
+    m["source"] = sourceID;
+    m["line_number"] = lineNumber;
+  }
+  m_consoleMessages.append(m);
+  m_manager->logger() << qPrintable(fullMessage);
 }
 
 void WebPage::javaScriptAlert(QWebFrame *frame, const QString &message) {
   Q_UNUSED(frame);
   m_alertMessages.append(message);
-  std::cout << "ALERT: " << qPrintable(message) << std::endl;
+  m_manager->logger() << "ALERT:" << qPrintable(message);
 }
 
 bool WebPage::javaScriptConfirm(QWebFrame *frame, const QString &message) {
@@ -169,6 +171,7 @@ bool WebPage::javaScriptPrompt(QWebFrame *frame, const QString &message, const Q
 void WebPage::loadStarted() {
   m_loading = true;
   m_errorPageMessage = QString();
+  m_unsupportedContentLoaded = false;
 }
 
 void WebPage::loadFinished(bool success) {
@@ -221,13 +224,12 @@ QString WebPage::chooseFile(QWebFrame *parentFrame, const QString &suggestedFile
   Q_UNUSED(parentFrame);
   Q_UNUSED(suggestedFile);
 
-  return getLastAttachedFileName();
+  return getAttachedFileNames().first();
 }
 
 bool WebPage::extension(Extension extension, const ExtensionOption *option, ExtensionReturn *output) {
   if (extension == ChooseMultipleFilesExtension) {
-    QStringList names = QStringList() << getLastAttachedFileName();
-    static_cast<ChooseMultipleFilesExtensionReturn*>(output)->fileNames = names;
+    static_cast<ChooseMultipleFilesExtensionReturn*>(output)->fileNames = getAttachedFileNames();
     return true;
   }
   else if (extension == QWebPage::ErrorPageExtension) {
@@ -239,8 +241,8 @@ bool WebPage::extension(Extension extension, const ExtensionOption *option, Exte
   return false;
 }
 
-QString WebPage::getLastAttachedFileName() {
-  return currentFrame()->evaluateJavaScript(QString("Capybara.lastAttachedFile")).toString();
+QStringList WebPage::getAttachedFileNames() {
+  return currentFrame()->evaluateJavaScript(QString("Capybara.attachedFiles")).toStringList();
 }
 
 void WebPage::handleSslErrorsForReply(QNetworkReply *reply, const QList<QSslError> &errors) {
@@ -253,11 +255,15 @@ void WebPage::setSkipImageLoading(bool skip) {
 }
 
 int WebPage::getLastStatus() {
-  return qobject_cast<NetworkAccessManager *>(networkAccessManager())->statusFor(currentFrame()->url());
+  return networkAccessManager()->statusFor(currentFrame()->requestedUrl());
 }
 
 const QList<QNetworkReply::RawHeaderPair> &WebPage::pageHeaders() {
-  return qobject_cast<NetworkAccessManager *>(networkAccessManager())->headersFor(currentFrame()->url());
+  return networkAccessManager()->headersFor(currentFrame()->requestedUrl());
+}
+
+NetworkAccessManager *WebPage::networkAccessManager() {
+  return qobject_cast<NetworkAccessManager *>(QWebPage::networkAccessManager());
 }
 
 void WebPage::handleUnsupportedContent(QNetworkReply *reply) {
@@ -272,6 +278,10 @@ void WebPage::handleUnsupportedContent(QNetworkReply *reply) {
   }
 }
 
+bool WebPage::unsupportedContentLoaded() {
+  return m_unsupportedContentLoaded;
+}
+
 bool WebPage::supportsExtension(Extension extension) const {
   if (extension == ErrorPageExtension)
     return true;