capybara-webkit 0.14.2 → 1.0.0

data/src/SetConfirmAction.cpp

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

data/src/SetCookie.cpp

@@ -8,8 +8,8 @@ SetCookie::SetCookie(WebPageManager *manager, QStringList &arguments, QObject *p
 
 void SetCookie::start()
 {
-  QList<QNetworkCookie> cookies = QNetworkCookie::parseCookies(arguments()[0].toAscii());
+  QList<QNetworkCookie> cookies = QNetworkCookie::parseCookies(arguments()[0].toLatin1());
   NetworkCookieJar *jar = manager()->cookieJar();
   jar->overwriteCookies(cookies);
-  emitFinished(true);
+  finish(true);
 }

data/src/SetPromptAction.cpp

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

data/src/SetPromptText.cpp

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

data/src/SetProxy.cpp

@@ -18,6 +18,6 @@ void SetProxy::start()
                           arguments()[2],
                           arguments()[3]);
 
-  page()->networkAccessManager()->setProxy(proxy);
-  emitFinished(true);
+  manager()->networkAccessManager()->setProxy(proxy);
+  finish(true);
 }

data/src/SetSkipImageLoading.cpp

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

data/src/SetTimeout.cpp

@@ -1,5 +1,6 @@
 #include "SetTimeout.h"
 #include "WebPageManager.h"
+#include "ErrorMessage.h"
 
 SetTimeout::SetTimeout(WebPageManager *manager, QStringList &arguments, QObject *parent) : SocketCommand(manager, arguments, parent) {
 }
@@ -11,9 +12,9 @@ void SetTimeout::start() {
 
   if (ok) {
     manager()->setTimeout(timeout);
-    emitFinished(true);
+    finish(true);
   } else {
-    emitFinished(false, QString("Invalid value for timeout"));
+    finish(false, new ErrorMessage("Invalid value for timeout"));
   }
 }
 

data/src/SetUrlBlacklist.cpp

@@ -8,8 +8,8 @@ SetUrlBlacklist::SetUrlBlacklist(WebPageManager *manager, QStringList &arguments
 }
 
 void SetUrlBlacklist::start() {
-  NetworkAccessManager* networkAccessManager = page()->networkAccessManager();
+  NetworkAccessManager* networkAccessManager = manager()->networkAccessManager();
   networkAccessManager->setUrlBlacklist(arguments());
-  emitFinished(true);
+  finish(true);
 }
 

data/src/Status.cpp

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

data/src/TimeoutCommand.cpp

@@ -2,6 +2,7 @@
 #include "Command.h"
 #include "WebPageManager.h"
 #include "WebPage.h"
+#include "ErrorMessage.h"
 #include <QTimer>
 #include <QApplication>
 
@@ -45,7 +46,7 @@ void TimeoutCommand::pendingLoadFinished(bool success) {
   } else {
     disconnect(m_timer, SIGNAL(timeout()), this, SLOT(commandTimeout()));
     disconnect(m_manager, SIGNAL(loadStarted()), this, SLOT(pageLoadingFromCommand()));
-    emitFinished(false, m_manager->currentPage()->failureString());
+    finish(false, new ErrorMessage(m_manager->currentPage()->failureString()));
   }
 }
 
@@ -58,7 +59,8 @@ 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);
-  emit finished(new Response(false, QString("timeout"), this));
+  QString message = QString("Request timed out after %1 second(s)").arg(m_manager->getTimeout());
+  finish(false, new ErrorMessage("TimeoutError", message));
 }
 
 void TimeoutCommand::commandFinished(Response *response) {

data/src/Title.cpp

@@ -0,0 +1,11 @@
+#include "Title.h"
+#include "WebPage.h"
+#include "WebPageManager.h"
+#include "NetworkAccessManager.h"
+
+Title::Title(WebPageManager *manager, QStringList &arguments, QObject *parent) : SocketCommand(manager, arguments, parent) {
+}
+
+void Title::start() {
+  finish(true, page()->currentFrame()->title());
+}

data/src/Title.h

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

data/src/Version.cpp

@@ -0,0 +1,13 @@
+#include "Version.h"
+#include "WebPage.h"
+
+Version::Version(WebPageManager *manager, QStringList &arguments, QObject *parent) : SocketCommand(manager, arguments, parent) {
+}
+
+void Version::start() {
+  QString result =
+    QString("Qt: ") + QT_VERSION_STR +
+    QString("\nWebKit: ") + qWebKitVersion() +
+    QString("\nQtWebKit: ") + QTWEBKIT_VERSION_STR;
+  finish(true, result);
+}

data/src/Version.h

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

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));
-  emitFinished(true);
+  finish(true);
 }

data/src/WebPage.cpp

@@ -4,6 +4,8 @@
 #include "NetworkAccessManager.h"
 #include "NetworkCookieJar.h"
 #include "UnsupportedContentHandler.h"
+#include "InvocationResult.h"
+#include "NetworkReplyProxy.h"
 #include <QResource>
 #include <iostream>
 #include <QWebSettings>
@@ -14,7 +16,6 @@ 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();
@@ -41,18 +42,42 @@ void WebPage::resetWindowSize() {
   this->settings()->setAttribute(QWebSettings::LocalStorageDatabaseEnabled, true);
 }
 
+void WebPage::resetLocalStorage() {
+  this->currentFrame()->evaluateJavaScript("localStorage.clear()");
+}
+
 void WebPage::setCustomNetworkAccessManager() {
-  NetworkAccessManager *manager = new NetworkAccessManager(this);
-  manager->setCookieJar(m_manager->cookieJar());
-  this->setNetworkAccessManager(manager);
-  connect(manager, SIGNAL(sslErrors(QNetworkReply *, QList<QSslError>)),
-          this, SLOT(handleSslErrorsForReply(QNetworkReply *, QList<QSslError>)));
-  connect(manager, SIGNAL(requestCreated(QByteArray &, QNetworkReply *)),
+  setNetworkAccessManager(m_manager->networkAccessManager());
+  connect(networkAccessManager(), SIGNAL(sslErrors(QNetworkReply *, QList<QSslError>)),
+          SLOT(handleSslErrorsForReply(QNetworkReply *, QList<QSslError>)));
+  connect(networkAccessManager(), SIGNAL(requestCreated(QByteArray &, QNetworkReply *)),
           SIGNAL(requestCreated(QByteArray &, QNetworkReply *)));
+  connect(networkAccessManager(), SIGNAL(finished(QUrl &, QNetworkReply *)),
+          SLOT(replyFinished(QUrl &, QNetworkReply *)));
+}
+
+void WebPage::replyFinished(QUrl &requestedUrl, QNetworkReply *reply) {
+  NetworkReplyProxy *proxy = qobject_cast<NetworkReplyProxy *>(reply);
+  setFrameProperties(mainFrame(), requestedUrl, proxy);
+  foreach(QWebFrame *frame, mainFrame()->childFrames())
+    setFrameProperties(frame, requestedUrl, proxy);
+}
+
+void WebPage::setFrameProperties(QWebFrame *frame, QUrl &requestedUrl, NetworkReplyProxy *reply) {
+  if (frame->requestedUrl() == requestedUrl) {
+    int statusCode = reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt();
+    frame->setProperty("statusCode", statusCode);
+    QStringList headers;
+    foreach(QNetworkReply::RawHeaderPair header, reply->rawHeaderPairs())
+      headers << header.first+": "+header.second;
+    frame->setProperty("headers", headers);
+    frame->setProperty("body", reply->data());
+    QVariant contentMimeType = reply->header(QNetworkRequest::ContentTypeHeader);
+    frame->setProperty("contentType", contentMimeType);
+  }
 }
 
 void WebPage::unsupportedContentFinishedReply(QNetworkReply *reply) {
-  m_unsupportedContentLoaded = true;
   m_manager->replyFinished(reply);
 }
 
@@ -117,17 +142,14 @@ bool WebPage::shouldInterruptJavaScript() {
   return false;
 }
 
-QVariant WebPage::invokeCapybaraFunction(const char *name, const QStringList &arguments) {
+InvocationResult WebPage::invokeCapybaraFunction(const char *name, const QStringList &arguments) {
   QString qname(name);
-  QString objectName("CapybaraInvocation");
-  JavascriptInvocation invocation(qname, arguments);
-  currentFrame()->addToJavaScriptWindowObject(objectName, &invocation);
-  QString javascript = QString("Capybara.invoke()");
-  return currentFrame()->evaluateJavaScript(javascript);
+  JavascriptInvocation invocation(qname, arguments, this);
+  return invocation.invoke(currentFrame());
 }
 
-QVariant WebPage::invokeCapybaraFunction(QString &name, const QStringList &arguments) {
-  return invokeCapybaraFunction(name.toAscii().data(), arguments);
+InvocationResult WebPage::invokeCapybaraFunction(QString &name, const QStringList &arguments) {
+  return invokeCapybaraFunction(name.toLatin1().data(), arguments);
 }
 
 void WebPage::javaScriptConsoleMessage(const QString &message, int lineNumber, const QString &sourceID) {
@@ -171,7 +193,6 @@ 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) {
@@ -247,8 +268,9 @@ QStringList WebPage::getAttachedFileNames() {
 }
 
 void WebPage::handleSslErrorsForReply(QNetworkReply *reply, const QList<QSslError> &errors) {
+  Q_UNUSED(errors);
   if (m_manager->ignoreSslErrors())
-    reply->ignoreSslErrors(errors);
+    reply->ignoreSslErrors();
 }
 
 void WebPage::setSkipImageLoading(bool skip) {
@@ -256,15 +278,19 @@ void WebPage::setSkipImageLoading(bool skip) {
 }
 
 int WebPage::getLastStatus() {
-  return networkAccessManager()->statusFor(currentFrame()->requestedUrl());
+  return currentFrame()->property("statusCode").toInt();
 }
 
-const QList<QNetworkReply::RawHeaderPair> &WebPage::pageHeaders() {
-  return networkAccessManager()->headersFor(currentFrame()->requestedUrl());
+QStringList WebPage::pageHeaders() {
+  return currentFrame()->property("headers").toStringList();
 }
 
-NetworkAccessManager *WebPage::networkAccessManager() {
-  return qobject_cast<NetworkAccessManager *>(QWebPage::networkAccessManager());
+QByteArray WebPage::body() {
+  return currentFrame()->property("body").toByteArray();
+}
+
+QString WebPage::contentType() {
+  return currentFrame()->property("contentType").toString();
 }
 
 void WebPage::handleUnsupportedContent(QNetworkReply *reply) {
@@ -279,10 +305,6 @@ void WebPage::handleUnsupportedContent(QNetworkReply *reply) {
   }
 }
 
-bool WebPage::unsupportedContentLoaded() {
-  return m_unsupportedContentLoaded;
-}
-
 bool WebPage::supportsExtension(Extension extension) const {
   if (extension == ErrorPageExtension)
     return true;

data/src/WebPage.h

@@ -1,18 +1,23 @@
 #ifndef _WEBPAGE_H
 #define _WEBPAGE_H
+#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
+#include <QtWebKitWidgets>
+#else
 #include <QtWebKit>
+#endif
 #include <QtNetwork>
 
 class WebPageManager;
-class NetworkAccessManager;
+class InvocationResult;
+class NetworkReplyProxy;
 
 class WebPage : public QWebPage {
   Q_OBJECT
 
   public:
     WebPage(WebPageManager *, QObject *parent = 0);
-    QVariant invokeCapybaraFunction(const char *name, const QStringList &arguments);
-    QVariant invokeCapybaraFunction(QString &name, const QStringList &arguments);
+    InvocationResult invokeCapybaraFunction(const char *name, const QStringList &arguments);
+    InvocationResult invokeCapybaraFunction(QString &name, const QStringList &arguments);
     QString failureString();
     QString userAgentForUrl(const QUrl &url ) const;
     void setUserAgent(QString userAgent);
@@ -29,14 +34,16 @@ class WebPage : public QWebPage {
     QVariantList confirmMessages();
     QVariantList promptMessages();
     void resetWindowSize();
+    void resetLocalStorage();
     QWebPage *createWindow(WebWindowType type);
     QString uuid();
     QString getWindowName();
     bool matchesWindowSelector(QString);
     void setFocus();
-    NetworkAccessManager *networkAccessManager();
-    bool unsupportedContentLoaded();
     void unsupportedContentFinishedReply(QNetworkReply *reply);
+    QStringList pageHeaders();
+    QByteArray body();
+    QString contentType();
 
   public slots:
     bool shouldInterruptJavaScript();
@@ -44,10 +51,10 @@ class WebPage : public QWebPage {
     void loadStarted();
     void loadFinished(bool);
     bool isLoading() const;
-    const QList<QNetworkReply::RawHeaderPair> &pageHeaders();
     void frameCreated(QWebFrame *);
     void handleSslErrorsForReply(QNetworkReply *reply, const QList<QSslError> &);
     void handleUnsupportedContent(QNetworkReply *reply);
+    void replyFinished(QUrl &, QNetworkReply *);
 
   signals:
     void pageFinished(bool);
@@ -80,7 +87,7 @@ class WebPage : public QWebPage {
     QString m_uuid;
     WebPageManager *m_manager;
     QString m_errorPageMessage;
-    bool m_unsupportedContentLoaded;
+    void setFrameProperties(QWebFrame *, QUrl &, NetworkReplyProxy *);
 };
 
 #endif //_WEBPAGE_H

data/src/WebPageManager.cpp

@@ -1,17 +1,24 @@
 #include "WebPageManager.h"
 #include "WebPage.h"
 #include "NetworkCookieJar.h"
+#include "NetworkAccessManager.h"
 
 WebPageManager::WebPageManager(QObject *parent) : QObject(parent) {
   m_ignoreSslErrors = false;
   m_cookieJar = new NetworkCookieJar(this);
   m_success = true;
   m_loggingEnabled = false;
-  m_ignoredOutput = new QString();
+  m_ignoredOutput = new QFile(this);
   m_timeout = -1;
+  m_networkAccessManager = new NetworkAccessManager(this);
+  m_networkAccessManager->setCookieJar(m_cookieJar);
   createPage(this)->setFocus();
 }
 
+NetworkAccessManager *WebPageManager::networkAccessManager() {
+  return m_networkAccessManager;
+}
+
 void WebPageManager::append(WebPage *value) {
   m_pages.append(value);
 }
@@ -102,6 +109,8 @@ void WebPageManager::setTimeout(int timeout) {
 void WebPageManager::reset() {
   m_timeout = -1;
   m_cookieJar->clearCookies();
+  m_networkAccessManager->reset();
+  m_pages.first()->resetLocalStorage();
   m_pages.first()->deleteLater();
   m_pages.clear();
   createPage(this)->setFocus();

data/src/WebPageManager.h

@@ -9,6 +9,7 @@
 
 class WebPage;
 class NetworkCookieJar;
+class NetworkAccessManager;
 
 class WebPageManager : public QObject {
   Q_OBJECT
@@ -30,6 +31,7 @@ class WebPageManager : public QObject {
     QDebug logger() const;
     void enableLogging();
     void replyFinished(QNetworkReply *reply);
+    NetworkAccessManager *networkAccessManager();
 
   public slots:
     void emitLoadStarted();
@@ -52,8 +54,9 @@ class WebPageManager : public QObject {
     QSet<WebPage *> m_started;
     bool m_success;
     bool m_loggingEnabled;
-    QString *m_ignoredOutput;
+    QFile *m_ignoredOutput;
     int m_timeout;
+    NetworkAccessManager *m_networkAccessManager;
 };
 
 #endif // _WEBPAGEMANAGER_H