capybara-webkit 0.13.2 → 0.14.0

data/src/WebPage.h

@@ -1,9 +1,9 @@
 #ifndef _WEBPAGE_H
 #define _WEBPAGE_H
 #include <QtWebKit>
-#include <QtNetwork>
 
 class WebPageManager;
+class NetworkAccessManager;
 
 class WebPage : public QWebPage {
   Q_OBJECT
@@ -23,16 +23,19 @@ class WebPage : public QWebPage {
     bool render(const QString &fileName);
     virtual bool extension (Extension extension, const ExtensionOption *option=0, ExtensionReturn *output=0);
     void setSkipImageLoading(bool skip);
-    QString consoleMessages();
-    QString alertMessages();
-    QString confirmMessages();
-    QString promptMessages();
+    QVariantList consoleMessages();
+    QVariantList alertMessages();
+    QVariantList confirmMessages();
+    QVariantList promptMessages();
     void resetWindowSize();
     QWebPage *createWindow(WebWindowType type);
     QString uuid();
     QString getWindowName();
     bool matchesWindowSelector(QString);
     void setFocus();
+    NetworkAccessManager *networkAccessManager();
+    bool unsupportedContentLoaded();
+    void unsupportedContentFinishedReply(QNetworkReply *reply);
 
   public slots:
     bool shouldInterruptJavaScript();
@@ -44,8 +47,6 @@ class WebPage : public QWebPage {
     void frameCreated(QWebFrame *);
     void handleSslErrorsForReply(QNetworkReply *reply, const QList<QSslError> &);
     void handleUnsupportedContent(QNetworkReply *reply);
-    void networkAccessManagerCreatedRequest(QByteArray &url, QNetworkReply *reply);
-    void networkAccessManagerFinishedReply(QNetworkReply *reply);
 
   signals:
     void pageFinished(bool);
@@ -65,19 +66,20 @@ class WebPage : public QWebPage {
     QString m_userAgent;
     bool m_loading;
     bool m_failed;
-    QString getLastAttachedFileName();
+    QStringList getAttachedFileNames();
     void loadJavascript();
     void setUserStylesheet();
     bool m_confirm;
     bool m_prompt;
-    QStringList m_consoleMessages;
-    QStringList m_alertMessages;
-    QStringList m_confirmMessages;
+    QVariantList m_consoleMessages;
+    QVariantList m_alertMessages;
+    QVariantList m_confirmMessages;
     QString m_prompt_text;
-    QStringList m_promptMessages;
+    QVariantList m_promptMessages;
     QString m_uuid;
     WebPageManager *m_manager;
     QString m_errorPageMessage;
+    bool m_unsupportedContentLoaded;
 };
 
 #endif //_WEBPAGE_H

data/src/WebPageManager.cpp

@@ -36,8 +36,6 @@ WebPage *WebPageManager::createPage(QObject *parent) {
           this, SLOT(setPageStatus(bool)));
   connect(page, SIGNAL(requestCreated(QByteArray &, QNetworkReply *)),
           this, SLOT(requestCreated(QByteArray &, QNetworkReply *)));
-  connect(page, SIGNAL(replyFinished(QNetworkReply *)),
-          this, SLOT(replyFinished(QNetworkReply *)));
   append(page);
   return page;
 }
@@ -47,25 +45,32 @@ void WebPageManager::emitLoadStarted() {
     logger() << "Load started";
     emit loadStarted();
   }
+  m_started += qobject_cast<WebPage *>(sender());
 }
 
 void WebPageManager::requestCreated(QByteArray &url, QNetworkReply *reply) {
   logger() << "Started request to" << url;
-  m_started += reply;
+  if (reply->isFinished())
+    replyFinished(reply);
+  else {
+    connect(reply, SIGNAL(finished()), SLOT(handleReplyFinished()));
+  }
+}
+
+void WebPageManager::handleReplyFinished() {
+  QNetworkReply *reply = qobject_cast<QNetworkReply *>(sender());
+  disconnect(reply, SIGNAL(finished()), this, SLOT(handleReplyFinished()));
+  replyFinished(reply);
 }
 
 void WebPageManager::replyFinished(QNetworkReply *reply) {
   int status = reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt();
   logger() << "Received" << status << "from" << reply->url().toString();
-  m_started.remove(reply);
-  logger() << m_started.size() << "requests remaining";
-  if (m_started.empty() && !m_success) {
-    emitPageFinished();
-  }
 }
 
 void WebPageManager::setPageStatus(bool success) {
   logger() << "Page finished with" << success;
+  m_started.remove(qobject_cast<WebPage *>(sender()));
   m_success = success && m_success;
   if (m_started.empty()) {
     emitPageFinished();

data/src/WebPageManager.h

@@ -29,12 +29,13 @@ class WebPageManager : public QObject {
     bool isLoading() const;
     QDebug logger() const;
     void enableLogging();
+    void replyFinished(QNetworkReply *reply);
 
   public slots:
     void emitLoadStarted();
     void setPageStatus(bool);
     void requestCreated(QByteArray &url, QNetworkReply *reply);
-    void replyFinished(QNetworkReply *reply);
+    void handleReplyFinished();
 
   signals:
     void pageFinished(bool);
@@ -48,7 +49,7 @@ class WebPageManager : public QObject {
     WebPage *m_currentPage;
     bool m_ignoreSslErrors;
     NetworkCookieJar *m_cookieJar;
-    QSet<QNetworkReply*> m_started;
+    QSet<WebPage *> m_started;
     bool m_success;
     bool m_loggingEnabled;
     QString *m_ignoredOutput;

data/src/WindowFocus.cpp

@@ -12,12 +12,12 @@ void WindowFocus::start() {
 }
 
 void WindowFocus::windowNotFound() {
-  emit finished(new Response(false, QString("Unable to locate window. ")));
+  emitFinished(false, QString("Unable to locate window. "));
 }
 
 void WindowFocus::success(WebPage *page) {
   page->setFocus();
-  emit finished(new Response(true));
+  emitFinished(true);
 }
 
 void WindowFocus::focusWindow(QString selector) {

data/src/body.cpp

@@ -6,6 +6,11 @@ Body::Body(WebPageManager *manager, QStringList &arguments, QObject *parent) : S
 }
 
 void Body::start() {
-  QString result = page()->currentFrame()->toHtml();
-  emit finished(new Response(true, result));
+  QString result;
+  if (page()->unsupportedContentLoaded())
+    result = page()->currentFrame()->toPlainText();
+  else
+    result = page()->currentFrame()->toHtml();
+
+  emitFinished(true, result);
 }

data/src/capybara.js

@@ -1,7 +1,7 @@
 Capybara = {
   nextIndex: 0,
   nodes: {},
-  lastAttachedFile: "",
+  attachedFiles: [],
 
   invoke: function () {
     return this[CapybaraInvocation.functionName].apply(this, CapybaraInvocation.arguments);
@@ -64,6 +64,10 @@ Capybara = {
     }
   },
 
+  hasAttribute: function(index, name) {
+    return this.nodes[index].hasAttribute(name);
+  },
+
   path: function(index) {
     return "/" + this.getXPathNode(this.nodes[index]).join("/");
   },
@@ -260,7 +264,7 @@ Capybara = {
       }
 
     } else if (type === "file") {
-      this.lastAttachedFile = value;
+      this.attachedFiles = Array.prototype.slice.call(arguments, 1);
       this.click(index);
 
     } else {
@@ -338,6 +342,10 @@ Capybara = {
     };
     mouseTrigger('mousemove', options);
     mouseTrigger('mouseup', options);
+  },
+
+  equals: function(index, targetIndex) {
+    return this.nodes[index] === this.nodes[targetIndex];
   }
 };
 

data/src/find_command.h

@@ -7,8 +7,6 @@ CHECK_COMMAND(Visit)
 CHECK_COMMAND(Find)
 CHECK_COMMAND(Reset)
 CHECK_COMMAND(Node)
-CHECK_COMMAND(Url)
-CHECK_COMMAND(Source)
 CHECK_COMMAND(Evaluate)
 CHECK_COMMAND(Execute)
 CHECK_COMMAND(FrameFocus)
@@ -22,7 +20,6 @@ CHECK_COMMAND(ClearCookies)
 CHECK_COMMAND(GetCookies)
 CHECK_COMMAND(SetProxy)
 CHECK_COMMAND(ConsoleMessages)
-CHECK_COMMAND(RequestedUrl)
 CHECK_COMMAND(CurrentUrl)
 CHECK_COMMAND(ResizeWindow)
 CHECK_COMMAND(IgnoreSslErrors)
@@ -41,4 +38,5 @@ CHECK_COMMAND(JavascriptConfirmMessages)
 CHECK_COMMAND(JavascriptPromptMessages)
 CHECK_COMMAND(GetTimeout)
 CHECK_COMMAND(SetTimeout)
+CHECK_COMMAND(SetUrlBlacklist)
 

data/src/webkit_server.pro

@@ -14,7 +14,6 @@ HEADERS = \
   IgnoreSslErrors.h \
   ResizeWindow.h \
   CurrentUrl.h \
-  RequestedUrl.h \
   ConsoleMessages.h \
   WebPage.h \
   Server.h \
@@ -26,8 +25,6 @@ HEADERS = \
   Reset.h \
   Node.h \
   JavascriptInvocation.h \
-  Url.h \
-  Source.h \
   Evaluate.h \
   Execute.h \
   FrameFocus.h \
@@ -36,7 +33,7 @@ HEADERS = \
   NetworkCookieJar.h \
   Header.h \
   Render.h \
-  body.h \
+  Body.h \
   Status.h \
   Headers.h \
   UnsupportedContentHandler.h \
@@ -56,6 +53,9 @@ HEADERS = \
   GetTimeout.h \
   SetTimeout.h \
   TimeoutCommand.h \
+  SetUrlBlacklist.h \
+  NoOpReply.h \
+  JsonSerializer.h
 
 SOURCES = \
   EnableLogging.cpp \
@@ -70,7 +70,6 @@ SOURCES = \
   IgnoreSslErrors.cpp \
   ResizeWindow.cpp \
   CurrentUrl.cpp \
-  RequestedUrl.cpp \
   ConsoleMessages.cpp \
   main.cpp \
   WebPage.cpp \
@@ -83,8 +82,6 @@ SOURCES = \
   Reset.cpp \
   Node.cpp \
   JavascriptInvocation.cpp \
-  Url.cpp \
-  Source.cpp \
   Evaluate.cpp \
   Execute.cpp \
   FrameFocus.cpp \
@@ -113,6 +110,9 @@ SOURCES = \
   GetWindowHandles.cpp \
   GetWindowHandle.cpp \
   TimeoutCommand.cpp \
+  SetUrlBlacklist.cpp \
+  NoOpReply.cpp \
+  JsonSerializer.cpp
 
 RESOURCES = webkit_server.qrc
 QT += network webkit

metadata

@@ -1,123 +1,101 @@
 --- !ruby/object:Gem::Specification
 name: capybara-webkit
 version: !ruby/object:Gem::Version
-  version: 0.13.2
+  version: 0.14.0
+  prerelease: 
 platform: ruby
 authors:
 - thoughtbot
 - Joe Ferris
+- Matt Horan
 - Matt Mongeau
 - Mike Burns
 - Jason Morrison
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-03 00:00:00.000000000 Z
+date: 2013-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &15525620 !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.0
-    - - <
+        version: '2.0'
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: 2.0.2
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 1.0.0
-    - - <
-      - !ruby/object:Gem::Version
-        version: '1.2'
+  version_requirements: *15525620
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &15519880 !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *15519880
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &15509400 !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.6.0
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.6.0
+  version_requirements: *15509400
 - !ruby/object:Gem::Dependency
   name: sinatra
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &15507080 !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *15507080
 - !ruby/object:Gem::Dependency
   name: mini_magick
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &15493300 !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *15493300
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &15488580 !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *15488580
 - !ruby/object:Gem::Dependency
   name: appraisal
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &15475400 !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.4.0
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 0.4.0
+  version_requirements: *15475400
 description: 
 email: support@thoughtbot.com
 executables: []
@@ -127,6 +105,7 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .rspec
+- .travis.yml
 - Appraisals
 - CONTRIBUTING.md
 - GOALS
@@ -162,7 +141,6 @@ files:
 - spec/driver_rendering_spec.rb
 - spec/driver_resize_window_spec.rb
 - spec/driver_spec.rb
-- spec/integration/driver_spec.rb
 - spec/integration/session_spec.rb
 - spec/selenium_compatibility_spec.rb
 - spec/self_signed_ssl_cert.rb
@@ -219,10 +197,14 @@ files:
 - src/JavascriptInvocation.h
 - src/JavascriptPromptMessages.cpp
 - src/JavascriptPromptMessages.h
+- src/JsonSerializer.cpp
+- src/JsonSerializer.h
 - src/NetworkAccessManager.cpp
 - src/NetworkAccessManager.h
 - src/NetworkCookieJar.cpp
 - src/NetworkCookieJar.h
+- src/NoOpReply.cpp
+- src/NoOpReply.h
 - src/Node.cpp
 - src/Node.h
 - src/NullCommand.cpp
@@ -231,8 +213,6 @@ files:
 - src/PageLoadingCommand.h
 - src/Render.cpp
 - src/Render.h
-- src/RequestedUrl.cpp
-- src/RequestedUrl.h
 - src/Reset.cpp
 - src/Reset.h
 - src/ResizeWindow.cpp
@@ -255,18 +235,16 @@ files:
 - src/SetSkipImageLoading.h
 - src/SetTimeout.cpp
 - src/SetTimeout.h
+- src/SetUrlBlacklist.cpp
+- src/SetUrlBlacklist.h
 - src/SocketCommand.cpp
 - src/SocketCommand.h
-- src/Source.cpp
-- src/Source.h
 - src/Status.cpp
 - src/Status.h
 - src/TimeoutCommand.cpp
 - src/TimeoutCommand.h
 - src/UnsupportedContentHandler.cpp
 - src/UnsupportedContentHandler.h
-- src/Url.cpp
-- src/Url.h
 - src/Visit.cpp
 - src/Visit.h
 - src/WebPage.cpp
@@ -286,39 +264,26 @@ files:
 - webkit_server.pro
 homepage: http://github.com/thoughtbot/capybara-webkit
 licenses: []
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.10
+rubygems_version: 1.8.15
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Headless Webkit driver for Capybara
-test_files:
-- spec/browser_spec.rb
-- spec/capybara_webkit_builder_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/integration/driver_spec.rb
-- spec/integration/session_spec.rb
-- spec/selenium_compatibility_spec.rb
-- spec/self_signed_ssl_cert.rb
-- spec/spec_helper.rb
-- spec/support/app_runner.rb
-has_rdoc: 
+test_files: []