capybara-webkit 1.1.0 → 1.2.0

data/src/Reset.cpp

@@ -6,8 +6,6 @@ Reset::Reset(WebPageManager *manager, QStringList &arguments, QObject *parent) :
 }
 
 void Reset::start() {
-  page()->triggerAction(QWebPage::Stop);
-
   manager()->reset();
 
   finish(true);

data/src/SocketCommand.cpp

@@ -19,3 +19,9 @@ WebPageManager *SocketCommand::manager() const {
   return m_manager;
 }
 
+QString SocketCommand::toString() const {
+  QString result;
+  QTextStream(&result) << metaObject()->className() << QString("(") << m_arguments.join(", ") << QString(")");
+  return result;
+}
+

data/src/SocketCommand.h

@@ -14,6 +14,7 @@ class SocketCommand : public Command {
 
   public:
     SocketCommand(WebPageManager *, QStringList &arguments, QObject *parent = 0);
+    virtual QString toString() const;
 
   protected:
     WebPage *page() const;

data/src/StdinNotifier.cpp

@@ -0,0 +1,16 @@
+#include "StdinNotifier.h"
+
+#include <QTcpServer>
+
+StdinNotifier::StdinNotifier(QObject *parent) : QObject(parent) {
+  m_notifier = new QSocketNotifier(fileno(stdin), QSocketNotifier::Read, this);
+  connect(m_notifier, SIGNAL(activated(int)), this, SLOT(notifierActivated()));
+}
+
+void StdinNotifier::notifierActivated() {
+  std::string line;
+  std::getline(std::cin, line);
+  if (std::cin.eof()) {
+    emit eof();
+  }
+}

data/src/StdinNotifier.h

@@ -0,0 +1,20 @@
+#include <QObject>
+
+class QSocketNotifier;
+
+class StdinNotifier : public QObject {
+  Q_OBJECT
+
+  public:
+    StdinNotifier(QObject *parent = 0);
+
+  public slots:
+    void notifierActivated();
+
+  signals:
+    void eof();
+
+  private:
+    QSocketNotifier *m_notifier;
+};
+

data/src/WebPage.cpp

@@ -11,6 +11,8 @@
 #include <QWebSettings>
 #include <QUuid>
 #include <QApplication>
+#include <QWebView>
+#include <QMainWindow>
 
 WebPage::WebPage(WebPageManager *manager, QObject *parent) : QWebPage(parent) {
   m_loading = false;
@@ -33,14 +35,23 @@ WebPage::WebPage(WebPageManager *manager, QObject *parent) : QWebPage(parent) {
           this, SLOT(frameCreated(QWebFrame *)));
   connect(this, SIGNAL(unsupportedContent(QNetworkReply*)),
       this, SLOT(handleUnsupportedContent(QNetworkReply*)));
-  resetWindowSize();
+  connect(this, SIGNAL(windowCloseRequested()), this, SLOT(remove()));
 
   settings()->setAttribute(QWebSettings::JavascriptCanOpenWindows, true);
+  settings()->setAttribute(QWebSettings::JavascriptCanCloseWindows, true);
+  settings()->setAttribute(QWebSettings::LocalStorageDatabaseEnabled, true);
+
+  createWindow();
+}
+
+void WebPage::createWindow() {
+  QSize size(1680, 1050);
+  setViewportSize(size);
 }
 
-void WebPage::resetWindowSize() {
-  this->setViewportSize(QSize(1680, 1050));
-  this->settings()->setAttribute(QWebSettings::LocalStorageDatabaseEnabled, true);
+void WebPage::resize(int width, int height) {
+  QSize size(width, height);
+  setViewportSize(size);
 }
 
 void WebPage::resetLocalStorage() {
@@ -334,7 +345,7 @@ bool WebPage::supportsExtension(Extension extension) const {
 
 QWebPage *WebPage::createWindow(WebWindowType type) {
   Q_UNUSED(type);
-  return m_manager->createPage(this);
+  return m_manager->createPage();
 }
 
 QString WebPage::uuid() {
@@ -361,6 +372,10 @@ void WebPage::setFocus() {
   m_manager->setCurrentPage(this);
 }
 
+void WebPage::remove() {
+  m_manager->removePage(this);
+}
+
 void WebPage::setConfirmAction(QString action) {
   m_confirm = (action == "Yes");
 }

data/src/WebPage.h

@@ -10,6 +10,7 @@
 class WebPageManager;
 class InvocationResult;
 class NetworkReplyProxy;
+class QWebView;
 
 class WebPage : public QWebPage {
   Q_OBJECT
@@ -33,7 +34,7 @@ class WebPage : public QWebPage {
     QVariantList alertMessages();
     QVariantList confirmMessages();
     QVariantList promptMessages();
-    void resetWindowSize();
+    void createWindow();
     void resetLocalStorage();
     QWebPage *createWindow(WebWindowType type);
     QString uuid();
@@ -46,6 +47,7 @@ class WebPage : public QWebPage {
     QString contentType();
     void mouseEvent(QEvent::Type type, const QPoint &position, Qt::MouseButton button);
     bool clickTest(QWebElement element, int absoluteX, int absoluteY);
+    void resize(int, int);
 
   public slots:
     bool shouldInterruptJavaScript();
@@ -57,6 +59,7 @@ class WebPage : public QWebPage {
     void handleSslErrorsForReply(QNetworkReply *reply, const QList<QSslError> &);
     void handleUnsupportedContent(QNetworkReply *reply);
     void replyFinished(QUrl &, QNetworkReply *);
+    void remove();
 
   signals:
     void pageFinished(bool);

data/src/WebPageManager.cpp

@@ -12,7 +12,7 @@ WebPageManager::WebPageManager(QObject *parent) : QObject(parent) {
   m_timeout = -1;
   m_networkAccessManager = new NetworkAccessManager(this);
   m_networkAccessManager->setCookieJar(m_cookieJar);
-  createPage(this)->setFocus();
+  createPage()->setFocus();
 }
 
 NetworkAccessManager *WebPageManager::networkAccessManager() {
@@ -35,8 +35,8 @@ WebPage *WebPageManager::currentPage() const {
   return m_currentPage;
 }
 
-WebPage *WebPageManager::createPage(QObject *parent) {
-  WebPage *page = new WebPage(this, parent);
+WebPage *WebPageManager::createPage() {
+  WebPage *page = new WebPage(this);
   connect(page, SIGNAL(loadStarted()),
           this, SLOT(emitLoadStarted()));
   connect(page, SIGNAL(pageFinished(bool)),
@@ -47,6 +47,15 @@ WebPage *WebPageManager::createPage(QObject *parent) {
   return page;
 }
 
+void WebPageManager::removePage(WebPage *page) {
+  m_pages.removeOne(page);
+  page->deleteLater();
+  if (m_pages.isEmpty())
+    createPage()->setFocus();
+  else if (page == m_currentPage)
+    m_pages.first()->setFocus();
+}
+
 void WebPageManager::emitLoadStarted() {
   if (m_started.empty()) {
     logger() << "Load started";
@@ -110,10 +119,12 @@ 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();
+  m_currentPage->resetLocalStorage();
+  while (!m_pages.isEmpty()) {
+    WebPage *page = m_pages.takeFirst();
+    page->deleteLater();
+  }
+  createPage()->setFocus();
 }
 
 NetworkCookieJar *WebPageManager::cookieJar() {

data/src/WebPageManager.h

@@ -20,7 +20,8 @@ class WebPageManager : public QObject {
     QList<WebPage *> pages() const;
     void setCurrentPage(WebPage *);
     WebPage *currentPage() const;
-    WebPage *createPage(QObject *parent);
+    WebPage *createPage();
+    void removePage(WebPage *);
     void setIgnoreSslErrors(bool);
     bool ignoreSslErrors();
     void setTimeout(int);

data/src/WindowClose.cpp

@@ -0,0 +1,10 @@
+#include "WindowClose.h"
+#include "WebPage.h"
+
+WindowClose::WindowClose(WebPageManager *manager, QStringList &arguments, QObject *parent) : WindowCommand(manager, arguments, parent) {
+}
+
+void WindowClose::windowFound(WebPage *page) {
+  page->remove();
+  finish(true);
+}

data/src/WindowClose.h

@@ -0,0 +1,12 @@
+#include "WindowCommand.h"
+
+class WindowClose : public WindowCommand {
+  Q_OBJECT
+
+  public:
+    WindowClose(WebPageManager *, QStringList &arguments, QObject *parent = 0);
+
+  protected:
+    virtual void windowFound(WebPage *);
+};
+

data/src/WindowCommand.cpp

@@ -0,0 +1,27 @@
+#include "WindowCommand.h"
+#include "WebPage.h"
+#include "WebPageManager.h"
+#include "ErrorMessage.h"
+
+WindowCommand::WindowCommand(WebPageManager *manager, QStringList &arguments, QObject *parent) : SocketCommand(manager, arguments, parent) {
+}
+
+void WindowCommand::start() {
+  findWindow(arguments()[0]);
+}
+
+void WindowCommand::findWindow(QString selector) {
+  foreach(WebPage *page, manager()->pages()) {
+    if (page->matchesWindowSelector(selector)) {
+      windowFound(page);
+      return;
+    }
+  }
+
+  windowNotFound();
+}
+
+void WindowCommand::windowNotFound() {
+  finish(false,
+         new ErrorMessage("NoSuchWindowError", "Unable to locate window."));
+}

data/src/WindowCommand.h

@@ -0,0 +1,21 @@
+#ifndef WINDOW_COMMAND_H
+#define WINDOW_COMMAND_H
+
+#include "SocketCommand.h"
+
+class WindowCommand : public SocketCommand {
+  Q_OBJECT
+
+  public:
+    WindowCommand(WebPageManager *, QStringList &arguments, QObject *parent = 0);
+    virtual void start();
+
+  protected:
+    virtual void windowFound(WebPage *) = 0;
+
+  private:
+    void findWindow(QString);
+    void windowNotFound();
+};
+
+#endif

data/src/WindowFocus.cpp

@@ -1,33 +1,10 @@
 #include "WindowFocus.h"
-#include "SocketCommand.h"
 #include "WebPage.h"
-#include "CommandFactory.h"
-#include "WebPageManager.h"
-#include "ErrorMessage.h"
 
-WindowFocus::WindowFocus(WebPageManager *manager, QStringList &arguments, QObject *parent) : SocketCommand(manager, arguments, parent) {
+WindowFocus::WindowFocus(WebPageManager *manager, QStringList &arguments, QObject *parent) : WindowCommand(manager, arguments, parent) {
 }
 
-void WindowFocus::start() {
-  focusWindow(arguments()[0]);
-}
-
-void WindowFocus::windowNotFound() {
-  finish(false, new ErrorMessage("Unable to locate window."));
-}
-
-void WindowFocus::success(WebPage *page) {
+void WindowFocus::windowFound(WebPage *page) {
   page->setFocus();
   finish(true);
 }
-
-void WindowFocus::focusWindow(QString selector) {
-  foreach(WebPage *page, manager()->pages()) {
-    if (page->matchesWindowSelector(selector)) {
-      success(page);
-      return;
-    }
-  }
-
-  windowNotFound();
-}

data/src/WindowFocus.h

@@ -1,15 +1,12 @@
-#include "SocketCommand.h"
+#include "WindowCommand.h"
 
-class WindowFocus : public SocketCommand {
+class WindowFocus : public WindowCommand {
   Q_OBJECT
 
   public:
     WindowFocus(WebPageManager *, QStringList &arguments, QObject *parent = 0);
-    virtual void start();
 
-  private:
-    void success(WebPage *);
-    void windowNotFound();
-    void focusWindow(QString);
+  protected:
+    virtual void windowFound(WebPage *);
 };
 

data/src/WindowMaximize.cpp

@@ -0,0 +1,14 @@
+#include <QDesktopWidget>
+#include "WindowMaximize.h"
+#include "WebPage.h"
+#include "WebPageManager.h"
+
+WindowMaximize::WindowMaximize(WebPageManager *manager, QStringList &arguments, QObject *parent) : WindowCommand(manager, arguments, parent) {
+}
+
+void WindowMaximize::windowFound(WebPage *page) {
+  QDesktopWidget *desktop = QApplication::desktop();
+  QRect area = desktop->availableGeometry();
+  page->resize(area.width(), area.height());
+  finish(true);
+}

data/src/WindowMaximize.h

@@ -0,0 +1,12 @@
+#include "WindowCommand.h"
+
+class WindowMaximize : public WindowCommand {
+  Q_OBJECT
+
+  public:
+    WindowMaximize(WebPageManager *, QStringList &arguments, QObject *parent = 0);
+
+  protected:
+    virtual void windowFound(WebPage *);
+};
+

data/src/WindowOpen.cpp

@@ -0,0 +1,12 @@
+#include "WindowOpen.h"
+#include "SocketCommand.h"
+#include "WebPage.h"
+#include "WebPageManager.h"
+
+WindowOpen::WindowOpen(WebPageManager *manager, QStringList &arguments, QObject *parent) : SocketCommand(manager, arguments, parent) {
+}
+
+void WindowOpen::start() {
+  manager()->createPage();
+  finish(true);
+}

data/src/WindowOpen.h

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

data/src/WindowResize.cpp

@@ -0,0 +1,16 @@
+#include "WindowResize.h"
+#include "WebPage.h"
+#include "WebPageManager.h"
+
+WindowResize::WindowResize(WebPageManager *manager, QStringList &arguments, QObject *parent) : WindowCommand(manager, arguments, parent) {
+}
+
+void WindowResize::windowFound(WebPage *page) {
+  int width = arguments()[1].toInt();
+  int height = arguments()[2].toInt();
+
+  page->resize(width, height);
+
+  finish(true);
+}
+

data/src/WindowResize.h

@@ -0,0 +1,12 @@
+#include "WindowCommand.h"
+
+class WindowResize : public WindowCommand {
+  Q_OBJECT
+
+  public:
+    WindowResize(WebPageManager *, QStringList &arguments, QObject *parent = 0);
+
+  protected:
+    virtual void windowFound(WebPage *);
+};
+

data/src/WindowSize.cpp

@@ -0,0 +1,17 @@
+#include "WindowSize.h"
+#include "WebPage.h"
+#include "WebPageManager.h"
+#include "JsonSerializer.h"
+
+WindowSize::WindowSize(WebPageManager *manager, QStringList &arguments, QObject *parent) : WindowCommand(manager, arguments, parent) {
+}
+
+void WindowSize::windowFound(WebPage *page) {
+  QSize size = page->viewportSize();
+  QVariantList elements;
+  elements << size.width();
+  elements << size.height();
+  JsonSerializer serializer;
+  QByteArray json = serializer.serialize(elements);
+  finish(true, json);
+}

data/src/WindowSize.h

@@ -0,0 +1,12 @@
+#include "WindowCommand.h"
+
+class WindowSize : public WindowCommand {
+  Q_OBJECT
+
+  public:
+    WindowSize(WebPageManager *, QStringList &arguments, QObject *parent = 0);
+
+  protected:
+    virtual void windowFound(WebPage *);
+};
+

data/src/capybara.js

@@ -66,7 +66,9 @@ Capybara = {
   text: function (index) {
     var node = this.getNode(index);
     var type = (node.type || node.tagName).toLowerCase();
-    if (type == "textarea") {
+    if (!this.isNodeVisible(node)) {
+      return '';
+    } else if (type == "textarea") {
       return node.innerHTML;
     } else {
       return node.innerText || node.textContent;
@@ -286,20 +288,34 @@ Capybara = {
         CapybaraInvocation.keypress(value[strindex]);
       }
 
+      if (value == '')
+        this.trigger(index, "change");
     } else if (type === "checkbox" || type === "radio") {
       if (node.checked != (value === "true")) {
         this.leftClick(index);
       }
-
     } else if (type === "file") {
       this.attachedFiles = Array.prototype.slice.call(arguments, 1);
       this.leftClick(index);
-
+    } else if (this.isContentEditable(node)) {
+      var content = document.createTextNode(value);
+      node.innerHTML = '';
+      node.appendChild(content);
     } else {
       node.value = value;
     }
   },
 
+  isContentEditable: function(node) {
+    if (node.contentEditable == 'true') {
+      return true;
+    } else if (node.contentEditable == 'false') {
+      return false;
+    } else if (node.contentEditable == 'inherit') {
+      return this.isContentEditable(node.parentNode);
+    }
+  },
+
   focus: function(index) {
     this.getNode(index).focus();
   },

data/src/find_command.h

@@ -21,7 +21,7 @@ CHECK_COMMAND(GetCookies)
 CHECK_COMMAND(SetProxy)
 CHECK_COMMAND(ConsoleMessages)
 CHECK_COMMAND(CurrentUrl)
-CHECK_COMMAND(ResizeWindow)
+CHECK_COMMAND(WindowResize)
 CHECK_COMMAND(IgnoreSslErrors)
 CHECK_COMMAND(SetSkipImageLoading)
 CHECK_COMMAND(WindowFocus)
@@ -42,3 +42,9 @@ CHECK_COMMAND(SetUrlBlacklist)
 CHECK_COMMAND(Title)
 CHECK_COMMAND(Version)
 CHECK_COMMAND(FindCss)
+CHECK_COMMAND(WindowClose)
+CHECK_COMMAND(WindowOpen)
+CHECK_COMMAND(WindowSize)
+CHECK_COMMAND(WindowMaximize)
+CHECK_COMMAND(GoBack)
+CHECK_COMMAND(GoForward)

data/src/main.cpp

@@ -1,5 +1,6 @@
 #include "Server.h"
 #include "IgnoreDebugOutput.h"
+#include "StdinNotifier.h"
 #include <QApplication>
 #include <iostream>
 #ifdef Q_OS_UNIX
@@ -19,6 +20,9 @@ int main(int argc, char **argv) {
   app.setOrganizationName("thoughtbot, inc");
   app.setOrganizationDomain("thoughtbot.com");
 
+  StdinNotifier notifier;
+  QObject::connect(&notifier, SIGNAL(eof()), &app, SLOT(quit()));
+
   ignoreDebugOutput();
   Server server(0);
 

data/src/webkit_server.pro

@@ -1,7 +1,19 @@
 TEMPLATE = app
 TARGET = webkit_server
 DESTDIR = .
+PROJECT_DIR = $$_PRO_FILE_PWD_
+BUILD_DIR = $${PROJECT_DIR}/build
+PRECOMPILED_DIR = $${BUILD_DIR}
+OBJECTS_DIR = $${BUILD_DIR}
+MOC_DIR = $${BUILD_DIR}
 HEADERS = \
+  GoForward.h \
+  GoBack.h \
+  WindowMaximize.h \
+  WindowSize.h \
+  WindowCommand.h \
+  WindowOpen.h \
+  WindowClose.h \
   Version.h \
   EnableLogging.h \
   Authenticate.h \
@@ -13,7 +25,7 @@ HEADERS = \
   JavascriptConfirmMessages.h \
   JavascriptPromptMessages.h \
   IgnoreSslErrors.h \
-  ResizeWindow.h \
+  WindowResize.h \
   CurrentUrl.h \
   ConsoleMessages.h \
   WebPage.h \
@@ -63,9 +75,17 @@ HEADERS = \
   JavascriptCommand.h \
   FindXpath.h \
   NetworkReplyProxy.h \
-  IgnoreDebugOutput.h
+  IgnoreDebugOutput.h \
+  StdinNotifier.h
 
 SOURCES = \
+  GoForward.cpp \
+  GoBack.cpp \
+  WindowMaximize.cpp \
+  WindowSize.cpp \
+  WindowCommand.cpp \
+  WindowOpen.cpp \
+  WindowClose.cpp \
   Version.cpp \
   EnableLogging.cpp \
   Authenticate.cpp \
@@ -77,7 +97,7 @@ SOURCES = \
   JavascriptConfirmMessages.cpp \
   JavascriptPromptMessages.cpp \
   IgnoreSslErrors.cpp \
-  ResizeWindow.cpp \
+  WindowResize.cpp \
   CurrentUrl.cpp \
   ConsoleMessages.cpp \
   main.cpp \
@@ -128,7 +148,8 @@ SOURCES = \
   JavascriptCommand.cpp \
   FindXpath.cpp \
   NetworkReplyProxy.cpp \
-  IgnoreDebugOutput.cpp
+  IgnoreDebugOutput.cpp \
+  StdinNotifier.cpp
 
 RESOURCES = webkit_server.qrc
 QT += network

data/templates/Command.cpp

@@ -1,5 +1,7 @@
 #include "NAME.h"
+#include "SocketCommand.h"
 #include "WebPage.h"
+#include "WebPageManager.h"
 
 NAME::NAME(WebPageManager *manager, QStringList &arguments, QObject *parent) : SocketCommand(manager, arguments, parent) {
 }

data/templates/Command.h

@@ -1,6 +1,4 @@
-#include "Command.h"
-
-class WebPage;
+#include "SocketCommand.h"
 
 class NAME : public SocketCommand {
   Q_OBJECT