capybara-webkit 0.11.0 → 0.12.0

data/.gitignore

@@ -1,5 +1,5 @@
 *.swp
-bin/webkit_server
+bin/webkit_server*
 *.swo
 *~
 *.o
@@ -12,6 +12,8 @@ moc_*.cpp
 .bundle
 pkg
 src/webkit_server
+src/webkit_server.exe
 .DS_Store
 tmp
 .rvmrc
+src/debug

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    capybara-webkit (0.10.1)
+    capybara-webkit (0.12.0)
       capybara (>= 1.0.0, < 1.2)
       json
 
@@ -22,8 +22,8 @@ GEM
       ffi (~> 1.0.6)
     diff-lcs (1.1.2)
     ffi (1.0.11)
-    json (1.6.5)
-    mime-types (1.17.2)
+    json (1.7.1)
+    mime-types (1.18)
     mini_magick (3.2.1)
       subexec (~> 0.0.4)
     multi_json (1.0.4)
@@ -40,7 +40,7 @@ GEM
     rspec-expectations (2.6.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.6.0)
-    rubyzip (0.9.6.1)
+    rubyzip (0.9.7)
     selenium-webdriver (2.19.0)
       childprocess (>= 0.2.5)
       ffi (~> 1.0.9)
@@ -56,6 +56,7 @@ GEM
 
 PLATFORMS
   ruby
+  x86-mingw32
 
 DEPENDENCIES
   appraisal (~> 0.4.0)

data/NEWS.md

@@ -1,3 +1,14 @@
+New for 0.12.0:
+* Better windows support
+* Support for localStorage
+* Added support for oninput event
+* Added resize_window method
+* Server binds on LocalHost to prevent having to add firewall exceptions
+* Reuse NetworkAccessManager to prevent "too many open files" errors
+* Response messages are stored as QByteArray to prevent truncating content
+* Browser no longer tries to read empty responses (Fixes jruby issues).
+* Server will timeout if it can not start
+
 New for 0.11.0:
 
 * Allow interaction with invisible elements

data/README.md

@@ -11,6 +11,11 @@ development toolkit. You'll need to download the Qt libraries to build and
 install the gem. You can find instructions for downloading and installing QT on
 the [capybara-webkit wiki](https://github.com/thoughtbot/capybara-webkit/wiki/Installing-Qt-and-compiling-capybara-webkit)
 
+Windows Support
+---------------
+
+Currently 32bit Windows will compile Capybara-webkit. Support for Windows is provided by the open source community and Windows related issues should be posted to the [mailing list](http://groups.google.com/group/capybara-webkit)
+
 Reporting Issues
 ----------------
 
@@ -50,6 +55,43 @@ In RSpec, use the :js => true flag.
 
 Take note of the transactional fixtures section of the [capybara README](https://github.com/jnicklas/capybara/blob/master/README.md).
 
+If you're using capybara-webkit with Sinatra, don't forget to set
+
+    Capybara.app = MySinatraApp.new
+
+Non-Standard Driver Methods
+---------------------------
+
+capybara-webkit supports a few methods that are not part of the standard capybara API. You can access these by calling `driver` on the capybara session. When using the DSL, that will look like `page.driver.method_name`.
+
+**console_messages**: returns an array of messages printed using console.log
+
+    # In Javascript:
+    console.log("hello")
+    # In Ruby:
+    page.driver.console_messages
+    => {:source=>"http://example.com", :line_number=>1, :message=>"hello"}
+
+**error_messages**: returns an array of Javascript errors that occurred
+
+    page.driver.error_messages
+    => {:source=>"http://example.com", :line_number=>1, :message=>"SyntaxError: Parse error"}
+
+**resize_window**: change the viewport size to the given width and height
+
+    page.driver.resize_window(500, 300)
+    page.driver.evaluate_script("window.innerWidth")
+    => 500
+
+**render**: render a screenshot of the current view (requires [mini_magick](https://github.com/probablycorey/mini_magick) and [ImageMagick](http://www.imagemagick.org))
+
+    page.driver.render "tmp/screenshot.png"
+
+**cookies**: allows read-only access of cookies for the current session
+
+    page.driver.cookies["alpha"]
+    => "abc"
+
 Contributing
 ------------
 

data/lib/capybara/driver/webkit.rb

@@ -1,6 +1,7 @@
 require "capybara"
 require "capybara/driver/webkit/version"
 require "capybara/driver/webkit/node"
+require "capybara/driver/webkit/connection"
 require "capybara/driver/webkit/browser"
 require "capybara/driver/webkit/socket_debugger"
 require "capybara/driver/webkit/cookie_jar"
@@ -22,8 +23,8 @@ class Capybara::Driver::Webkit
     @options = options
     @rack_server = Capybara::Server.new(@app)
     @rack_server.boot if Capybara.run_server
-    @browser = options[:browser] || Browser.new(
-      :ignore_ssl_errors => options[:ignore_ssl_errors])
+    @browser = options[:browser] || Browser.new(Connection.new(options))
+    @browser.ignore_ssl_errors if options[:ignore_ssl_errors]
   end
 
   def current_url
@@ -79,6 +80,10 @@ class Capybara::Driver::Webkit
     browser.status_code
   end
 
+  def resize_window(width, height)
+    browser.resize_window(width, height)
+  end
+
   def within_frame(frame_id_or_index)
     browser.frame_focus(frame_id_or_index)
     begin

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

@@ -1,20 +1,9 @@
-require 'socket'
-require 'thread'
-require 'timeout'
 require 'json'
 
 class Capybara::Driver::Webkit
   class Browser
-    attr :server_port
-
-    def initialize(options = {})
-      @socket_class = options[:socket_class] || TCPSocket
-      @stdout       = options.has_key?(:stdout) ?
-                        options[:stdout] :
-                        $stdout
-      @ignore_ssl_errors = options[:ignore_ssl_errors]
-      start_server
-      connect
+    def initialize(connection)
+      @connection = connection
     end
 
     def visit(url)
@@ -84,12 +73,16 @@ class Capybara::Driver::Webkit
       end
     end
 
+    def ignore_ssl_errors
+      command("IgnoreSslErrors")
+    end
+
     def command(name, *args)
-      @socket.puts name
-      @socket.puts args.size
+      @connection.puts name
+      @connection.puts args.size
       args.each do |arg|
-        @socket.puts arg.to_s.bytesize
-        @socket.print arg.to_s
+        @connection.puts arg.to_s.bytesize
+        @connection.print arg.to_s
       end
       check
       read_response
@@ -129,85 +122,14 @@ class Capybara::Driver::Webkit
       command("SetProxy")
     end
 
-    private
-
-    def start_server
-      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__)
-      pipe, @pid = server_pipe_and_pid(server_path)
-      register_shutdown_hook
-      pipe
-    end
-
-    def register_shutdown_hook
-      @owner_pid = Process.pid
-      at_exit do
-        if Process.pid == @owner_pid
-          Process.kill("INT", @pid)
-        end
-      end
-    end
-
-    def server_pipe_and_pid(server_path)
-      cmdline = [server_path]
-      cmdline << "--ignore-ssl-errors" if @ignore_ssl_errors
-      pipe = IO.popen(cmdline.join(" "))
-      [pipe, pipe.pid]
-    end
-
-    def discover_server_port(read_pipe)
-      return unless IO.select([read_pipe], nil, nil, 10)
-      ((read_pipe.first || '').match(/listening on port: (\d+)/) || [])[1].to_i
+    def resize_window(width, height)
+      command("ResizeWindow", width.to_i, height.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
-      Timeout.timeout(5) do
-        while @socket.nil?
-          attempt_connect
-        end
-      end
-    end
-
-    def attempt_connect
-      @socket = @socket_class.open("127.0.0.1", @server_port)
-    rescue Errno::ECONNREFUSED
-    end
+    private
 
     def check
-      result = @socket.gets
+      result = @connection.gets
       result.strip! if result
 
       if result.nil?
@@ -220,10 +142,14 @@ class Capybara::Driver::Webkit
     end
 
     def read_response
-      response_length = @socket.gets.to_i
-      response = @socket.read(response_length)
-      response.force_encoding("UTF-8") if response.respond_to?(:force_encoding)
-      response
+      response_length = @connection.gets.to_i
+      if response_length > 0
+        response = @connection.read(response_length)
+        response.force_encoding("UTF-8") if response.respond_to?(:force_encoding)
+        response
+      else
+        ""
+      end
     end
 
     def default_proxy_options

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

@@ -0,0 +1,120 @@
+require 'socket'
+require 'timeout'
+require 'thread'
+
+class Capybara::Driver::Webkit
+  class Connection
+    WEBKIT_SERVER_START_TIMEOUT = 15
+
+    attr_reader :port
+
+    def initialize(options = {})
+      @socket_class = options[:socket_class] || TCPSocket
+      @stdout       = options.has_key?(:stdout) ?
+                        options[:stdout] :
+                        $stdout
+      start_server
+      connect
+    end
+
+    def puts(string)
+      @socket.puts string
+    end
+
+    def print(string)
+      @socket.print string
+    end
+
+    def gets
+      @socket.gets
+    end
+
+    def read(length)
+      @socket.read(length)
+    end
+
+    private
+
+    def start_server
+      pipe = fork_server
+      @port = discover_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__)
+      pipe, @pid = server_pipe_and_pid(server_path)
+      register_shutdown_hook
+      pipe
+    end
+
+    def kill_process(pid)
+      if RUBY_PLATFORM =~ /mingw32/
+        Process.kill(9, pid)
+      else
+        Process.kill("INT", pid)
+      end
+    end
+
+    def register_shutdown_hook
+      @owner_pid = Process.pid
+      at_exit do
+        if Process.pid == @owner_pid
+          kill_process(@pid)
+        end
+      end
+    end
+
+    def server_pipe_and_pid(server_path)
+      cmdline = [server_path]
+      pipe = IO.popen(cmdline.join(" "))
+      [pipe, pipe.pid]
+    end
+
+    def discover_port(read_pipe)
+      return unless IO.select([read_pipe], nil, nil, WEBKIT_SERVER_START_TIMEOUT)
+      ((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
+
+    def connect
+      Timeout.timeout(5) do
+        while @socket.nil?
+          attempt_connect
+        end
+      end
+    end
+
+    def attempt_connect
+      @socket = @socket_class.open("127.0.0.1", @port)
+    rescue Errno::ECONNREFUSED
+    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
+  end
+end

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

@@ -1,7 +1,7 @@
 module Capybara
   module Driver
     class Webkit
-      VERSION = '0.11.0'.freeze
+      VERSION = '0.12.0'.freeze
     end
   end
 end

data/lib/capybara/webkit/matchers.rb

@@ -1,9 +1,7 @@
 module Capybara
   module Webkit
     module RspecMatchers
-      extend RSpec::Matchers::DSL
-
-      matcher :have_errors do |expected|
+      RSpec::Matchers.define :have_errors do |expected|
         match do |actual|
           actual = resolve(actual)
           actual.error_messages.any?
@@ -12,6 +10,7 @@ module Capybara
         failure_message_for_should do |actual|
           "Expected Javascript errors, but there were none."
         end
+        
         failure_message_for_should_not do |actual|
           actual = resolve(actual)
           "Expected no Javascript errors, got:\n#{error_messages_for(actual)}"
@@ -33,7 +32,6 @@ module Capybara
           end
         end
       end
-
     end
   end
 end