capybara-webkit 1.1.1 → 1.2.0

data/spec/selenium_compatibility_spec.rb

@@ -10,6 +10,8 @@ describe Capybara::Webkit, 'compatibility with selenium' do
           <label for="one">One</label><input type="text" name="one" id="one" />
           <label for="two">Two</label><input type="text" name="two" id="two" />
           <label for="three">Three</label><input type="text" name="three" id="three" readonly="readonly" />
+          <label for="textarea">Textarea</label>
+          <textarea name="textarea" id="textarea"></textarea>
           <input type="submit" value="Submit" id="submit" />
         </form>
         <script type="text/javascript">
@@ -35,6 +37,7 @@ describe Capybara::Webkit, 'compatibility with selenium' do
       fill_in "One", :with => "a new value"
       fill_in "Two", :with => "other value"
       fill_in "Three", :with => "readonly value"
+      fill_in "Textarea", :with => "last value"
       click_button "Submit"
     end
   end

data/spec/spec_helper.rb

@@ -10,8 +10,8 @@ $LOAD_PATH << File.join(PROJECT_ROOT, 'lib')
 Dir[File.join(PROJECT_ROOT, 'spec', 'support', '**', '*.rb')].each { |file| require(file) }
 
 require 'capybara/webkit'
-connection = Capybara::Webkit::Connection.new(:socket_class => TCPSocket)
-$webkit_browser = Capybara::Webkit::Browser.new(connection)
+$webkit_connection = Capybara::Webkit::Connection.new(:socket_class => TCPSocket)
+$webkit_browser = Capybara::Webkit::Browser.new($webkit_connection)
 
 if ENV['DEBUG']
   $webkit_browser.enable_logging
@@ -24,8 +24,27 @@ Capybara.register_driver :reusable_webkit do |app|
 end
 
 RSpec.configure do |c|
-  c.filter_run_excluding :skip_on_windows => !(RbConfig::CONFIG['host_os'] =~ /mingw32/).nil?
   Capybara::SpecHelper.configure(c)
+
+  c.filter_run_excluding :skip_on_windows => !(RbConfig::CONFIG['host_os'] =~ /mingw32/).nil?
+  c.filter_run_excluding :skip_on_jruby => !defined?(::JRUBY_VERSION).nil?
+
+  # We can't support outerWidth and outerHeight without a visible window.
+  # We focus the next window instead of failing when closing windows.
+  c.filter_run_excluding :full_description =>
+    /Capybara::Session webkit Capybara::Window #(size|resize_to|maximize|close.*no_such_window_error)/
+
+  # Capybara's integration tests expect "capybara/" in the default path
+  c.around :requires => :screenshot do |example|
+    old_path = Capybara.save_and_open_page_path
+    Capybara.save_and_open_page_path = File.join(PROJECT_ROOT, 'tmp', 'capybara')
+
+    begin
+      example.run
+    ensure
+    Capybara.save_and_open_page_path = old_path
+    end
+  end
 end
 
 def with_env_vars(vars)

data/spec/support/matchers/include_response.rb

@@ -0,0 +1,24 @@
+RSpec::Matchers.define :include_response do |expected_response|
+  read_timeout = 2
+  read_bytes = 4096
+  response = ""
+
+  match do |read_io|
+    found_response = false
+
+    while !found_response && IO.select([read_io], nil, nil, read_timeout) do
+      response += read_io.read_nonblock(read_bytes)
+      found_response = response.include?(expected_response)
+    end
+
+    found_response
+  end
+
+  failure_message_for_should do |actual|
+    "expected #{response} to include #{expected_response}"
+  end
+
+  failure_message_for_should_not do |actual|
+    "expected #{response} to not include #{expected_response}"
+  end
+end

data/src/CommandFactory.cpp

@@ -20,7 +20,7 @@
 #include "CurrentUrl.h"
 #include "SetTimeout.h"
 #include "GetTimeout.h"
-#include "ResizeWindow.h"
+#include "WindowResize.h"
 #include "IgnoreSslErrors.h"
 #include "SetSkipImageLoading.h"
 #include "WindowFocus.h"
@@ -40,6 +40,12 @@
 #include "Version.h"
 #include "Title.h"
 #include "FindCss.h"
+#include "WindowClose.h"
+#include "WindowOpen.h"
+#include "WindowSize.h"
+#include "WindowMaximize.h"
+#include "GoBack.h"
+#include "GoForward.h"
 
 CommandFactory::CommandFactory(WebPageManager *manager, QObject *parent) : QObject(parent) {
   m_manager = manager;

data/src/GoBack.cpp

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

data/src/GoBack.h

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

data/src/GoForward.cpp

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

data/src/GoForward.h

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

data/src/Render.cpp

@@ -1,6 +1,7 @@
 #include "Render.h"
 #include "WebPage.h"
 #include "WebPageManager.h"
+#include "ErrorMessage.h"
 
 Render::Render(WebPageManager *manager, QStringList &arguments, QObject *parent) : SocketCommand(manager, arguments, parent) {
 }
@@ -14,5 +15,13 @@ void Render::start() {
 
   bool result = page()->render( imagePath, size );
 
-  finish(result);
+  if (result) {
+    finish(true);
+  } else {
+    const QString failure = QString("Unable to save %1x%2 image to %3").
+      arg(width).
+      arg(height).
+      arg(imagePath);
+    finish(false, new ErrorMessage(failure));
+  }
 }

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."));
+}