capybara-webkit 0.14.2 → 1.0.0

data/src/WindowFocus.cpp

@@ -3,6 +3,7 @@
 #include "WebPage.h"
 #include "CommandFactory.h"
 #include "WebPageManager.h"
+#include "ErrorMessage.h"
 
 WindowFocus::WindowFocus(WebPageManager *manager, QStringList &arguments, QObject *parent) : SocketCommand(manager, arguments, parent) {
 }
@@ -12,12 +13,12 @@ void WindowFocus::start() {
 }
 
 void WindowFocus::windowNotFound() {
-  emitFinished(false, QString("Unable to locate window. "));
+  finish(false, new ErrorMessage("Unable to locate window."));
 }
 
 void WindowFocus::success(WebPage *page) {
   page->setFocus();
-  emitFinished(true);
+  finish(true);
 }
 
 void WindowFocus::focusWindow(QString selector) {

data/src/body.cpp

@@ -6,11 +6,8 @@ Body::Body(WebPageManager *manager, QStringList &arguments, QObject *parent) : S
 }
 
 void Body::start() {
-  QString result;
-  if (page()->unsupportedContentLoaded())
-    result = page()->currentFrame()->toPlainText();
+  if (page()->contentType().contains("html"))
+    finish(true, page()->currentFrame()->toHtml());
   else
-    result = page()->currentFrame()->toHtml();
-
-  emitFinished(true, result);
+    finish(true, page()->body());
 }

data/src/capybara.js

@@ -4,22 +4,30 @@ Capybara = {
   attachedFiles: [],
 
   invoke: function () {
-    return this[CapybaraInvocation.functionName].apply(this, CapybaraInvocation.arguments);
+    try {
+      return this[CapybaraInvocation.functionName].apply(this, CapybaraInvocation.arguments);
+    } catch (e) {
+      CapybaraInvocation.error = e;
+    }
+  },
+
+  findXpath: function (xpath) {
+    return this.findXpathRelativeTo(document, xpath);
   },
 
-  find: function (xpath) {
-    return this.findRelativeTo(document, xpath);
+  findCss: function (selector) {
+    return this.findCssRelativeTo(document, selector);
   },
 
-  currentUrl: function () {
-    return window.location.toString();
+  findXpathWithin: function (index, xpath) {
+    return this.findXpathRelativeTo(this.nodes[index], xpath);
   },
 
-  findWithin: function (index, xpath) {
-    return this.findRelativeTo(this.nodes[index], xpath);
+  findCssWithin: function (index, selector) {
+    return this.findCssRelativeTo(this.nodes[index], selector);
   },
 
-  findRelativeTo: function (reference, xpath) {
+  findXpathRelativeTo: function (reference, xpath) {
     var iterator = document.evaluate(xpath, reference, null, XPathResult.ORDERED_NODE_ITERATOR_TYPE, null);
     var node;
     var results = [];
@@ -31,8 +39,20 @@ Capybara = {
     return results.join(",");
   },
 
+  findCssRelativeTo: function (reference, selector) {
+    var elements = reference.querySelectorAll(selector);
+    var results = [];
+    for (var i = 0; i < elements.length; i++) {
+      this.nextIndex++;
+      this.nodes[this.nextIndex] = elements[i];
+      results.push(this.nextIndex);
+    }
+    return results.join(",");
+  },
+
   isAttached: function(index) {
-    return document.evaluate("ancestor-or-self::html", this.nodes[index], null, XPathResult.FIRST_ORDERED_NODE_TYPE, null).singleNodeValue != null;
+    return this.nodes[index] &&
+      document.evaluate("ancestor-or-self::html", this.nodes[index], null, XPathResult.FIRST_ORDERED_NODE_TYPE, null).singleNodeValue != null;
   },
 
   text: function (index) {
@@ -41,10 +61,15 @@ Capybara = {
     if (type == "textarea") {
       return node.innerHTML;
     } else {
-      return node.innerText;
+      return node.innerText || node.textContent;
     }
   },
 
+  allText: function (index) {
+    var node = this.nodes[index];
+    return node.textContent;
+  },
+
   attribute: function (index, name) {
     switch(name) {
     case 'checked':
@@ -108,53 +133,67 @@ Capybara = {
     return this.nodes[index].submit();
   },
 
-  mousedown: function(index) {
-    var mousedownEvent = document.createEvent('MouseEvents');
-    mousedownEvent.initMouseEvent('mousedown', true, true, window, 0, 0, 0, 0, 0, false, false, false, false, 0, null);
-    this.nodes[index].dispatchEvent(mousedownEvent);
+  clickTest: function(node, pos) {
+    var el = document.elementFromPoint(pos.relativeX, pos.relativeY);
+
+    while (el) {
+      if (el === node)
+        return CapybaraInvocation.clickTest(node, pos.absoluteX, pos.absoluteY);
+      else
+        el = el.parentNode;
+    }
+
+    return false;
   },
 
-  mouseup: function(index) {
-    var mouseupEvent = document.createEvent('MouseEvents');
-    mouseupEvent.initMouseEvent('mouseup', true, true, window, 0, 0, 0, 0, 0, false, false, false, false, 0, null);
-    this.nodes[index].dispatchEvent(mouseupEvent);
+  clickPosition: function(node) {
+    var rects = node.getClientRects();
+    var rect;
+
+    for (var i = 0; i < rects.length; i++) {
+      rect = rects[i];
+      if (rect.width > 0 && rect.height > 0)
+        return CapybaraInvocation.clickPosition(node, rect.left, rect.top, rect.width, rect.height);
+    }
   },
 
-  click: function (index) {
-    this.mousedown(index);
-    this.focus(index);
-    this.mouseup(index);
-    var clickEvent = document.createEvent('MouseEvents');
-    clickEvent.initMouseEvent('click', true, true, window, 0, 0, 0, 0, 0, false, false, false, false, 0, null);
-    this.nodes[index].dispatchEvent(clickEvent);
+  click: function (index, action) {
+    var node = this.nodes[index];
+    node.scrollIntoViewIfNeeded();
+
+    var pos = this.clickPosition(node);
+
+    if (pos && this.clickTest(node, pos))
+      action(pos.absoluteX, pos.absoluteY);
+    else
+      throw new Capybara.ClickFailed(this.path(index), pos);
   },
 
-  trigger: function (index, eventName) {
-    var eventObject = document.createEvent("HTMLEvents");
-    eventObject.initEvent(eventName, true, true);
-    this.nodes[index].dispatchEvent(eventObject);
+  leftClick: function (index) {
+    this.click(index, CapybaraInvocation.leftClick);
   },
 
-  keypress: function(index, altKey, ctrlKey, shiftKey, metaKey, keyCode, charCode) {
-    var eventObject = document.createEvent("Events");
-    eventObject.initEvent('keypress', true, true);
-    eventObject.window = window;
-    eventObject.altKey = altKey;
-    eventObject.ctrlKey = ctrlKey;
-    eventObject.shiftKey = shiftKey;
-    eventObject.metaKey = metaKey;
-    eventObject.keyCode = keyCode;
-    eventObject.charCode = charCode;
-    eventObject.which = keyCode;
-    this.nodes[index].dispatchEvent(eventObject);
+  doubleClick: function(index) {
+    this.click(index, CapybaraInvocation.leftClick);
+    this.click(index, CapybaraInvocation.doubleClick);
+  },
+
+  rightClick: function(index) {
+    this.click(index, CapybaraInvocation.rightClick);
   },
 
-  keyupdown: function(index, eventName, keyCode) {
+  hover: function (index) {
+    var node = this.nodes[index];
+    node.scrollIntoViewIfNeeded();
+
+    var pos = this.clickPosition(node);
+    if (pos)
+      CapybaraInvocation.hover(pos.absoluteX, pos.absoluteY);
+  },
+
+  trigger: function (index, eventName) {
     var eventObject = document.createEvent("HTMLEvents");
     eventObject.initEvent(eventName, true, true);
-    eventObject.keyCode = keyCode;
-    eventObject.which = keyCode;
-    eventObject.charCode = 0;
     this.nodes[index].dispatchEvent(eventObject);
   },
 
@@ -187,49 +226,6 @@ Capybara = {
     return true;
   },
 
-  characterToKeyCode: function(character) {
-    var code = character.toUpperCase().charCodeAt(0);
-    var specialKeys = {
-      96: 192,  //`
-      45: 189,  //-
-      61: 187,  //=
-      91: 219,  //[
-      93: 221,  //]
-      92: 220,  //\
-      59: 186,  //;
-      39: 222,  //'
-      44: 188,  //,
-      46: 190,  //.
-      47: 191,  ///
-      127: 46,  //delete
-      126: 192, //~
-      33: 49,   //!
-      64: 50,   //@
-      35: 51,   //#
-      36: 52,   //$
-      37: 53,   //%
-      94: 54,   //^
-      38: 55,   //&
-      42: 56,   //*
-      40: 57,   //(
-      41: 48,   //)
-      95: 189,  //_
-      43: 187,  //+
-      123: 219, //{
-      125: 221, //}
-      124: 220, //|
-      58: 186,  //:
-      34: 222,  //"
-      60: 188,  //<
-      62: 190,  //>
-      63: 191   //?
-    };
-    if (specialKeys[code]) {
-      code = specialKeys[code];
-    }
-    return code;
-  },
-
   set: function (index, value) {
     var length, maxLength, node, strindex, textTypes, type;
 
@@ -247,25 +243,21 @@ Capybara = {
         length = value.length;
       }
 
-      node.value = "";
+      if (!node.readOnly)
+        node.value = "";
+
       for (strindex = 0; strindex < length; strindex++) {
-        node.value += value[strindex];
-        var keyCode = this.characterToKeyCode(value[strindex]);
-        this.keyupdown(index, "keydown", keyCode);
-        this.keypress(index, false, false, false, false, value.charCodeAt(strindex), value.charCodeAt(strindex));
-        this.keyupdown(index, "keyup", keyCode);
-        this.trigger(index, "input");
+        CapybaraInvocation.keypress(value[strindex]);
       }
-      this.trigger(index, "change");
 
     } else if (type === "checkbox" || type === "radio") {
       if (node.checked != (value === "true")) {
-        this.click(index);
+        this.leftClick(index);
       }
 
     } else if (type === "file") {
       this.attachedFiles = Array.prototype.slice.call(arguments, 1);
-      this.click(index);
+      this.leftClick(index);
 
     } else {
       node.value = value;
@@ -286,7 +278,7 @@ Capybara = {
     this.trigger(index, "change");
   },
 
-  centerPostion: function(element) {
+  centerPosition: function(element) {
     this.reflow(element);
     var rect = element.getBoundingClientRect();
     var position = {
@@ -320,7 +312,7 @@ Capybara = {
 
   dragTo: function (index, targetIndex) {
     var element = this.nodes[index], target = this.nodes[targetIndex];
-    var position = this.centerPostion(element);
+    var position = this.centerPosition(element);
     var options = {
       clientX: position.x,
       clientY: position.y
@@ -335,7 +327,7 @@ Capybara = {
     options.clientY += 1;
     mouseTrigger('mousemove', options);
 
-    position = this.centerPostion(target);
+    position = this.centerPosition(target);
     options = {
       clientX: position.x,
       clientY: position.y
@@ -349,3 +341,13 @@ Capybara = {
   }
 };
 
+Capybara.ClickFailed = function(path, position) {
+  this.name = 'Capybara.ClickFailed';
+  this.message = 'Failed to click element ' + path;
+  if (position)
+    this.message += ' at position ' + position["absoluteX"] + ', ' + position["absoluteY"];
+  else
+    this.message += ' at unknown position';
+};
+Capybara.ClickFailed.prototype = new Error();
+Capybara.ClickFailed.prototype.constructor = Capybara.ClickFailed;

data/src/find_command.h

@@ -4,7 +4,7 @@
   }
 
 CHECK_COMMAND(Visit)
-CHECK_COMMAND(Find)
+CHECK_COMMAND(FindXpath)
 CHECK_COMMAND(Reset)
 CHECK_COMMAND(Node)
 CHECK_COMMAND(Evaluate)
@@ -39,4 +39,6 @@ CHECK_COMMAND(JavascriptPromptMessages)
 CHECK_COMMAND(GetTimeout)
 CHECK_COMMAND(SetTimeout)
 CHECK_COMMAND(SetUrlBlacklist)
-
+CHECK_COMMAND(Title)
+CHECK_COMMAND(Version)
+CHECK_COMMAND(FindCss)

data/src/main.cpp

@@ -1,5 +1,5 @@
 #include "Server.h"
-#include <QtGui>
+#include <QApplication>
 #include <iostream>
 #ifdef Q_OS_UNIX
   #include <unistd.h>

data/src/stable.h

@@ -0,0 +1,39 @@
+#include <QApplication>
+#include <QByteArray>
+#include <QDebug>
+#include <QEvent>
+#include <QFile>
+#include <QIODevice>
+#include <QList>
+#include <QNetworkCookie>
+#include <QNetworkProxy>
+#include <QNetworkReply>
+#include <QNetworkRequest>
+#include <QObject>
+#include <QResource>
+#include <QSet>
+#include <QString>
+#include <QStringList>
+#include <QTcpServer>
+#include <QTcpSocket>
+#include <QTimer>
+#include <QUuid>
+#include <QVariant>
+#include <QVariantList>
+#include <QWebElement>
+#include <QWebSettings>
+#include <QtNetwork/QNetworkAccessManager>
+#include <QtNetwork/QNetworkCookie>
+#include <QtNetwork/QNetworkCookieJar>
+#include <QtNetwork/QNetworkReply>
+#include <QtNetwork/QNetworkRequest>
+#include <QtNetwork>
+#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
+#include <QtWebKitWidgets>
+#else
+#include <QtWebKit>
+#endif
+#include <cmath>
+#include <fstream>
+#include <iostream>
+#include <sstream>

data/src/webkit_server.pro

@@ -2,6 +2,7 @@ TEMPLATE = app
 TARGET = webkit_server
 DESTDIR = .
 HEADERS = \
+  Version.h \
   EnableLogging.h \
   Authenticate.h \
   SetConfirmAction.h \
@@ -21,7 +22,6 @@ HEADERS = \
   Command.h \
   SocketCommand.h \
   Visit.h \
-  Find.h \
   Reset.h \
   Node.h \
   JavascriptInvocation.h \
@@ -55,9 +55,17 @@ HEADERS = \
   TimeoutCommand.h \
   SetUrlBlacklist.h \
   NoOpReply.h \
-  JsonSerializer.h
+  JsonSerializer.h \
+  InvocationResult.h \
+  ErrorMessage.h \
+  Title.h \
+  FindCss.h \
+  JavascriptCommand.h \
+  FindXpath.h \
+  NetworkReplyProxy.h
 
 SOURCES = \
+  Version.cpp \
   EnableLogging.cpp \
   Authenticate.cpp \
   SetConfirmAction.cpp \
@@ -78,7 +86,6 @@ SOURCES = \
   Command.cpp \
   SocketCommand.cpp \
   Visit.cpp \
-  Find.cpp \
   Reset.cpp \
   Node.cpp \
   JavascriptInvocation.cpp \
@@ -112,10 +119,23 @@ SOURCES = \
   TimeoutCommand.cpp \
   SetUrlBlacklist.cpp \
   NoOpReply.cpp \
-  JsonSerializer.cpp
+  JsonSerializer.cpp \
+  InvocationResult.cpp \
+  ErrorMessage.cpp \
+  Title.cpp \
+  FindCss.cpp \
+  JavascriptCommand.cpp \
+  FindXpath.cpp \
+  NetworkReplyProxy.cpp
 
 RESOURCES = webkit_server.qrc
-QT += network webkit
-CONFIG += console
+QT += network
+greaterThan(QT_MAJOR_VERSION, 4) {
+  QT += webkitwidgets
+} else {
+  QT += webkit
+}
+CONFIG += console precompile_header
 CONFIG -= app_bundle
+PRECOMPILED_HEADER = stable.h