RubyGems - capybara-webkit - Versions diffs - 0.2.0 → 0.3.0 - Mend

capybara-webkit 0.2.0 → 0.3.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 (24) hide show

data/Rakefile +3 -3
data/capybara-webkit.gemspec +1 -1
data/lib/capybara/driver/webkit/node.rb +1 -4
data/lib/capybara_webkit_builder.rb +3 -3
data/spec/driver_spec.rb +62 -1
data/spec/integration/driver_spec.rb +1 -3
data/src/Command.h +2 -1
data/src/Connection.cpp +36 -26
data/src/Connection.h +5 -2
data/src/Evaluate.cpp +1 -1
data/src/Execute.cpp +2 -4
data/src/Find.cpp +4 -5
data/src/FrameFocus.cpp +3 -6
data/src/Node.cpp +1 -1
data/src/Reset.cpp +1 -2
data/src/Response.cpp +19 -0
data/src/Response.h +13 -0
data/src/Source.cpp +2 -3
data/src/Url.cpp +2 -3
data/src/Visit.cpp +3 -3
data/src/WebPage.cpp +10 -5
data/src/capybara.js +53 -1
data/src/webkit_server.pro +2 -2
metadata +6 -4

data/Rakefile CHANGED Viewed

@@ -6,17 +6,17 @@ require 'capybara_webkit_builder'
 desc "Generate a Makefile using qmake"
 file 'Makefile' do
-  CapybaraWebkitBuilder.makefile
+  CapybaraWebkitBuilder.makefile or exit(1)
 end
 desc "Regenerate dependencies using qmake"
 task :qmake => 'Makefile' do
-  CapybaraWebkitBuilder.qmake
+  CapybaraWebkitBuilder.qmake or exit(1)
 end
 desc "Build the webkit server"
 task :build => :qmake do
-  CapybaraWebkitBuilder.build
+  CapybaraWebkitBuilder.build or exit(1)
 end
 file 'bin/webkit_server' => :build

data/capybara-webkit.gemspec CHANGED Viewed

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "capybara-webkit"
-  s.version = "0.2.0"
+  s.version = "0.3.0"
   s.authors = ["thoughtbot", "Joe Ferris", "Jason Morrison", "Tristan Dunn",
                "Joshua Clayton", "Yuichi Tateno", "Aaron Gibralter"]
   s.email = "support@thoughtbot.com"

data/lib/capybara/driver/webkit/node.rb CHANGED Viewed

@@ -42,9 +42,7 @@ class Capybara::Driver::Webkit
     end
     def drag_to(element)
-      trigger('mousedown')
-      element.trigger('mousemove')
-      element.trigger('mouseup')
+      invoke 'dragTo', element.native
     end
     def tag_name
@@ -84,4 +82,3 @@ class Capybara::Driver::Webkit
     end
   end
 end

data/lib/capybara_webkit_builder.rb CHANGED Viewed

@@ -12,7 +12,7 @@ module CapybaraWebkitBuilder
   end
   def build
-    system("make")
+    system("make") or return false
     FileUtils.mkdir("bin") unless File.directory?("bin")
@@ -24,8 +24,8 @@ module CapybaraWebkitBuilder
   end
   def build_all
-    makefile
-    qmake
+    makefile &&
+    qmake &&
     build
   end
 end

data/spec/driver_spec.rb CHANGED Viewed

@@ -497,7 +497,7 @@ describe Capybara::Driver::Webkit do
       draggable.drag_to(container)
-      subject.find("//*[@class='triggered']").size.should == 2
+      subject.find("//*[@class='triggered']").size.should == 1
     end
   end
@@ -546,6 +546,67 @@ describe Capybara::Driver::Webkit do
     end
   end
+  context "error app" do
+    before(:all) do
+      @app = lambda do |env|
+        if env['PATH_INFO'] == "/error"
+          [404, {}, []]
+        else
+          body = <<-HTML
+            <html><body>
+              <form action="/error"><input type="submit"/></form>
+            </body></html>
+          HTML
+          [200,
+            { 'Content-Type' => 'text/html', 'Content-Length' => body.length.to_s },
+            [body]]
+        end
+      end
+    end
+    it "raises a webkit error for the requested url" do
+      expect {
+        subject.find("//input").first.click
+        wait_for_error_to_complete
+        subject.find("//body")
+      }.
+        to raise_error(Capybara::Driver::Webkit::WebkitError, %r{/error})
+    end
+    def wait_for_error_to_complete
+      sleep(0.5)
+    end
+  end
+  context "slow error app" do
+    before(:all) do
+      @app = lambda do |env|
+        if env['PATH_INFO'] == "/error"
+          body = "error"
+          sleep(1)
+          [304, {}, []]
+        else
+          body = <<-HTML
+            <html><body>
+              <form action="/error"><input type="submit"/></form>
+              <p>hello</p>
+            </body></html>
+          HTML
+          [200,
+            { 'Content-Type' => 'text/html', 'Content-Length' => body.length.to_s },
+            [body]]
+        end
+      end
+    end
+    it "raises a webkit error and then continues" do
+      subject.find("//input").first.click
+      expect { subject.find("//p") }.to raise_error(Capybara::Driver::Webkit::WebkitError)
+      subject.visit("/")
+      subject.find("//p").first.text.should == "hello"
+    end
+  end
   context "popup app" do
     before(:all) do
       @app = lambda do |env|

data/spec/integration/driver_spec.rb CHANGED Viewed

@@ -9,9 +9,7 @@ describe Capybara::Driver::Webkit do
   # TODO: select options
   # it_should_behave_like "driver"
-  # TODO: bug with drag and drop
-  # it_should_behave_like "driver with javascript support"
+  it_should_behave_like "driver with javascript support"
   it_should_behave_like "driver with cookies support"
   # Can't support:

data/src/Command.h CHANGED Viewed

@@ -3,6 +3,7 @@
 #include <QObject>
 #include <QStringList>
+#include "Response.h"
 class WebPage;
@@ -14,7 +15,7 @@ class Command : public QObject {
     virtual void start(QStringList &arguments);
   signals:
-    void finished(bool success, QString &response);
+    void finished(Response *response);
   protected:
     WebPage *page();

data/src/Connection.cpp CHANGED Viewed

@@ -20,7 +20,10 @@ Connection::Connection(QTcpSocket *socket, WebPage *page, QObject *parent) :
   m_page = page;
   m_command = NULL;
   m_expectingDataSize = -1;
+  m_pageSuccess = true;
+  m_commandWaiting = false;
   connect(m_socket, SIGNAL(readyRead()), this, SLOT(checkNext()));
+  connect(m_page, SIGNAL(loadFinished(bool)), this, SLOT(pendingLoadFinished(bool)));
 }
 void Connection::checkNext() {
@@ -75,25 +78,32 @@ void Connection::processArgument(const char *data) {
   if (m_arguments.length() == m_argumentsExpected) {
     if (m_page->isLoading())
-      connect(m_page, SIGNAL(loadFinished(bool)), this, SLOT(pendingLoadFinished(bool)));
+      m_commandWaiting = true;
     else
       startCommand();
   }
 }
 void Connection::startCommand() {
-  m_command = createCommand(m_commandName.toAscii().constData());
-  if (m_command) {
-    connect(m_command,
-            SIGNAL(finished(bool, QString &)),
-            this,
-            SLOT(finishCommand(bool, QString &)));
-    m_command->start(m_arguments);
+  m_commandWaiting = false;
+  if (m_pageSuccess) {
+    m_command = createCommand(m_commandName.toAscii().constData());
+    if (m_command) {
+      connect(m_command,
+              SIGNAL(finished(Response *)),
+              this,
+              SLOT(finishCommand(Response *)));
+      m_command->start(m_arguments);
+    } else {
+      QString failure = QString("Unknown command: ") +  m_commandName + "\n";
+      writeResponse(new Response(false, failure));
+    }
+    m_commandName = QString();
   } else {
-    QString failure = QString("Unknown command: ") +  m_commandName + "\n";
-    writeResponse(false, failure);
+    m_pageSuccess = true;
+    QString message = m_page->failureString();
+    writeResponse(new Response(false, message));
   }
-  m_commandName = QString();
 }
 Command *Connection::createCommand(const char *name) {
@@ -102,31 +112,31 @@ Command *Connection::createCommand(const char *name) {
 }
 void Connection::pendingLoadFinished(bool success) {
-  m_page->disconnect(this, SLOT(pendingLoadFinished(bool)));
-  if (success) {
+  m_pageSuccess = success;
+  if (m_commandWaiting)
     startCommand();
-  } else {
-    QString response = m_page->failureString();
-    finishCommand(false, response);
-  }
 }
-void Connection::finishCommand(bool success, QString &response) {
+void Connection::finishCommand(Response *response) {
   m_command->deleteLater();
   m_command = NULL;
-  m_arguments.clear();
-  writeResponse(success, response);
+  writeResponse(response);
 }
-void Connection::writeResponse(bool success, QString &response) {
-  if (success)
+void Connection::writeResponse(Response *response) {
+  if (response->isSuccess())
     m_socket->write("ok\n");
   else
     m_socket->write("failure\n");
-  QByteArray response_utf8 = response.toUtf8();
-  QString responseLength = QString::number(response_utf8.size()) + "\n";
-  m_socket->write(responseLength.toAscii());
-  m_socket->write(response_utf8);
+  QByteArray messageUtf8 = response->message().toUtf8();
+  QString messageLength = QString::number(messageUtf8.size()) + "\n";
+  m_socket->write(messageLength.toAscii());
+  m_socket->write(messageUtf8);
+  delete response;
+  m_arguments.clear();
+  m_commandName = QString();
+  m_argumentsExpected = -1;
 }

data/src/Connection.h CHANGED Viewed

@@ -4,6 +4,7 @@
 class QTcpSocket;
 class WebPage;
 class Command;
+class Response;
 class Connection : public QObject {
   Q_OBJECT
@@ -13,7 +14,7 @@ class Connection : public QObject {
   public slots:
     void checkNext();
-    void finishCommand(bool success, QString &response);
+    void finishCommand(Response *response);
     void pendingLoadFinished(bool success);
   private:
@@ -23,7 +24,7 @@ class Connection : public QObject {
     Command *createCommand(const char *name);
     void processArgument(const char *line);
     void startCommand();
-    void writeResponse(bool success, QString &response);
+    void writeResponse(Response *response);
     QTcpSocket *m_socket;
     QString m_commandName;
@@ -32,5 +33,7 @@ class Connection : public QObject {
     int m_argumentsExpected;
     WebPage *m_page;
     int m_expectingDataSize;
+    bool m_pageSuccess;
+    bool m_commandWaiting;
 };

data/src/Evaluate.cpp CHANGED Viewed

@@ -9,7 +9,7 @@ Evaluate::Evaluate(WebPage *page, QObject *parent) : Command(page, parent) {
 void Evaluate::start(QStringList &arguments) {
   QVariant result = page()->currentFrame()->evaluateJavaScript(arguments[0]);
   addVariant(result);
-  emit finished(true, m_buffer);
+  emit finished(new Response(true, m_buffer));
 }
 void Evaluate::addVariant(QVariant &object) {

data/src/Execute.cpp CHANGED Viewed

@@ -7,12 +7,10 @@ Execute::Execute(WebPage *page, QObject *parent) : Command(page, parent) {
 void Execute::start(QStringList &arguments) {
   QString script = arguments[0] + QString("; 'success'");
   QVariant result = page()->currentFrame()->evaluateJavaScript(script);
-  QString response;
   if (result.isValid()) {
-    emit finished(true, response);
+    emit finished(new Response(true));
   } else {
-    response = "Javascript failed to execute";
-    emit finished(false, response);
+    emit finished(new Response(false, "Javascript failed to execute"));
   }
 }

data/src/Find.cpp CHANGED Viewed

@@ -6,15 +6,14 @@ Find::Find(WebPage *page, QObject *parent) : Command(page, parent) {
 }
 void Find::start(QStringList &arguments) {
-  QString response;
+  QString message;
   QVariant result = page()->invokeCapybaraFunction("find", arguments);
   if (result.isValid()) {
-    response = result.toString();
-    emit finished(true, response);
+    message = result.toString();
+    emit finished(new Response(true, message));
   } else {
-    response = "Invalid XPath expression";
-    emit finished(false, response);
+    emit finished(new Response(false, "Invalid XPath expression"));
   }
 }

data/src/FrameFocus.cpp CHANGED Viewed

@@ -50,8 +50,7 @@ void FrameFocus::focusId(QString name) {
 void FrameFocus::focusParent() {
   if (page()->currentFrame()->parentFrame() == 0) {
-    QString response = "Already at parent frame.";
-    emit finished(false, response);
+    emit finished(new Response(false, "Already at parent frame."));
   } else {
     page()->currentFrame()->parentFrame()->setFocus();
     success();
@@ -59,11 +58,9 @@ void FrameFocus::focusParent() {
 }
 void FrameFocus::frameNotFound() {
-  QString response = "Unable to locate frame. ";
-  emit finished(false, response);
+  emit finished(new Response(false, "Unable to locate frame. "));
 }
 void FrameFocus::success() {
-  QString response;
-  emit finished(true, response);
+  emit finished(new Response(true));
 }

data/src/Node.cpp CHANGED Viewed

@@ -9,6 +9,6 @@ void Node::start(QStringList &arguments) {
   QString functionName = functionArguments.takeFirst();
   QVariant result = page()->invokeCapybaraFunction(functionName, functionArguments);
   QString attributeValue = result.toString();
-  emit finished(true, attributeValue);
+  emit finished(new Response(true, attributeValue));
 }

data/src/Reset.cpp CHANGED Viewed

@@ -10,7 +10,6 @@ void Reset::start(QStringList &arguments) {
   page()->triggerAction(QWebPage::Stop);
   page()->currentFrame()->setHtml("<html><body></body></html>");
   page()->networkAccessManager()->setCookieJar(new QNetworkCookieJar());
-  QString response = "";
-  emit finished(true, response);
+  emit finished(new Response(true));
 }

data/src/Response.cpp ADDED Viewed

@@ -0,0 +1,19 @@
+#include "Response.h"
+#include <iostream>
+Response::Response(bool success, QString message) {
+  m_success = success;
+  m_message = message;
+}
+Response::Response(bool success) {
+  m_success = success;
+}
+bool Response::isSuccess() const {
+  return m_success;
+}
+QString Response::message() const {
+  return m_message;
+}

data/src/Response.h ADDED Viewed

@@ -0,0 +1,13 @@
+#include <QString>
+class Response {
+  public:
+    Response(bool success, QString message);
+    Response(bool success);
+    bool isSuccess() const;
+    QString message() const;
+  private:
+    bool m_success;
+    QString m_message;
+};

data/src/Source.cpp CHANGED Viewed

@@ -7,8 +7,7 @@ Source::Source(WebPage *page, QObject *parent) : Command(page, parent) {
 void Source::start(QStringList &arguments) {
   Q_UNUSED(arguments)
-  QString response = page()->currentFrame()->toHtml();
-  emit finished(true, response);
+  QString result = page()->currentFrame()->toHtml();
+  emit finished(new Response(true, result));
 }

data/src/Url.cpp CHANGED Viewed

@@ -9,8 +9,7 @@ void Url::start(QStringList &argments) {
   QUrl humanUrl = page()->currentFrame()->url();
   QByteArray encodedBytes = humanUrl.toEncoded();
-  QString response = QString(encodedBytes);
-  emit finished(true, response);
+  QString urlString = QString(encodedBytes);
+  emit finished(new Response(true, urlString));
 }

data/src/Visit.cpp CHANGED Viewed

@@ -11,10 +11,10 @@ void Visit::start(QStringList &arguments) {
 }
 void Visit::loadFinished(bool success) {
-  QString response;
+  QString message;
   if (!success)
-    response = page()->failureString();
+    message = page()->failureString();
-  emit finished(success, response);
+  emit finished(new Response(success, message));
 }

data/src/WebPage.cpp CHANGED Viewed

@@ -5,10 +5,15 @@
 WebPage::WebPage(QObject *parent) : QWebPage(parent) {
   QResource javascript(":/capybara.js");
-  char * javascriptString =  new char[javascript.size() + 1];
-  strcpy(javascriptString, (const char *)javascript.data());
-  javascriptString[javascript.size()] = 0;
-  m_capybaraJavascript = javascriptString;
+  if (javascript.isCompressed()) {
+    QByteArray uncompressedBytes(qUncompress(javascript.data(), javascript.size()));
+    m_capybaraJavascript = QString(uncompressedBytes);
+  } else {
+    char * javascriptString =  new char[javascript.size() + 1];
+    strcpy(javascriptString, (const char *)javascript.data());
+    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)));
@@ -82,6 +87,6 @@ bool WebPage::isLoading() const {
 }
 QString WebPage::failureString() {
-  return QString("Unable to load URL: ") + currentFrame()->url().toString();
+  return QString("Unable to load URL: ") + currentFrame()->requestedUrl().toString();
 }

data/src/capybara.js CHANGED Viewed

@@ -92,7 +92,59 @@ Capybara = {
   unselectOption: function(index) {
     this.nodes[index].removeAttribute("selected");
-  }
+  },
+  centerPostion: function(element) {
+    this.reflow(element);
+    var rect = element.getBoundingClientRect();
+    var position = {
+      x: rect.width / 2,
+      y: rect.height / 2
+    };
+    do {
+        position.x += element.offsetLeft;
+        position.y += element.offsetTop;
+    } while ((element = element.offsetParent));
+    position.x = Math.floor(position.x), position.y = Math.floor(position.y);
+    return position;
+  },
+  reflow: function(element, force) {
+    if (force || element.offsetWidth === 0) {
+      var prop, oldStyle = {}, newStyle = {position: "absolute", visibility : "hidden", display: "block" };
+      for (prop in newStyle)  {
+        oldStyle[prop] = element.style[prop];
+        element.style[prop] = newStyle[prop];
+      }
+      element.offsetWidth, element.offsetHeight; // force reflow
+      for (prop in oldStyle)
+        element.style[prop] = oldStyle[prop];
+    }
+  },
+  dragTo: function (index, targetIndex) {
+    var element = this.nodes[index], target = this.nodes[targetIndex];
+    var position = this.centerPostion(element);
+    var options = {
+      clientX: position.x,
+      clientY: position.y
+    };
+    var mouseTrigger = function(eventName, options) {
+      var eventObject = document.createEvent("MouseEvents");
+      eventObject.initMouseEvent(eventName, true, true, window, 0, 0, 0, options.clientX || 0, options.clientY || 0, false, false, false, false, 0, null);
+      element.dispatchEvent(eventObject);
+    }
+    mouseTrigger('mousedown', options);
+    options.clientX += 1, options.clientY += 1;
+    mouseTrigger('mousemove', options);
+    position = this.centerPostion(target), options = {
+      clientX: position.x,
+      clientY: position.y
+    };
+    mouseTrigger('mousemove', options);
+    mouseTrigger('mouseup', options);
+  }
 };

data/src/webkit_server.pro CHANGED Viewed

@@ -1,8 +1,8 @@
 TEMPLATE = app
 TARGET = webkit_server
 DESTDIR = .
-HEADERS = WebPage.h Server.h Connection.h Command.h Visit.h Find.h Reset.h Node.h JavascriptInvocation.h Url.h Source.h Evaluate.h Execute.h FrameFocus.h
-SOURCES = main.cpp WebPage.cpp Server.cpp Connection.cpp Command.cpp Visit.cpp Find.cpp Reset.cpp Node.cpp JavascriptInvocation.cpp Url.cpp Source.cpp Evaluate.cpp Execute.cpp FrameFocus.cpp
+HEADERS = WebPage.h Server.h Connection.h Command.h Visit.h Find.h Reset.h Node.h JavascriptInvocation.h Url.h Source.h Evaluate.h Execute.h FrameFocus.h Response.h
+SOURCES = main.cpp WebPage.cpp Server.cpp Connection.cpp Command.cpp Visit.cpp Find.cpp Reset.cpp Node.cpp JavascriptInvocation.cpp Url.cpp Source.cpp Evaluate.cpp Execute.cpp FrameFocus.cpp Response.cpp
 RESOURCES = webkit_server.qrc
 QT += network webkit
 CONFIG += console

metadata CHANGED Viewed

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: capybara-webkit
 version: !ruby/object:Gem::Version
-  hash: 23
+  hash: 19
   prerelease:
   segments:
   - 0
-  - 2
+  - 3
   - 0
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - thoughtbot
@@ -21,7 +21,7 @@ autorequire:
 bindir: bin
 cert_chain: []
-date: 2011-04-20 00:00:00 -04:00
+date: 2011-05-05 00:00:00 -04:00
 default_executable:
 dependencies:
 - !ruby/object:Gem::Dependency
@@ -86,6 +86,8 @@ files:
 - src/Node.h
 - src/Reset.cpp
 - src/Reset.h
+- src/Response.cpp
+- src/Response.h
 - src/Server.cpp
 - src/Server.h
 - src/Source.cpp