capybara-webkit 0.6.0 → 0.6.1

data/capybara-webkit.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = "capybara-webkit"
-  s.version = "0.6.0"
+  s.version = "0.6.1"
   s.authors = ["thoughtbot", "Joe Ferris", "Jason Morrison", "Tristan Dunn",
                "Joshua Clayton", "Yuichi Tateno", "Aaron Gibralter",
                "Vasily Reys", "petrushka", "John Bintz", "Chad Pytel",

data/lib/capybara/driver/webkit.rb

@@ -54,11 +54,11 @@ class Capybara::Driver::Webkit
   end
 
   def response_headers
-    raise Capybara::NotSupportedByDriverError
+    browser.response_headers
   end
 
   def status_code
-    raise Capybara::NotSupportedByDriverError
+    browser.status_code
   end
 
   def within_frame(frame_id_or_index)

data/lib/capybara/driver/webkit/browser.rb

@@ -1,4 +1,5 @@
 require 'socket'
+require 'thread'
 require 'capybara/util/timeout'
 require 'json'
 
@@ -8,6 +9,9 @@ class Capybara::Driver::Webkit
 
     def initialize(options = {})
       @socket_class = options[:socket_class] || TCPSocket
+      @stdout       = options.has_key?(:stdout) ?
+                        options[:stdout] :
+                        $stdout
       start_server
       connect
     end
@@ -36,6 +40,14 @@ class Capybara::Driver::Webkit
       command("Source")
     end
 
+    def status_code
+      command("Status").to_i
+    end
+
+    def response_headers
+      Hash[command("Headers").split("\n").map { |header| header.split(": ") }]
+    end
+
     def url
       command("Url")
     end
@@ -77,23 +89,27 @@ class Capybara::Driver::Webkit
     private
 
     def start_server
-      read_pipe, write_pipe = fork_server
-      @server_port = discover_server_port(read_pipe)
+      pipe = fork_server
+      @server_port = discover_server_port(pipe)
+      @stdout_thread = Thread.new do
+        Thread.current.abort_on_exception = true
+        forward_stdout(pipe)
+      end
     end
 
     def fork_server
       server_path = File.expand_path("../../../../../bin/webkit_server", __FILE__)
 
-      read_pipe, write_pipe = IO.pipe
-      @pid = fork do
-        $stdout.reopen write_pipe
-        read_pipe.close
-        exec(server_path)
-      end
+      pipe, @pid = server_pipe_and_pid(server_path)
+
       at_exit { Process.kill("INT", @pid) }
 
-      write_pipe.close
-      [read_pipe, write_pipe]
+      pipe
+    end
+
+    def server_pipe_and_pid(server_path)
+      pipe = IO.popen(server_path)
+      [pipe, pipe.pid]
     end
 
     def discover_server_port(read_pipe)
@@ -101,6 +117,31 @@ class Capybara::Driver::Webkit
       ((read_pipe.first || '').match(/listening on port: (\d+)/) || [])[1].to_i
     end
 
+    def forward_stdout(pipe)
+      while pipe_readable?(pipe)
+        line = pipe.readline
+        if @stdout
+          @stdout.write(line)
+          @stdout.flush
+        end
+      end
+    rescue EOFError
+    end
+
+    if !defined?(RUBY_ENGINE) || (RUBY_ENGINE == "ruby" && RUBY_VERSION <= "1.8")
+      # please note the use of IO::select() here, as it is used specifically to
+      # preserve correct signal handling behavior in ruby 1.8.
+      # https://github.com/thibaudgg/rb-fsevent/commit/d1a868bf8dc72dbca102bedbadff76c7e6c2dc21
+      # https://github.com/thibaudgg/rb-fsevent/blob/1ca42b987596f350ee7b19d8f8210b7b6ae8766b/ext/fsevent/fsevent_watch.c#L171
+      def pipe_readable?(pipe)
+        IO.select([pipe])
+      end
+    else
+      def pipe_readable?(pipe)
+        !pipe.eof?
+      end
+    end
+
     def connect
       Capybara.timeout(5) do
         attempt_connect

data/spec/browser_spec.rb

@@ -1,4 +1,5 @@
 require 'spec_helper'
+require 'stringio'
 require 'capybara/driver/webkit/browser'
 
 describe Capybara::Driver::Webkit::Browser do
@@ -22,5 +23,13 @@ describe Capybara::Driver::Webkit::Browser do
       new_browser.server_port.should_not == browser.server_port
     end
   end
+  
+  it 'forwards stdout to the given IO object' do
+    io = StringIO.new
+    new_browser = Capybara::Driver::Webkit::Browser.new(:stdout => io)
+    new_browser.execute_script('console.log("hello world")')
+    sleep(0.5)
+    io.string.should == "hello world\n"
+  end
 
 end

data/spec/driver_spec.rb

@@ -267,6 +267,7 @@ describe Capybara::Driver::Webkit do
           <html><body>
             <form action="/" method="GET">
               <input type="text" name="foo" value="bar"/>
+              <input type="text" name="maxlength_foo" value="bar" maxlength="10"/>
               <input type="text" id="disabled_input" disabled="disabled"/>
               <input type="checkbox" name="checkedbox" value="1" checked="checked"/>
               <input type="checkbox" name="uncheckedbox" value="2"/>
@@ -312,6 +313,24 @@ describe Capybara::Driver::Webkit do
       input.value.should == "newvalue"
     end
 
+    it "sets an input's value greater than the max length" do
+      input = subject.find("//input[@name='maxlength_foo']").first
+      input.set("allegories (poems)")
+      input.value.should == "allegories"
+    end
+
+    it "sets an input's value equal to the max length" do
+      input = subject.find("//input[@name='maxlength_foo']").first
+      input.set("allegories")
+      input.value.should == "allegories"
+    end
+
+    it "sets an input's value less than the max length" do
+      input = subject.find("//input[@name='maxlength_foo']").first
+      input.set("poems")
+      input.value.should == "poems"
+    end
+
     it "sets an input's nil value" do
       input = subject.find("//input").first
       input.set(nil)

data/spec/integration/driver_spec.rb

@@ -6,18 +6,15 @@ describe Capybara::Driver::Webkit do
     @driver = Capybara::Driver::Webkit.new(TestApp, :browser => $webkit_browser)
   end
 
-  # TODO: select options
-  # it_should_behave_like "driver"
-
+  it_should_behave_like "driver"
   it_should_behave_like "driver with javascript support"
   it_should_behave_like "driver with cookies support"
-  
+  it_should_behave_like "driver with header support"
+  it_should_behave_like "driver with status code support"
+  it_should_behave_like "driver with frame support"
+
   it "returns the rack server port" do
     @driver.server_port.should  eq(@driver.instance_variable_get(:@rack_server).port)
   end
 
-  # Can't support:
-  # it_should_behave_like "driver with header support"
-  # it_should_behave_like "driver with status code support"
-  # it_should_behave_like "driver with frame support"
 end

data/spec/spec_helper.rb

@@ -18,7 +18,7 @@ end
 require File.join(spec_dir,"spec_helper")
 
 require 'capybara/driver/webkit/browser'
-$webkit_browser = Capybara::Driver::Webkit::Browser.new(:socket_class => TCPSocket)
+$webkit_browser = Capybara::Driver::Webkit::Browser.new(:socket_class => TCPSocket, :stdout => nil)
 
 Capybara.register_driver :reusable_webkit do |app|
   Capybara::Driver::Webkit.new(app, :browser => $webkit_browser)

data/src/Connection.cpp

@@ -13,6 +13,8 @@
 #include "Header.h"
 #include "Render.h"
 #include "Body.h"
+#include "Status.h"
+#include "Headers.h"
 
 #include <QTcpSocket>
 #include <iostream>

data/src/Headers.cpp

@@ -0,0 +1,11 @@
+#include "Headers.h"
+#include "WebPage.h"
+
+Headers::Headers(WebPage *page, QObject *parent) : Command(page, parent) {
+}
+
+void Headers::start(QStringList &arguments) {
+  Q_UNUSED(arguments);
+  emit finished(new Response(true, page()->pageHeaders()));
+}
+

data/src/Headers.h

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

data/src/Status.cpp

@@ -0,0 +1,13 @@
+#include "Status.h"
+#include "WebPage.h"
+#include <sstream>
+
+Status::Status(WebPage *page, QObject *parent) : Command(page, parent) {
+}
+
+void Status::start(QStringList &arguments) {
+  Q_UNUSED(arguments);
+  int status = page()->getLastStatus();
+  emit finished(new Response(true, QString::number(status)));
+}
+

data/src/Status.h

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

data/src/WebPage.cpp

@@ -10,7 +10,9 @@ WebPage::WebPage(QObject *parent) : QWebPage(parent) {
 
   m_loading = false;
 
-  this->setNetworkAccessManager(new NetworkAccessManager());
+  NetworkAccessManager *manager = new NetworkAccessManager();
+  this->setNetworkAccessManager(manager);
+  connect(manager, SIGNAL(finished(QNetworkReply *)), this, SLOT(replyFinished(QNetworkReply *)));
 
   connect(this, SIGNAL(loadStarted()), this, SLOT(loadStarted()));
   connect(this, SIGNAL(loadFinished(bool)), this, SLOT(loadFinished(bool)));
@@ -164,3 +166,24 @@ bool WebPage::extension(Extension extension, const ExtensionOption *option, Exte
 QString WebPage::getLastAttachedFileName() {
   return currentFrame()->evaluateJavaScript(QString("Capybara.lastAttachedFile")).toString();
 }
+
+void WebPage::replyFinished(QNetworkReply *reply) {
+  QStringList headers;
+  lastStatus = reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt();
+  QList<QByteArray> list = reply->rawHeaderList();
+
+  int length = list.size();
+  for(int i = 0; i < length; i++) {
+    headers << list.at(i)+": "+reply->rawHeader(list.at(i));
+  }
+
+  m_pageHeaders = headers.join("\n");
+}
+
+int WebPage::getLastStatus() {
+  return lastStatus;
+}
+
+QString WebPage::pageHeaders() {
+  return m_pageHeaders;
+}

data/src/WebPage.h

@@ -10,6 +10,7 @@ class WebPage : public QWebPage {
     QString failureString();
     QString userAgentForUrl(const QUrl &url ) const;
     void setUserAgent(QString userAgent);
+    int getLastStatus();
     bool render(const QString &fileName);
     virtual bool extension (Extension extension, const ExtensionOption *option=0, ExtensionReturn *output=0);
 
@@ -19,7 +20,9 @@ class WebPage : public QWebPage {
     void loadStarted();
     void loadFinished(bool);
     bool isLoading() const;
+    QString pageHeaders();
     void frameCreated(QWebFrame *);
+    void replyFinished(QNetworkReply *reply);
 
   protected:
     virtual void javaScriptConsoleMessage(const QString &message, int lineNumber, const QString &sourceID);
@@ -35,5 +38,7 @@ class WebPage : public QWebPage {
     QString getLastAttachedFileName();
     void loadJavascript();
     void setUserStylesheet();
+    int lastStatus;
+    QString m_pageHeaders;
 };
 

data/src/capybara.js

@@ -105,7 +105,14 @@ Capybara = {
     if (type == "text" || type == "textarea" || type == "password") {
       this.trigger(index, "focus");
       node.value = "";
-      var length = this.attribute(index, "maxlength") || value.length;
+      var maxLength = this.attribute(index, "maxlength"),
+          length;
+      if (maxLength && value.length > maxLength) {
+        length = maxLength;
+      } else {
+        length = value.length;
+      }
+
       for(var strindex = 0; strindex < length; strindex++) {
         node.value += value[strindex];
         this.trigger(index, "keydown");

data/src/find_command.h

@@ -15,3 +15,5 @@ CHECK_COMMAND(FrameFocus)
 CHECK_COMMAND(Header)
 CHECK_COMMAND(Render)
 CHECK_COMMAND(Body)
+CHECK_COMMAND(Status)
+CHECK_COMMAND(Headers)

data/src/main.cpp

@@ -1,8 +1,18 @@
 #include "Server.h"
 #include <QtGui>
 #include <iostream>
+#ifdef Q_OS_UNIX
+  #include <unistd.h>
+#endif
 
 int main(int argc, char **argv) {
+#ifdef Q_OS_UNIX
+  if (setpgid(0, 0) < 0) {
+    std::cerr << "Unable to set new process group." << std::endl;
+    return 1;
+  }
+#endif
+
   QApplication app(argc, argv);
   app.setApplicationName("capybara-webkit");
   app.setOrganizationName("thoughtbot, inc");

data/src/webkit_server.pro

@@ -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 Response.h NetworkAccessManager.h Header.h Render.h body.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 NetworkAccessManager.cpp Header.cpp Render.cpp body.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 NetworkAccessManager.h Header.h Render.h body.h Status.h Headers.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 NetworkAccessManager.cpp Header.cpp Render.cpp body.cpp Status.cpp Headers.cpp
 RESOURCES = webkit_server.qrc
 QT += network webkit
 CONFIG += console

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: capybara-webkit
 version: !ruby/object:Gem::Version 
-  hash: 7
   prerelease: 
-  segments: 
-  - 0
-  - 6
-  - 0
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors: 
 - thoughtbot
@@ -30,25 +25,20 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-12 00:00:00 -04:00
+date: 2011-08-25 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  type: :runtime
+  name: capybara
+  prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 0
-        - 0
         version: 1.0.0
+  type: :runtime
   version_requirements: *id001
-  name: capybara
-  prerelease: false
 description: 
 email: support@thoughtbot.com
 executables: []
@@ -96,6 +86,8 @@ files:
 - src/FrameFocus.h
 - src/Header.cpp
 - src/Header.h
+- src/Headers.cpp
+- src/Headers.h
 - src/JavascriptInvocation.cpp
 - src/JavascriptInvocation.h
 - src/NetworkAccessManager.cpp
@@ -112,6 +104,8 @@ files:
 - src/Server.h
 - src/Source.cpp
 - src/Source.h
+- src/Status.cpp
+- src/Status.h
 - src/Url.cpp
 - src/Url.h
 - src/Visit.cpp
@@ -141,23 +135,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.6.1
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Headless Webkit driver for Capybara