capybara-webkit 0.5.0 → 0.6.0

data/spec/integration/session_spec.rb

@@ -86,6 +86,6 @@ describe Capybara::Session, "with TestApp" do
     @session = Capybara::Session.new(:reusable_webkit, TestApp)
   end
 
-  # it_should_behave_like "session"
-  # it_should_behave_like "session with javascript support"
+  it_should_behave_like "session"
+  it_should_behave_like "session with javascript support"
 end

data/src/Body.h

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

data/src/Connection.cpp

@@ -10,6 +10,9 @@
 #include "Evaluate.h"
 #include "Execute.h"
 #include "FrameFocus.h"
+#include "Header.h"
+#include "Render.h"
+#include "Body.h"
 
 #include <QTcpSocket>
 #include <iostream>
@@ -55,7 +58,7 @@ void Connection::readDataBlock() {
   buffer[m_expectingDataSize] = 0;
   processNext(buffer);
   m_expectingDataSize = -1;
-  delete buffer;
+  delete[] buffer;
 }
 
 void Connection::processNext(const char *data) {
@@ -95,7 +98,7 @@ void Connection::startCommand() {
               SLOT(finishCommand(Response *)));
       m_command->start(m_arguments);
     } else {
-      QString failure = QString("Unknown command: ") +  m_commandName + "\n";
+      QString failure = QString("[Capybara WebKit] Unknown command: ") +  m_commandName + "\n";
       writeResponse(new Response(false, failure));
     }
     m_commandName = QString();

data/src/Header.cpp

@@ -0,0 +1,18 @@
+#include "Header.h"
+#include "WebPage.h"
+#include "NetworkAccessManager.h"
+
+Header::Header(WebPage *page, QObject *parent) : Command(page, parent) {
+}
+
+void Header::start(QStringList &arguments) {
+  QString key = arguments[0];
+  QString value = arguments[1];
+  NetworkAccessManager* networkAccessManager = qobject_cast<NetworkAccessManager*>(page()->networkAccessManager());
+  if (key.toLower().replace("-", "_") == "user_agent") {
+    page()->setUserAgent(value);
+  } else {
+    networkAccessManager->addHeader(key, value);
+  }
+  emit finished(new Response(true));
+}

data/src/Header.h

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

data/src/NetworkAccessManager.cpp

@@ -0,0 +1,22 @@
+#include "NetworkAccessManager.h"
+#include "WebPage.h"
+#include <iostream>
+
+
+NetworkAccessManager::NetworkAccessManager(QObject *parent):QNetworkAccessManager(parent) {
+}
+
+QNetworkReply* NetworkAccessManager::createRequest(QNetworkAccessManager::Operation oparation, const QNetworkRequest &request, QIODevice * outgoingData = 0) {
+  QNetworkRequest new_request(request);
+  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);
+};
+
+void NetworkAccessManager::addHeader(QString key, QString value) {
+  m_headers.insert(key, value);
+};
+

data/src/NetworkAccessManager.h

@@ -0,0 +1,18 @@
+#include <QtNetwork/QNetworkAccessManager>
+#include <QtNetwork/QNetworkRequest>
+#include <QtNetwork/QNetworkReply>
+
+class NetworkAccessManager : public QNetworkAccessManager {
+
+  Q_OBJECT
+
+  public:
+    NetworkAccessManager(QObject *parent = 0);
+    void addHeader(QString key, QString value);
+
+  protected:
+    QNetworkReply* createRequest(QNetworkAccessManager::Operation op, const QNetworkRequest &req, QIODevice * outgoingData);
+
+  private:
+    QHash<QString, QString> m_headers;
+};

data/src/Render.cpp

@@ -0,0 +1,19 @@
+#include "Render.h"
+#include "WebPage.h"
+
+Render::Render(WebPage *page, QObject *parent) : Command(page, parent) {
+}
+
+void Render::start(QStringList &arguments) {
+  QStringList functionArguments(arguments);
+  QString imagePath = functionArguments.takeFirst();
+  int     width     = functionArguments.takeFirst().toInt();
+  int     height    = functionArguments.takeFirst().toInt();
+
+  QSize size(width, height);
+  page()->setViewportSize(size);
+
+  bool result = page()->render( imagePath );
+
+  emit finished(new Response(result));
+}

data/src/Render.h

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

data/src/Reset.cpp

@@ -1,5 +1,6 @@
 #include "Reset.h"
 #include "WebPage.h"
+#include "NetworkAccessManager.h"
 
 Reset::Reset(WebPage *page, QObject *parent) : Command(page, parent) {
 }
@@ -10,6 +11,8 @@ 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()->setUserAgent(NULL);
   emit finished(new Response(true));
 }
 

data/src/Server.cpp

@@ -11,11 +11,14 @@ Server::Server(QObject *parent) : QObject(parent) {
 
 bool Server::start() {
   connect(m_tcp_server, SIGNAL(newConnection()), this, SLOT(handleConnection()));
-  return m_tcp_server->listen(QHostAddress::Any, 9200);
+  return m_tcp_server->listen(QHostAddress::Any, 0);
+}
+
+quint16 Server::server_port() const {
+  return m_tcp_server->serverPort();
 }
 
 void Server::handleConnection() {
   QTcpSocket *socket = m_tcp_server->nextPendingConnection();
   new Connection(socket, m_page, this);
 }
-

data/src/Server.h

@@ -9,6 +9,7 @@ class Server : public QObject {
   public:
     Server(QObject *parent = 0);
     bool start();
+    quint16 server_port() const;
 
   public slots:
     void handleConnection();

data/src/Source.cpp

@@ -7,7 +7,14 @@ Source::Source(WebPage *page, QObject *parent) : Command(page, parent) {
 void Source::start(QStringList &arguments) {
   Q_UNUSED(arguments)
 
-  QString result = page()->currentFrame()->toHtml();
-  emit finished(new Response(true, result));
+  QNetworkAccessManager* accessManager = page()->networkAccessManager();
+  QNetworkRequest request(page()->currentFrame()->url());
+  reply = accessManager->get(request);
+
+  connect(reply, SIGNAL(finished()), this, SLOT(sourceLoaded()));
+}
+
+void Source::sourceLoaded() {
+  emit finished(new Response(true, reply->readAll()));
 }
 

data/src/Source.h

@@ -1,6 +1,7 @@
 #include "Command.h"
 
 class WebPage;
+class QNetworkReply;
 
 class Source : public Command {
   Q_OBJECT
@@ -8,5 +9,11 @@ class Source : public Command {
   public:
     Source(WebPage *page, QObject *parent = 0);
     virtual void start(QStringList &arguments);
+
+  public slots:
+    void sourceLoaded();
+
+  private:
+    QNetworkReply *reply;
 };
 

data/src/WebPage.cpp

@@ -1,9 +1,24 @@
 #include "WebPage.h"
 #include "JavascriptInvocation.h"
+#include "NetworkAccessManager.h"
 #include <QResource>
 #include <iostream>
 
 WebPage::WebPage(QObject *parent) : QWebPage(parent) {
+  loadJavascript();
+  setUserStylesheet();
+
+  m_loading = false;
+
+  this->setNetworkAccessManager(new NetworkAccessManager());
+
+  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 *)));
+}
+
+void WebPage::loadJavascript() {
   QResource javascript(":/capybara.js");
   if (javascript.isCompressed()) {
     QByteArray uncompressedBytes(qUncompress(javascript.data(), javascript.size()));
@@ -14,11 +29,24 @@ WebPage::WebPage(QObject *parent) : QWebPage(parent) {
     javascriptString[javascript.size()] = 0;
     m_capybaraJavascript = javascriptString;
   }
-  m_loading = false;
-  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 *)));
+}
+
+void WebPage::setUserStylesheet() {
+  QString data = QString("* { font-family: 'Arial' ! important; }").toUtf8().toBase64();
+  QUrl url = QUrl(QString("data:text/css;charset=utf-8;base64,") + data);
+  settings()->setUserStyleSheetUrl(url);
+}
+
+QString WebPage::userAgentForUrl(const QUrl &url ) const {
+  if (!m_userAgent.isEmpty()) {
+    return m_userAgent;
+  } else {
+    return QWebPage::userAgentForUrl(url);
+  }
+}
+
+void WebPage::setUserAgent(QString userAgent) {
+  m_userAgent = userAgent;
 }
 
 void WebPage::frameCreated(QWebFrame * frame) {
@@ -90,3 +118,49 @@ QString WebPage::failureString() {
   return QString("Unable to load URL: ") + currentFrame()->requestedUrl().toString();
 }
 
+bool WebPage::render(const QString &fileName) {
+  QFileInfo fileInfo(fileName);
+  QDir dir;
+  dir.mkpath(fileInfo.absolutePath());
+
+  QSize viewportSize = this->viewportSize();
+  QSize pageSize = this->mainFrame()->contentsSize();
+  if (pageSize.isEmpty()) {
+    return false;
+  }
+
+  QImage buffer(pageSize, QImage::Format_ARGB32);
+  buffer.fill(qRgba(255, 255, 255, 0));
+
+  QPainter p(&buffer);
+  p.setRenderHint( QPainter::Antialiasing,          true);
+  p.setRenderHint( QPainter::TextAntialiasing,      true);
+  p.setRenderHint( QPainter::SmoothPixmapTransform, true);
+
+  this->setViewportSize(pageSize);
+  this->mainFrame()->render(&p);
+  p.end();
+  this->setViewportSize(viewportSize);
+
+  return buffer.save(fileName);
+}
+
+QString WebPage::chooseFile(QWebFrame *parentFrame, const QString &suggestedFile) {
+  Q_UNUSED(parentFrame);
+  Q_UNUSED(suggestedFile);
+
+  return getLastAttachedFileName();
+}
+
+bool WebPage::extension(Extension extension, const ExtensionOption *option, ExtensionReturn *output) {
+  if (extension == ChooseMultipleFilesExtension) {
+    QStringList names = QStringList() << getLastAttachedFileName();
+    static_cast<ChooseMultipleFilesExtensionReturn*>(output)->fileNames = names;
+    return true;
+  }
+  return false;
+}
+
+QString WebPage::getLastAttachedFileName() {
+  return currentFrame()->evaluateJavaScript(QString("Capybara.lastAttachedFile")).toString();
+}

data/src/WebPage.h

@@ -8,6 +8,10 @@ class WebPage : public QWebPage {
     QVariant invokeCapybaraFunction(const char *name, QStringList &arguments);
     QVariant invokeCapybaraFunction(QString &name, QStringList &arguments);
     QString failureString();
+    QString userAgentForUrl(const QUrl &url ) const;
+    void setUserAgent(QString userAgent);
+    bool render(const QString &fileName);
+    virtual bool extension (Extension extension, const ExtensionOption *option=0, ExtensionReturn *output=0);
 
   public slots:
     bool shouldInterruptJavaScript();
@@ -22,9 +26,14 @@ class WebPage : public QWebPage {
     virtual void javaScriptAlert(QWebFrame *frame, const QString &message);
     virtual bool javaScriptConfirm(QWebFrame *frame, const QString &message);
     virtual bool javaScriptPrompt(QWebFrame *frame, const QString &message, const QString &defaultValue, QString *result);
+    virtual QString chooseFile(QWebFrame * parentFrame, const QString &suggestedFile);
 
   private:
     QString m_capybaraJavascript;
+    QString m_userAgent;
     bool m_loading;
+    QString getLastAttachedFileName();
+    void loadJavascript();
+    void setUserStylesheet();
 };
 

data/src/body.cpp

@@ -0,0 +1,11 @@
+#include "Body.h"
+#include "WebPage.h"
+
+Body::Body(WebPage *page, QObject *parent) : Command(page, parent) {
+}
+
+void Body::start(QStringList &arguments) {
+  Q_UNUSED(arguments);
+  QString result = page()->currentFrame()->toHtml();
+  emit finished(new Response(true, result));
+}

data/src/capybara.js

@@ -1,6 +1,7 @@
 Capybara = {
   nextIndex: 0,
   nodes: {},
+  lastAttachedFile: "",
 
   invoke: function () {
     return this[CapybaraInvocation.functionName].apply(this, CapybaraInvocation.arguments);
@@ -27,16 +28,22 @@ Capybara = {
   },
 
   text: function (index) {
-    return this.nodes[index].innerText;
+    var node = this.nodes[index];
+    var type = (node.type || node.tagName).toLowerCase();
+    if (type == "textarea") {
+      return node.innerHTML;
+    } else {
+      return node.innerText;
+    }
   },
 
   attribute: function (index, name) {
     switch(name) {
-    case 'checked':  
+    case 'checked':
       return this.nodes[index].checked;
       break;
 
-    case 'disabled': 
+    case 'disabled':
       return this.nodes[index].disabled;
       break;
 
@@ -84,6 +91,10 @@ Capybara = {
     return true;
   },
 
+  selected: function (index) {
+    return this.nodes[index].selected;
+  },
+
   value: function(index) {
     return this.nodes[index].value;
   },
@@ -94,7 +105,8 @@ Capybara = {
     if (type == "text" || type == "textarea" || type == "password") {
       this.trigger(index, "focus");
       node.value = "";
-      for(var strindex = 0; strindex < value.length; strindex++) {
+      var length = this.attribute(index, "maxlength") || value.length;
+      for(var strindex = 0; strindex < length; strindex++) {
         node.value += value[strindex];
         this.trigger(index, "keydown");
         this.keypress(index, false, false, false, false, 0, value[strindex]);
@@ -106,6 +118,9 @@ Capybara = {
       node.checked = (value == "true");
       this.trigger(index, "click");
       this.trigger(index, "change");
+    } else if(type == "file") {
+      this.lastAttachedFile = value;
+      this.trigger(index, "click");
     } else {
       node.value = value;
     }