capybara-webkit 0.12.1 → 0.13.0

data/src/Connection.h

@@ -8,12 +8,13 @@ class Response;
 class CommandParser;
 class CommandFactory;
 class PageLoadingCommand;
+class WebPageManager;
 
 class Connection : public QObject {
   Q_OBJECT
 
   public:
-    Connection(QTcpSocket *socket, WebPage *page, QObject *parent = 0);
+    Connection(QTcpSocket *socket, WebPageManager *manager, QObject *parent = 0);
 
   public slots:
     void commandReady(Command *command);
@@ -21,17 +22,15 @@ class Connection : public QObject {
     void pendingLoadFinished(bool success);
 
   private:
-    void startCommand();
+    void startCommand(Command *);
     void writeResponse(Response *response);
     void writePageLoadFailure();
 
     QTcpSocket *m_socket;
-    Command *m_queuedCommand;
-    WebPage *m_page;
+    WebPageManager *m_manager;
     CommandParser *m_commandParser;
     CommandFactory *m_commandFactory;
-    PageLoadingCommand *m_runningCommand;
     bool m_pageSuccess;
-    bool m_commandWaiting;
+    WebPage *currentPage();
 };
 

data/src/ConsoleMessages.cpp

@@ -1,7 +1,8 @@
 #include "ConsoleMessages.h"
 #include "WebPage.h"
+#include "WebPageManager.h"
 
-ConsoleMessages::ConsoleMessages(WebPage *page, QStringList &arguments, QObject *parent) : Command(page, arguments, parent) {
+ConsoleMessages::ConsoleMessages(WebPageManager *manager, QStringList &arguments, QObject *parent) : SocketCommand(manager, arguments, parent) {
 }
 
 void ConsoleMessages::start() {

data/src/ConsoleMessages.h

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

data/src/CurrentUrl.cpp

@@ -1,57 +1,17 @@
 #include "CurrentUrl.h"
 #include "WebPage.h"
+#include "WebPageManager.h"
 
-CurrentUrl::CurrentUrl(WebPage *page, QStringList &arguments, QObject *parent) : Command(page, arguments, parent) {
+CurrentUrl::CurrentUrl(WebPageManager *manager, QStringList &arguments, QObject *parent) : SocketCommand(manager, arguments, parent) {
 }
 
-/*
- * This CurrentUrl command attempts to produce a current_url value consistent
- * with that returned by the Selenium WebDriver Capybara driver.
- *
- * It does not currently return the correct value in the case of an iframe whose
- * source URL results in a redirect because the loading of the iframe does not
- * generate a history item. This is most likely a rare case and is consistent
- * with the current behavior of the capybara-webkit driver.
- *
- * The following two values are *not* affected by Javascript pushState.
- *
- * QWebFrame->url()
- * QWebHistoryItem.originalUrl()
- *
- * The following two values *are* affected by Javascript pushState.
- *
- * QWebFrame->requestedUrl()
- * QWebHistoryItem.url()
- *
- * In the cases that we have access to both the QWebFrame values and the
- * correct history item for that frame, we can compare the values and determine
- * if a redirect occurred and if pushState was used. The table below describes
- * the various combinations of URL values that are possible.
- *
- *   O -> originally requested URL
- *   R -> URL after redirection
- *   P -> URL set by pushState
- *   * -> denotes the desired URL value from the frame
- *
- *               frame               history
- * case          url   requestedUrl  url     originalUrl
- * -----------------------------------------------------------------
- * regular load    O     O*            O       O
- *
- * redirect w/o    R*    O             R       O
- * pushState
- *
- * pushState       O     P*            P       O
- * only
- *
- * redirect w/     R     P*            P       O
- * pushState
- *
- * Based on the above information, we only need to check for the case of a
- * redirect w/o pushState, in which case QWebFrame->url() will have the correct
- * current_url value. In all other cases QWebFrame->requestedUrl() is correct.
- */
 void CurrentUrl::start() {
+#if QT_VERSION >= QT_VERSION_CHECK(4, 8, 0)
+  QStringList arguments;
+  QVariant result = page()->invokeCapybaraFunction("currentUrl", arguments);
+  QString url = result.toString();
+  emit finished(new Response(true, url));
+#else
   QUrl humanUrl = wasRedirectedAndNotModifiedByJavascript() ?
     page()->currentFrame()->url() : page()->currentFrame()->requestedUrl();
   QByteArray encodedBytes = humanUrl.toEncoded();
@@ -64,5 +24,6 @@ bool CurrentUrl::wasRegularLoad() {
 
 bool CurrentUrl::wasRedirectedAndNotModifiedByJavascript() {
   return !wasRegularLoad() && page()->currentFrame()->url() == page()->history()->currentItem().url();
+#endif
 }
 

data/src/CurrentUrl.h

@@ -1,16 +1,16 @@
-#include "Command.h"
+#include "SocketCommand.h"
 
-class WebPage;
-
-class CurrentUrl : public Command {
+class CurrentUrl : public SocketCommand {
   Q_OBJECT
 
   public:
-    CurrentUrl(WebPage *page, QStringList &arguments, QObject *parent = 0);
+    CurrentUrl(WebPageManager *, QStringList &arguments, QObject *parent = 0);
     virtual void start();
+#if QT_VERSION < QT_VERSION_CHECK(4, 8, 0)
 
-  private:
-    bool wasRegularLoad();
-    bool wasRedirectedAndNotModifiedByJavascript();
+    private:
+      bool wasRegularLoad();
+      bool wasRedirectedAndNotModifiedByJavascript();
+#endif
 };
 

data/src/EnableLogging.cpp

@@ -0,0 +1,10 @@
+#include "EnableLogging.h"
+#include "WebPageManager.h"
+
+EnableLogging::EnableLogging(WebPageManager *manager, QStringList &arguments, QObject *parent) : SocketCommand(manager, arguments, parent) {
+}
+
+void EnableLogging::start() {
+  manager()->enableLogging();
+  emit finished(new Response(true));
+}

data/src/EnableLogging.h

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

data/src/Evaluate.cpp

@@ -1,8 +1,9 @@
 #include "Evaluate.h"
 #include "WebPage.h"
+#include "WebPageManager.h"
 #include <iostream>
 
-Evaluate::Evaluate(WebPage *page, QStringList &arguments, QObject *parent) : Command(page, arguments, parent) {
+Evaluate::Evaluate(WebPageManager *manager, QStringList &arguments, QObject *parent) : SocketCommand(manager, arguments, parent) {
   m_buffer = "";
 }
 

data/src/Evaluate.h

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

data/src/Execute.cpp

@@ -1,7 +1,8 @@
 #include "Execute.h"
 #include "WebPage.h"
+#include "WebPageManager.h"
 
-Execute::Execute(WebPage *page, QStringList &arguments, QObject *parent) : Command(page, arguments, parent) {
+Execute::Execute(WebPageManager *manager, QStringList &arguments, QObject *parent) : SocketCommand(manager, arguments, parent) {
 }
 
 void Execute::start() {

data/src/Execute.h

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

data/src/Find.cpp

@@ -1,8 +1,9 @@
 #include "Find.h"
-#include "Command.h"
+#include "SocketCommand.h"
 #include "WebPage.h"
+#include "WebPageManager.h"
 
-Find::Find(WebPage *page, QStringList &arguments, QObject *parent) : Command(page, arguments, parent) {
+Find::Find(WebPageManager *manager, QStringList &arguments, QObject *parent) : SocketCommand(manager, arguments, parent) {
 }
 
 void Find::start() {

data/src/Find.h

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

data/src/FrameFocus.cpp

@@ -1,8 +1,9 @@
 #include "FrameFocus.h"
-#include "Command.h"
+#include "SocketCommand.h"
 #include "WebPage.h"
+#include "WebPageManager.h"
 
-FrameFocus::FrameFocus(WebPage *page, QStringList &arguments, QObject *parent) : Command(page, arguments, parent) {
+FrameFocus::FrameFocus(WebPageManager *manager, QStringList &arguments, QObject *parent) : SocketCommand(manager, arguments, parent) {
 }
 
 void FrameFocus::start() {

data/src/FrameFocus.h

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

data/src/GetCookies.cpp

@@ -1,17 +1,16 @@
 #include "GetCookies.h"
 #include "WebPage.h"
+#include "WebPageManager.h"
 #include "NetworkCookieJar.h"
 
-GetCookies::GetCookies(WebPage *page, QStringList &arguments, QObject *parent) : Command(page, arguments, parent)
+GetCookies::GetCookies(WebPageManager *manager, QStringList &arguments, QObject *parent) : SocketCommand(manager, arguments, parent)
 {
   m_buffer = "";
 }
 
 void GetCookies::start()
 {
-  NetworkCookieJar *jar = qobject_cast<NetworkCookieJar*>(page()
-                                                          ->networkAccessManager()
-                                                          ->cookieJar());
+  NetworkCookieJar *jar = manager()->cookieJar();
   foreach (QNetworkCookie cookie, jar->getAllCookies()) {
     m_buffer.append(cookie.toRawForm());
     m_buffer.append("\n");

data/src/GetCookies.h

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

data/src/GetTimeout.cpp

@@ -0,0 +1,9 @@
+#include "GetTimeout.h"
+#include "WebPageManager.h"
+
+GetTimeout::GetTimeout(WebPageManager *manager, QStringList &arguments, QObject *parent) : SocketCommand(manager, arguments, parent) {
+}
+
+void GetTimeout::start() {
+  emit finished(new Response(true, QString::number(manager()->getTimeout())));
+}

data/src/GetTimeout.h

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

data/src/GetWindowHandle.cpp

@@ -0,0 +1,11 @@
+#include "GetWindowHandle.h"
+#include "WebPage.h"
+#include "WebPageManager.h"
+#include <QStringList>
+
+GetWindowHandle::GetWindowHandle(WebPageManager *manager, QStringList &arguments, QObject *parent) : SocketCommand(manager, arguments, parent) {
+}
+
+void GetWindowHandle::start() {
+  emit finished(new Response(true, page()->uuid()));
+}

data/src/GetWindowHandle.h

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

data/src/GetWindowHandles.cpp

@@ -0,0 +1,20 @@
+#include "GetWindowHandles.h"
+#include "WebPageManager.h"
+#include "CommandFactory.h"
+#include "WebPage.h"
+#include <QStringList>
+
+GetWindowHandles::GetWindowHandles(WebPageManager *manager, QStringList &arguments, QObject *parent) : SocketCommand(manager, arguments, parent) {
+}
+
+void GetWindowHandles::start() {
+  QString handles = "[";
+  QStringList stringList;
+
+  foreach(WebPage *page, manager()->pages())
+    stringList.append("\"" + page->uuid() + "\"");
+
+  handles += stringList.join(",") + "]";
+
+  emit finished(new Response(true, handles));
+}

data/src/GetWindowHandles.h

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

data/src/Header.cpp

@@ -1,8 +1,9 @@
 #include "Header.h"
 #include "WebPage.h"
+#include "WebPageManager.h"
 #include "NetworkAccessManager.h"
 
-Header::Header(WebPage *page, QStringList &arguments, QObject *parent) : Command(page, arguments, parent) {
+Header::Header(WebPageManager *manager, QStringList &arguments, QObject *parent) : SocketCommand(manager, arguments, parent) {
 }
 
 void Header::start() {

data/src/Header.h

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