RubyGems - capybara-webkit - Versions diffs - 0.6.1 → 0.7.0 - Mend

capybara-webkit 0.6.1 → 0.7.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (37) hide show

data/Appraisals +7 -0
data/Gemfile +7 -5
data/Gemfile.lock +19 -9
data/README.md +8 -33
data/Rakefile +1 -0
data/capybara-webkit.gemspec +7 -2
data/gemfiles/1.0.gemfile +7 -0
data/gemfiles/1.0.gemfile.lock +65 -0
data/gemfiles/1.1.gemfile +7 -0
data/gemfiles/1.1.gemfile.lock +65 -0
data/lib/capybara-webkit.rb +1 -11
data/lib/capybara/driver/webkit.rb +3 -0
data/lib/capybara/driver/webkit/browser.rb +12 -0
data/lib/capybara/driver/webkit/node.rb +21 -2
data/lib/capybara/webkit.rb +11 -0
data/spec/driver_spec.rb +142 -0
data/spec/integration/session_spec.rb +47 -1
data/src/ClearCookies.cpp +18 -0
data/src/ClearCookies.h +11 -0
data/src/Connection.cpp +5 -1
data/src/GetCookies.cpp +22 -0
data/src/GetCookies.h +14 -0
data/src/NetworkAccessManager.cpp +5 -2
data/src/NetworkCookieJar.cpp +101 -0
data/src/NetworkCookieJar.h +15 -0
data/src/Reset.cpp +4 -2
data/src/SetCookie.cpp +18 -0
data/src/SetCookie.h +11 -0
data/src/UnsupportedContentHandler.cpp +31 -0
data/src/UnsupportedContentHandler.h +18 -0
data/src/Visit.cpp +2 -6
data/src/WebPage.cpp +36 -14
data/src/WebPage.h +7 -1
data/src/capybara.js +4 -0
data/src/find_command.h +4 -1
data/src/webkit_server.pro +57 -2
metadata +118 -7

data/spec/integration/session_spec.rb CHANGED

@@ -1,7 +1,7 @@
 # -*- encoding: UTF-8 -*-
 require 'spec_helper'
-require 'capybara-webkit'
+require 'capybara/webkit'
 describe Capybara::Session do
   subject { Capybara::Session.new(:reusable_webkit, @app) }
@@ -79,6 +79,52 @@ describe Capybara::Session do
       subject.click_button('ボタン')
     end
   end
+  context "response headers with status code" do
+    before(:all) do
+      @app = lambda do |env|
+        params = ::Rack::Utils.parse_query(env['QUERY_STRING'])
+        if params["img"] == "true"
+          body = 'not found'
+          return [404, { 'Content-Type' => 'image/gif', 'Content-Length' => body.length.to_s }, [body]]
+        end
+        body = <<-HTML
+          <html>
+            <body>
+              <img src="?img=true">
+            </body>
+          </html>
+        HTML
+        [200,
+          { 'Content-Type' => 'text/html', 'Content-Length' => body.length.to_s, 'X-Capybara' => 'WebKit'},
+          [body]]
+      end
+    end
+    it "should get status code" do
+      subject.visit '/'
+      subject.status_code.should == 200
+    end
+    it "should reset status code" do
+      subject.visit '/'
+      subject.status_code.should == 200
+      subject.reset!
+      subject.status_code.should == 0
+    end
+    it "should get response headers" do
+      subject.visit '/'
+      subject.response_headers['X-Capybara'].should == 'WebKit'
+    end
+    it "should reset response headers" do
+      subject.visit '/'
+      subject.response_headers['X-Capybara'].should == 'WebKit'
+      subject.reset!
+      subject.response_headers['X-Capybara'].should == nil
+    end
+  end
 end
 describe Capybara::Session, "with TestApp" do

data/src/ClearCookies.cpp ADDED

@@ -0,0 +1,18 @@
+#include "ClearCookies.h"
+#include "WebPage.h"
+#include "NetworkCookieJar.h"
+#include <QNetworkCookie>
+ClearCookies::ClearCookies(WebPage *page, QObject *parent)
+  : Command(page, parent)
+{ }
+void ClearCookies::start(QStringList &arguments)
+{
+  Q_UNUSED(arguments);
+  NetworkCookieJar *jar = qobject_cast<NetworkCookieJar*>(page()
+                                                          ->networkAccessManager()
+                                                          ->cookieJar());
+  jar->clearCookies();
+  emit finished(new Response(true));
+}

data/src/ClearCookies.h ADDED

@@ -0,0 +1,11 @@
+#include "Command.h"
+class WebPage;
+class ClearCookies : public Command {
+  Q_OBJECT;
+ public:
+  ClearCookies(WebPage *page, QObject *parent = 0);
+  virtual void start(QStringList &arguments);
+};

data/src/Connection.cpp CHANGED

@@ -1,5 +1,6 @@
 #include "Connection.h"
 #include "WebPage.h"
+#include "UnsupportedContentHandler.h"
 #include "Visit.h"
 #include "Find.h"
 #include "Command.h"
@@ -15,6 +16,9 @@
 #include "Body.h"
 #include "Status.h"
 #include "Headers.h"
+#include "SetCookie.h"
+#include "ClearCookies.h"
+#include "GetCookies.h"
 #include <QTcpSocket>
 #include <iostream>
@@ -28,7 +32,7 @@ Connection::Connection(QTcpSocket *socket, WebPage *page, QObject *parent) :
   m_pageSuccess = true;
   m_commandWaiting = false;
   connect(m_socket, SIGNAL(readyRead()), this, SLOT(checkNext()));
-  connect(m_page, SIGNAL(loadFinished(bool)), this, SLOT(pendingLoadFinished(bool)));
+  connect(m_page, SIGNAL(pageFinished(bool)), this, SLOT(pendingLoadFinished(bool)));
 }
 void Connection::checkNext() {

data/src/GetCookies.cpp ADDED

@@ -0,0 +1,22 @@
+#include "GetCookies.h"
+#include "WebPage.h"
+#include "NetworkCookieJar.h"
+GetCookies::GetCookies(WebPage *page, QObject *parent)
+  : Command(page, parent)
+{
+  m_buffer = "";
+}
+void GetCookies::start(QStringList &arguments)
+{
+  Q_UNUSED(arguments);
+  NetworkCookieJar *jar = qobject_cast<NetworkCookieJar*>(page()
+                                                          ->networkAccessManager()
+                                                          ->cookieJar());
+  foreach (QNetworkCookie cookie, jar->getAllCookies()) {
+    m_buffer.append(cookie.toRawForm());
+    m_buffer.append("\n");
+  }
+  emit finished(new Response(true, m_buffer));
+}

data/src/GetCookies.h ADDED

@@ -0,0 +1,14 @@
+#include "Command.h"
+class WebPage;
+class GetCookies : public Command {
+  Q_OBJECT;
+ public:
+  GetCookies(WebPage *page, QObject *parent = 0);
+  virtual void start(QStringList &arguments);
+ private:
+  QString m_buffer;
+};

data/src/NetworkAccessManager.cpp CHANGED

@@ -6,14 +6,17 @@
 NetworkAccessManager::NetworkAccessManager(QObject *parent):QNetworkAccessManager(parent) {
 }
-QNetworkReply* NetworkAccessManager::createRequest(QNetworkAccessManager::Operation oparation, const QNetworkRequest &request, QIODevice * outgoingData = 0) {
+QNetworkReply* NetworkAccessManager::createRequest(QNetworkAccessManager::Operation operation, const QNetworkRequest &request, QIODevice * outgoingData = 0) {
   QNetworkRequest new_request(request);
+  if (operation != QNetworkAccessManager::PostOperation && operation != QNetworkAccessManager::PutOperation) {
+    new_request.setHeader(QNetworkRequest::ContentTypeHeader, QVariant());
+  }
   QHashIterator<QString, QString> item(m_headers);
   while (item.hasNext()) {
       item.next();
       new_request.setRawHeader(item.key().toAscii(), item.value().toAscii());
   }
-  return QNetworkAccessManager::createRequest(oparation, new_request, outgoingData);
+  return QNetworkAccessManager::createRequest(operation, new_request, outgoingData);
 };
 void NetworkAccessManager::addHeader(QString key, QString value) {

data/src/NetworkCookieJar.cpp ADDED

@@ -0,0 +1,101 @@
+#include "NetworkCookieJar.h"
+#include "QtCore/qdatetime.h"
+NetworkCookieJar::NetworkCookieJar(QObject *parent)
+  : QNetworkCookieJar(parent)
+{ }
+QList<QNetworkCookie> NetworkCookieJar::getAllCookies() const
+{
+  return allCookies();
+}
+void NetworkCookieJar::clearCookies()
+{
+  setAllCookies(QList<QNetworkCookie>());
+}
+static inline bool isParentDomain(QString domain, QString reference)
+{
+  if (!reference.startsWith(QLatin1Char('.')))
+    return domain == reference;
+  return domain.endsWith(reference) || domain == reference.mid(1);
+}
+void NetworkCookieJar::overwriteCookies(const QList<QNetworkCookie>& cookieList)
+{
+  /* this function is basically a copy-and-paste of the original
+     QNetworkCookieJar::setCookiesFromUrl with the domain and
+     path validations removed */
+  QString defaultPath(QLatin1Char('/'));
+  QDateTime now = QDateTime::currentDateTime();
+  QList<QNetworkCookie> newCookies = allCookies();
+  foreach (QNetworkCookie cookie, cookieList) {
+    bool isDeletion = (!cookie.isSessionCookie() &&
+                       cookie.expirationDate() < now);
+    // validate the cookie & set the defaults if unset
+    if (cookie.path().isEmpty())
+      cookie.setPath(defaultPath);
+    // don't do path checking. See http://bugreports.qt.nokia.com/browse/QTBUG-5815
+    //        else if (!isParentPath(pathAndFileName, cookie.path())) {
+    //            continue;           // not accepted
+    //        }
+    if (cookie.domain().isEmpty()) {
+      continue;
+    } else {
+      // Ensure the domain starts with a dot if its field was not empty
+      // in the HTTP header. There are some servers that forget the
+      // leading dot and this is actually forbidden according to RFC 2109,
+      // but all browsers accept it anyway so we do that as well.
+      if (!cookie.domain().startsWith(QLatin1Char('.')))
+        cookie.setDomain(QLatin1Char('.') + cookie.domain());
+      QString domain = cookie.domain();
+      // the check for effective TLDs makes the "embedded dot" rule from RFC 2109 section 4.3.2
+      // redundant; the "leading dot" rule has been relaxed anyway, see above
+      // we remove the leading dot for this check
+      /*
+      if (QNetworkCookieJarPrivate::isEffectiveTLD(domain.remove(0, 1)))
+        continue; // not accepted
+      */
+    }
+    for (int i = 0; i < newCookies.size(); ++i) {
+      // does this cookie already exist?
+      const QNetworkCookie &current = newCookies.at(i);
+      if (cookie.name() == current.name() &&
+          cookie.domain() == current.domain() &&
+          cookie.path() == current.path()) {
+        // found a match
+        newCookies.removeAt(i);
+        break;
+      }
+    }
+    // did not find a match
+    if (!isDeletion) {
+      int countForDomain = 0;
+      for (int i = newCookies.size() - 1; i >= 0; --i) {
+        // Start from the end and delete the oldest cookies to keep a maximum count of 50.
+        const QNetworkCookie &current = newCookies.at(i);
+        if (isParentDomain(cookie.domain(), current.domain())
+            || isParentDomain(current.domain(), cookie.domain())) {
+          if (countForDomain >= 49)
+            newCookies.removeAt(i);
+          else
+            ++countForDomain;
+        }
+      }
+      newCookies += cookie;
+    }
+  }
+  setAllCookies(newCookies);
+}

data/src/NetworkCookieJar.h ADDED

@@ -0,0 +1,15 @@
+#include <QtNetwork/QNetworkCookieJar>
+#include <QtNetwork/QNetworkCookie>
+class NetworkCookieJar : public QNetworkCookieJar {
+  Q_OBJECT;
+ public:
+  NetworkCookieJar(QObject *parent = 0);
+  QList<QNetworkCookie> getAllCookies() const;
+  void clearCookies();
+  void overwriteCookies(const QList<QNetworkCookie>& cookieList);
+};

data/src/Reset.cpp CHANGED

@@ -1,6 +1,7 @@
 #include "Reset.h"
 #include "WebPage.h"
 #include "NetworkAccessManager.h"
+#include "NetworkCookieJar.h"
 Reset::Reset(WebPage *page, QObject *parent) : Command(page, parent) {
 }
@@ -10,9 +11,10 @@ void Reset::start(QStringList &arguments) {
   page()->triggerAction(QWebPage::Stop);
   page()->currentFrame()->setHtml("<html><body></body></html>");
-  page()->networkAccessManager()->setCookieJar(new QNetworkCookieJar());
-  page()->setNetworkAccessManager(new NetworkAccessManager());
+  page()->networkAccessManager()->setCookieJar(new NetworkCookieJar());
+  page()->setCustomNetworkAccessManager();
   page()->setUserAgent(NULL);
+  page()->resetResponseHeaders();
   emit finished(new Response(true));
 }

data/src/SetCookie.cpp ADDED

@@ -0,0 +1,18 @@
+#include "SetCookie.h"
+#include "WebPage.h"
+#include "NetworkCookieJar.h"
+#include <QNetworkCookie>
+SetCookie::SetCookie(WebPage *page, QObject *parent)
+  : Command(page, parent)
+{ }
+void SetCookie::start(QStringList &arguments)
+{
+  QList<QNetworkCookie> cookies = QNetworkCookie::parseCookies(arguments[0].toAscii());
+  NetworkCookieJar *jar = qobject_cast<NetworkCookieJar*>(page()
+                                                          ->networkAccessManager()
+                                                          ->cookieJar());
+  jar->overwriteCookies(cookies);
+  emit finished(new Response(true));
+}

data/src/SetCookie.h ADDED

@@ -0,0 +1,11 @@
+#include "Command.h"
+class WebPage;
+class SetCookie : public Command {
+  Q_OBJECT;
+ public:
+  SetCookie(WebPage *page, QObject *parent = 0);
+  virtual void start(QStringList &arguments);
+};

data/src/UnsupportedContentHandler.cpp ADDED

@@ -0,0 +1,31 @@
+#include "UnsupportedContentHandler.h"
+#include "WebPage.h"
+#include <QNetworkReply>
+UnsupportedContentHandler::UnsupportedContentHandler(WebPage *page, QNetworkReply *reply, QObject *parent) : QObject(parent) {
+  m_page = page;
+  m_reply = reply;
+  connect(m_reply, SIGNAL(finished()), this, SLOT(handleUnsupportedContent()));
+  disconnect(m_page, SIGNAL(loadFinished(bool)), m_page, SLOT(loadFinished(bool)));
+}
+void UnsupportedContentHandler::handleUnsupportedContent() {
+  QVariant contentMimeType = m_reply->header(QNetworkRequest::ContentTypeHeader);
+  if(contentMimeType.isNull()) {
+    this->finish(false);
+  } else {
+    this->loadUnsupportedContent();
+    this->finish(true);
+  }
+  this->deleteLater();
+}
+void UnsupportedContentHandler::loadUnsupportedContent() {
+    QByteArray text = m_reply->readAll();
+    m_page->mainFrame()->setContent(text, QString("text/plain"), m_reply->url());
+}
+void UnsupportedContentHandler::finish(bool success) {
+    connect(m_page, SIGNAL(loadFinished(bool)), m_page, SLOT(loadFinished(bool)));
+    m_page->loadFinished(success);
+}

data/src/UnsupportedContentHandler.h ADDED

@@ -0,0 +1,18 @@
+#include <QObject>
+class WebPage;
+class QNetworkReply;
+class UnsupportedContentHandler : public QObject {
+  Q_OBJECT
+  public:
+    UnsupportedContentHandler(WebPage *page, QNetworkReply *reply, QObject *parent = 0);
+  public slots:
+    void handleUnsupportedContent();
+  private:
+    WebPage *m_page;
+    QNetworkReply *m_reply;
+    void loadUnsupportedContent();
+    void finish(bool success);
+};

data/src/Visit.cpp CHANGED

@@ -3,16 +3,12 @@
 #include "WebPage.h"
 Visit::Visit(WebPage *page, QObject *parent) : Command(page, parent) {
-  connect(page, SIGNAL(loadFinished(bool)), this, SLOT(loadFinished(bool)));
+  connect(page, SIGNAL(pageFinished(bool)), this, SLOT(loadFinished(bool)));
 }
 void Visit::start(QStringList &arguments) {
   QUrl requestedUrl = QUrl(arguments[0]);
-  page()->currentFrame()->setUrl(QUrl(requestedUrl));
-  if(requestedUrl.hasFragment()) {
-    // workaround for https://bugs.webkit.org/show_bug.cgi?id=32723
-    page()->currentFrame()->setUrl(QUrl(requestedUrl));
-  }
+  page()->currentFrame()->load(QUrl(requestedUrl));
 }
 void Visit::loadFinished(bool success) {

data/src/WebPage.cpp CHANGED

@@ -1,23 +1,32 @@
 #include "WebPage.h"
 #include "JavascriptInvocation.h"
 #include "NetworkAccessManager.h"
+#include "NetworkCookieJar.h"
+#include "UnsupportedContentHandler.h"
 #include <QResource>
 #include <iostream>
 WebPage::WebPage(QObject *parent) : QWebPage(parent) {
+  setForwardUnsupportedContent(true);
   loadJavascript();
   setUserStylesheet();
   m_loading = false;
-  NetworkAccessManager *manager = new NetworkAccessManager();
-  this->setNetworkAccessManager(manager);
-  connect(manager, SIGNAL(finished(QNetworkReply *)), this, SLOT(replyFinished(QNetworkReply *)));
+  this->setCustomNetworkAccessManager();
   connect(this, SIGNAL(loadStarted()), this, SLOT(loadStarted()));
   connect(this, SIGNAL(loadFinished(bool)), this, SLOT(loadFinished(bool)));
   connect(this, SIGNAL(frameCreated(QWebFrame *)),
           this, SLOT(frameCreated(QWebFrame *)));
+  connect(this, SIGNAL(unsupportedContent(QNetworkReply*)),
+      this, SLOT(handleUnsupportedContent(QNetworkReply*)));
+}
+void WebPage::setCustomNetworkAccessManager() {
+  NetworkAccessManager *manager = new NetworkAccessManager();
+  manager->setCookieJar(new NetworkCookieJar());
+  this->setNetworkAccessManager(manager);
+  connect(manager, SIGNAL(finished(QNetworkReply *)), this, SLOT(replyFinished(QNetworkReply *)));
 }
 void WebPage::loadJavascript() {
@@ -108,8 +117,8 @@ void WebPage::loadStarted() {
 }
 void WebPage::loadFinished(bool success) {
-  Q_UNUSED(success);
   m_loading = false;
+  emit pageFinished(success);
 }
 bool WebPage::isLoading() const {
@@ -155,6 +164,7 @@ QString WebPage::chooseFile(QWebFrame *parentFrame, const QString &suggestedFile
 }
 bool WebPage::extension(Extension extension, const ExtensionOption *option, ExtensionReturn *output) {
+  Q_UNUSED(option);
   if (extension == ChooseMultipleFilesExtension) {
     QStringList names = QStringList() << getLastAttachedFileName();
     static_cast<ChooseMultipleFilesExtensionReturn*>(output)->fileNames = names;
@@ -168,22 +178,34 @@ QString WebPage::getLastAttachedFileName() {
 }
 void WebPage::replyFinished(QNetworkReply *reply) {
-  QStringList headers;
-  lastStatus = reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt();
-  QList<QByteArray> list = reply->rawHeaderList();
+  if (reply->url() == this->currentFrame()->url()) {
+    QStringList headers;
+    m_lastStatus = reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt();
+    QList<QByteArray> list = reply->rawHeaderList();
-  int length = list.size();
-  for(int i = 0; i < length; i++) {
-    headers << list.at(i)+": "+reply->rawHeader(list.at(i));
-  }
+    int length = list.size();
+    for(int i = 0; i < length; i++) {
+      headers << list.at(i)+": "+reply->rawHeader(list.at(i));
+    }
-  m_pageHeaders = headers.join("\n");
+    m_pageHeaders = headers.join("\n");
+  }
 }
 int WebPage::getLastStatus() {
-  return lastStatus;
+  return m_lastStatus;
+}
+void WebPage::resetResponseHeaders() {
+  m_lastStatus = 0;
+  m_pageHeaders = QString();
 }
 QString WebPage::pageHeaders() {
   return m_pageHeaders;
 }
+void WebPage::handleUnsupportedContent(QNetworkReply *reply) {
+  UnsupportedContentHandler *handler = new UnsupportedContentHandler(this, reply);
+  Q_UNUSED(handler);
+}