capybara-webkit 1.3.1 → 1.4.0

data/src/NoOpReply.cpp

@@ -1,7 +1,7 @@
 #include <QTimer>
 #include "NoOpReply.h"
 
-NoOpReply::NoOpReply(QNetworkRequest &request, QObject *parent) : QNetworkReply(parent) {
+NoOpReply::NoOpReply(const QNetworkRequest &request, QObject *parent) : QNetworkReply(parent) {
   open(ReadOnly | Unbuffered);
   setAttribute(QNetworkRequest::HttpStatusCodeAttribute, 200);
   setHeader(QNetworkRequest::ContentLengthHeader, QVariant(0));

data/src/NoOpReply.h

@@ -5,7 +5,7 @@ class NoOpReply : public QNetworkReply {
   Q_OBJECT
 
   public: 
-    NoOpReply(QNetworkRequest &request, QObject *parent = 0);
+    NoOpReply(const QNetworkRequest &request, QObject *parent = 0);
 
     void abort();
     qint64 bytesAvailable() const;

data/src/RequestHandler.cpp

@@ -0,0 +1,4 @@
+#include "RequestHandler.h"
+
+RequestHandler::RequestHandler(QObject *parent) : QObject(parent) {
+}

data/src/RequestHandler.h

@@ -0,0 +1,25 @@
+#ifndef __REQUESTHANDLER_H
+#define __REQUESTHANDLER_H
+
+#include <QtNetwork/QNetworkAccessManager>
+#include <QtNetwork/QNetworkRequest>
+#include <QtNetwork/QNetworkReply>
+#include <QStringList>
+
+class NetworkAccessManager;
+
+class RequestHandler : public QObject {
+  Q_OBJECT
+
+  public:
+    RequestHandler(QObject *parent = 0);
+
+    virtual QNetworkReply* handleRequest(
+      NetworkAccessManager *,
+      QNetworkAccessManager::Operation,
+      QNetworkRequest &,
+      QIODevice *
+    ) = 0;
+};
+
+#endif

data/src/SetUnknownUrlMode.cpp

@@ -0,0 +1,27 @@
+#include "SetUnknownUrlMode.h"
+#include "WebPage.h"
+#include "WebPageManager.h"
+#include "ErrorMessage.h"
+
+SetUnknownUrlMode::SetUnknownUrlMode(WebPageManager *manager, QStringList &arguments, QObject *parent) : SocketCommand(manager, arguments, parent) {
+}
+
+void SetUnknownUrlMode::start() {
+  QString modeString = arguments()[0];
+  QStringList modes;
+  modes << "warn" << "block";
+
+  switch(modes.indexOf(modeString)) {
+    case 0:
+      manager()->setUnknownUrlMode(UnknownUrlHandler::WARN);
+      finish(true);
+      break;
+    case 1:
+      manager()->setUnknownUrlMode(UnknownUrlHandler::BLOCK);
+      finish(true);
+      break;
+    default:
+      QString error = QString("Invalid mode string:") + modeString;
+      finish(false, new ErrorMessage(error));
+  }
+}

data/src/SetUnknownUrlMode.h

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

data/src/SetUrlBlacklist.cpp

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

data/src/SetUrlBlacklist.h

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

data/src/UnknownUrlHandler.cpp

@@ -0,0 +1,70 @@
+#include "UnknownUrlHandler.h"
+#include "NetworkReplyProxy.h"
+#include "NoOpReply.h"
+
+UnknownUrlHandler::UnknownUrlHandler(
+  RequestHandler *next,
+  QObject *parent
+) : RequestHandler(parent) {
+  m_next = next;
+  m_allowedUrls.append(QString("127.0.0.1"));
+  m_allowedUrls.append(QString("localhost"));
+  m_mode = WARN;
+}
+
+QNetworkReply* UnknownUrlHandler::handleRequest(
+  NetworkAccessManager *manager,
+  QNetworkAccessManager::Operation operation,
+  QNetworkRequest &request,
+  QIODevice *outgoingData
+) {
+  QUrl url(request.url());
+  if (this->isUnknown(url)) {
+    switch(m_mode) {
+      case WARN:
+        QTextStream(stderr) <<
+           "Request to unknown URL: " << url.toString() << endl <<
+           "To block requests to unknown URLs:" << endl <<
+           "  page.driver.block_unknown_urls" << endl <<
+           "To allow just this URL:" << endl <<
+           "  page.driver.allow_url(\"" << url.toString() << "\")" << endl <<
+           "To allow requests to URLs from this host:" << endl <<
+           "  page.driver.allow_url(\"" << url.host() << "\")" << endl;
+        break;
+      case BLOCK:
+        return new NetworkReplyProxy(new NoOpReply(request), this);
+    }
+  }
+
+  return m_next->handleRequest(manager, operation, request, outgoingData);
+}
+
+void UnknownUrlHandler::allowUrl(const QString &url) {
+  m_allowedUrls << url;
+}
+
+void UnknownUrlHandler::setMode(Mode mode) {
+  m_mode = mode;
+}
+
+bool UnknownUrlHandler::isUnknown(QUrl url) {
+  QStringListIterator iterator(m_allowedUrls);
+  QString urlString = url.toString();
+
+  while (iterator.hasNext()) {
+    QRegExp allowedUrl = QRegExp(iterator.next());
+    allowedUrl.setPatternSyntax(QRegExp::Wildcard);
+
+    if(urlString.contains(allowedUrl)) {
+      return false;
+    }
+  }
+
+  return true;
+}
+
+void UnknownUrlHandler::reset() {
+  m_allowedUrls.clear();
+  m_allowedUrls.append(QString("127.0.0.1"));
+  m_allowedUrls.append(QString("localhost"));
+}

data/src/UnknownUrlHandler.h

@@ -0,0 +1,28 @@
+#ifndef _REQUESTHANDLER_H
+#define _REQUESTHANDLER_H
+
+#include "RequestHandler.h"
+
+class UnknownUrlHandler : public RequestHandler {
+  public:
+    enum Mode { WARN, BLOCK };
+
+    UnknownUrlHandler(RequestHandler *next, QObject *parent = 0);
+    virtual QNetworkReply* handleRequest(
+      NetworkAccessManager *,
+      QNetworkAccessManager::Operation,
+      QNetworkRequest &,
+      QIODevice *
+    );
+    void allowUrl(const QString &);
+    void setMode(Mode);
+    void reset();
+
+  private:
+    QStringList m_allowedUrls;
+    bool isUnknown(QUrl);
+    Mode m_mode;
+    RequestHandler *m_next;
+};
+
+#endif

data/src/WebPageManager.cpp

@@ -2,6 +2,11 @@
 #include "WebPage.h"
 #include "NetworkCookieJar.h"
 #include "NetworkAccessManager.h"
+#include "BlacklistedRequestHandler.h"
+#include "CustomHeadersRequestHandler.h"
+#include "MissingContentHeaderRequestHandler.h"
+#include "UnknownUrlHandler.h"
+#include "NetworkRequestFactory.h"
 
 WebPageManager::WebPageManager(QObject *parent) : QObject(parent) {
   m_ignoreSslErrors = false;
@@ -10,7 +15,19 @@ WebPageManager::WebPageManager(QObject *parent) : QObject(parent) {
   m_loggingEnabled = false;
   m_ignoredOutput = new QFile(this);
   m_timeout = -1;
-  m_networkAccessManager = new NetworkAccessManager(this);
+  m_customHeadersRequestHandler = new CustomHeadersRequestHandler(
+    new MissingContentHeaderRequestHandler(
+      new NetworkRequestFactory(this),
+      this
+    ),
+    this
+  );
+  m_unknownUrlHandler =
+    new UnknownUrlHandler(m_customHeadersRequestHandler, this);
+  m_blacklistedRequestHandler =
+    new BlacklistedRequestHandler(m_unknownUrlHandler, this);
+  m_networkAccessManager =
+    new NetworkAccessManager(m_blacklistedRequestHandler, this);
   m_networkAccessManager->setCookieJar(m_cookieJar);
   createPage()->setFocus();
 }
@@ -119,7 +136,10 @@ void WebPageManager::reset() {
   m_timeout = -1;
   m_cookieJar->clearCookies();
   m_networkAccessManager->reset();
+  m_customHeadersRequestHandler->reset();
   m_currentPage->resetLocalStorage();
+  m_blacklistedRequestHandler->reset();
+  m_unknownUrlHandler->reset();
   while (!m_pages.isEmpty()) {
     WebPage *page = m_pages.takeFirst();
     page->deleteLater();
@@ -157,3 +177,23 @@ QDebug WebPageManager::logger() const {
 void WebPageManager::enableLogging() {
   m_loggingEnabled = true;
 }
+
+void WebPageManager::setUrlBlacklist(const QStringList &urls) {
+  m_blacklistedRequestHandler->setUrlBlacklist(urls);
+}
+
+void WebPageManager::addHeader(QString key, QString value) {
+  m_customHeadersRequestHandler->addHeader(key, value);
+}
+
+void WebPageManager::setUnknownUrlMode(UnknownUrlHandler::Mode mode) {
+  m_unknownUrlHandler->setMode(mode);
+}
+
+void WebPageManager::allowUrl(const QString &url) {
+  m_unknownUrlHandler->allowUrl(url);
+}
+
+void WebPageManager::blockUrl(const QString &url) {
+  m_blacklistedRequestHandler->blockUrl(url);
+}

data/src/WebPageManager.h

@@ -7,9 +7,13 @@
 #include <QDebug>
 #include <QFile>
 
+#include "UnknownUrlHandler.h"
+
 class WebPage;
 class NetworkCookieJar;
 class NetworkAccessManager;
+class BlacklistedRequestHandler;
+class CustomHeadersRequestHandler;
 
 class WebPageManager : public QObject {
   Q_OBJECT
@@ -33,6 +37,11 @@ class WebPageManager : public QObject {
     void enableLogging();
     void replyFinished(QNetworkReply *reply);
     NetworkAccessManager *networkAccessManager();
+    void setUrlBlacklist(const QStringList &);
+    void addHeader(QString, QString);
+    void setUnknownUrlMode(UnknownUrlHandler::Mode);
+    void allowUrl(const QString &);
+    void blockUrl(const QString &);
 
   public slots:
     void emitLoadStarted();
@@ -58,7 +67,9 @@ class WebPageManager : public QObject {
     QFile *m_ignoredOutput;
     int m_timeout;
     NetworkAccessManager *m_networkAccessManager;
+    BlacklistedRequestHandler *m_blacklistedRequestHandler;
+    CustomHeadersRequestHandler *m_customHeadersRequestHandler;
+    UnknownUrlHandler *m_unknownUrlHandler;
 };
 
 #endif // _WEBPAGEMANAGER_H
-

data/src/capybara.js

@@ -71,7 +71,8 @@ Capybara = {
     } else if (type == "textarea") {
       return node.innerHTML;
     } else {
-      return node.innerText || node.textContent;
+      visible_text = node.innerText;
+      return typeof visible_text === "string" ? visible_text : node.textContent;
     }
   },
 

data/src/find_command.h

@@ -50,3 +50,6 @@ CHECK_COMMAND(GoBack)
 CHECK_COMMAND(GoForward)
 CHECK_COMMAND(AcceptAlert)
 CHECK_COMMAND(FindModal)
+CHECK_COMMAND(SetUnknownUrlMode)
+CHECK_COMMAND(AllowUrl)
+CHECK_COMMAND(BlockUrl)

data/src/webkit_server.pro

@@ -7,6 +7,9 @@ PRECOMPILED_DIR = $${BUILD_DIR}
 OBJECTS_DIR = $${BUILD_DIR}
 MOC_DIR = $${BUILD_DIR}
 HEADERS = \
+  BlockUrl.h \
+  AllowUrl.h \
+  SetUnknownUrlMode.h \
   FindModal.h \
   AcceptAlert.h \
   GoForward.h \
@@ -78,9 +81,18 @@ HEADERS = \
   FindXpath.h \
   NetworkReplyProxy.h \
   IgnoreDebugOutput.h \
-  StdinNotifier.h
+  StdinNotifier.h \
+  RequestHandler.h \
+  BlacklistedRequestHandler.h \
+  MissingContentHeaderRequestHandler.h \
+  CustomHeadersRequestHandler.h \
+  NetworkRequestFactory.h \
+  UnknownUrlHandler.h
 
 SOURCES = \
+  BlockUrl.cpp \
+  AllowUrl.cpp \
+  SetUnknownUrlMode.cpp \
   FindModal.cpp \
   AcceptAlert.cpp \
   GoForward.cpp \
@@ -153,7 +165,13 @@ SOURCES = \
   FindXpath.cpp \
   NetworkReplyProxy.cpp \
   IgnoreDebugOutput.cpp \
-  StdinNotifier.cpp
+  StdinNotifier.cpp \
+  RequestHandler.cpp \
+  BlacklistedRequestHandler.cpp \
+  MissingContentHeaderRequestHandler.cpp \
+  CustomHeadersRequestHandler.cpp \
+  NetworkRequestFactory.cpp \
+  UnknownUrlHandler.cpp
 
 RESOURCES = webkit_server.qrc
 QT += network

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capybara-webkit
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.4.0
 platform: ruby
 authors:
 - thoughtbot
@@ -13,7 +13,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-22 00:00:00.000000000 Z
+date: 2015-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
@@ -21,7 +21,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.2
+        version: 2.3.0
     - - "<"
       - !ruby/object:Gem::Version
         version: 2.5.0
@@ -31,7 +31,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.2
+        version: 2.3.0
     - - "<"
       - !ruby/object:Gem::Version
         version: 2.5.0
@@ -170,12 +170,6 @@ files:
 - bin/Info.plist
 - capybara-webkit.gemspec
 - extconf.rb
-- gemfiles/2.0.gemfile
-- gemfiles/2.0.gemfile.lock
-- gemfiles/2.1.gemfile
-- gemfiles/2.1.gemfile.lock
-- gemfiles/2.2.gemfile
-- gemfiles/2.2.gemfile.lock
 - gemfiles/2.3.gemfile
 - gemfiles/2.3.gemfile.lock
 - gemfiles/2.4.gemfile
@@ -206,10 +200,17 @@ files:
 - spec/spec_helper.rb
 - spec/support/app_runner.rb
 - spec/support/matchers/include_response.rb
+- spec/support/output_writer.rb
 - src/AcceptAlert.cpp
 - src/AcceptAlert.h
+- src/AllowUrl.cpp
+- src/AllowUrl.h
 - src/Authenticate.cpp
 - src/Authenticate.h
+- src/BlacklistedRequestHandler.cpp
+- src/BlacklistedRequestHandler.h
+- src/BlockUrl.cpp
+- src/BlockUrl.h
 - src/Body.h
 - src/ClearCookies.cpp
 - src/ClearCookies.h
@@ -227,6 +228,8 @@ files:
 - src/ConsoleMessages.h
 - src/CurrentUrl.cpp
 - src/CurrentUrl.h
+- src/CustomHeadersRequestHandler.cpp
+- src/CustomHeadersRequestHandler.h
 - src/EnableLogging.cpp
 - src/EnableLogging.h
 - src/ErrorMessage.cpp
@@ -277,12 +280,16 @@ files:
 - src/JavascriptPromptMessages.h
 - src/JsonSerializer.cpp
 - src/JsonSerializer.h
+- src/MissingContentHeaderRequestHandler.cpp
+- src/MissingContentHeaderRequestHandler.h
 - src/NetworkAccessManager.cpp
 - src/NetworkAccessManager.h
 - src/NetworkCookieJar.cpp
 - src/NetworkCookieJar.h
 - src/NetworkReplyProxy.cpp
 - src/NetworkReplyProxy.h
+- src/NetworkRequestFactory.cpp
+- src/NetworkRequestFactory.h
 - src/NoOpReply.cpp
 - src/NoOpReply.h
 - src/Node.cpp
@@ -293,6 +300,8 @@ files:
 - src/PageLoadingCommand.h
 - src/Render.cpp
 - src/Render.h
+- src/RequestHandler.cpp
+- src/RequestHandler.h
 - src/Reset.cpp
 - src/Reset.h
 - src/Response.cpp
@@ -313,6 +322,8 @@ files:
 - src/SetSkipImageLoading.h
 - src/SetTimeout.cpp
 - src/SetTimeout.h
+- src/SetUnknownUrlMode.cpp
+- src/SetUnknownUrlMode.h
 - src/SetUrlBlacklist.cpp
 - src/SetUrlBlacklist.h
 - src/SocketCommand.cpp
@@ -325,6 +336,8 @@ files:
 - src/TimeoutCommand.h
 - src/Title.cpp
 - src/Title.h
+- src/UnknownUrlHandler.cpp
+- src/UnknownUrlHandler.h
 - src/UnsupportedContentHandler.cpp
 - src/UnsupportedContentHandler.h
 - src/Version.cpp