capybara-webkit 1.1.1 → 1.2.0

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

@@ -7,6 +7,13 @@ 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 \
@@ -18,7 +25,7 @@ HEADERS = \
   JavascriptConfirmMessages.h \
   JavascriptPromptMessages.h \
   IgnoreSslErrors.h \
-  ResizeWindow.h \
+  WindowResize.h \
   CurrentUrl.h \
   ConsoleMessages.h \
   WebPage.h \
@@ -68,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 \
@@ -82,7 +97,7 @@ SOURCES = \
   JavascriptConfirmMessages.cpp \
   JavascriptPromptMessages.cpp \
   IgnoreSslErrors.cpp \
-  ResizeWindow.cpp \
+  WindowResize.cpp \
   CurrentUrl.cpp \
   ConsoleMessages.cpp \
   main.cpp \
@@ -133,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

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: capybara-webkit
 version: !ruby/object:Gem::Version
-  version: 1.1.1
-  prerelease: 
+  version: 1.2.0
 platform: ruby
 authors:
 - thoughtbot
@@ -14,140 +13,138 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-25 00:00:00.000000000 Z
+date: 2014-07-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.0.2
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: 2.4.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 2.0.2
-    - - <
+    - - "<"
       - !ruby/object:Gem::Version
-        version: 2.2.0
+        version: 2.4.0
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.14.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 2.14.0
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: mini_magick
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: appraisal
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.4.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.4.0
 - !ruby/object:Gem::Dependency
   name: selenium-webdriver
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: launchy
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: 
@@ -157,9 +154,9 @@ extensions:
 - extconf.rb
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - Appraisals
 - CONTRIBUTING.md
 - GOALS
@@ -177,6 +174,10 @@ files:
 - gemfiles/2.0.gemfile.lock
 - gemfiles/2.1.gemfile
 - gemfiles/2.1.gemfile.lock
+- gemfiles/2.2.gemfile
+- gemfiles/2.2.gemfile.lock
+- gemfiles/2.3.gemfile
+- gemfiles/2.3.gemfile.lock
 - lib/capybara-webkit.rb
 - lib/capybara/webkit.rb
 - lib/capybara/webkit/browser.rb
@@ -202,6 +203,7 @@ files:
 - spec/self_signed_ssl_cert.rb
 - spec/spec_helper.rb
 - spec/support/app_runner.rb
+- spec/support/matchers/include_response.rb
 - src/Authenticate.cpp
 - src/Authenticate.h
 - src/Body.h
@@ -243,6 +245,10 @@ files:
 - src/GetWindowHandle.h
 - src/GetWindowHandles.cpp
 - src/GetWindowHandles.h
+- src/GoBack.cpp
+- src/GoBack.h
+- src/GoForward.cpp
+- src/GoForward.h
 - src/Header.cpp
 - src/Header.h
 - src/Headers.cpp
@@ -283,8 +289,6 @@ files:
 - src/Render.h
 - src/Reset.cpp
 - src/Reset.h
-- src/ResizeWindow.cpp
-- src/ResizeWindow.h
 - src/Response.cpp
 - src/Response.h
 - src/Server.cpp
@@ -309,6 +313,8 @@ files:
 - src/SocketCommand.h
 - src/Status.cpp
 - src/Status.h
+- src/StdinNotifier.cpp
+- src/StdinNotifier.h
 - src/TimeoutCommand.cpp
 - src/TimeoutCommand.h
 - src/Title.cpp
@@ -323,8 +329,20 @@ files:
 - src/WebPage.h
 - src/WebPageManager.cpp
 - src/WebPageManager.h
+- src/WindowClose.cpp
+- src/WindowClose.h
+- src/WindowCommand.cpp
+- src/WindowCommand.h
 - src/WindowFocus.cpp
 - src/WindowFocus.h
+- src/WindowMaximize.cpp
+- src/WindowMaximize.h
+- src/WindowOpen.cpp
+- src/WindowOpen.h
+- src/WindowResize.cpp
+- src/WindowResize.h
+- src/WindowSize.cpp
+- src/WindowSize.h
 - src/body.cpp
 - src/capybara.js
 - src/find_command.h
@@ -342,29 +360,39 @@ files:
 homepage: http://github.com/thoughtbot/capybara-webkit
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.0
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 3687364731503617195
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.2.0
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Headless Webkit driver for Capybara
-test_files: []
+test_files:
+- spec/browser_spec.rb
+- spec/capybara_webkit_builder_spec.rb
+- spec/connection_spec.rb
+- spec/cookie_jar_spec.rb
+- spec/driver_rendering_spec.rb
+- spec/driver_resize_window_spec.rb
+- spec/driver_spec.rb
+- spec/errors_spec.rb
+- spec/integration/session_spec.rb
+- spec/selenium_compatibility_spec.rb
+- spec/self_signed_ssl_cert.rb
+- spec/spec_helper.rb
+- spec/support/app_runner.rb
+- spec/support/matchers/include_response.rb