capybara-webkit 0.12.1 → 0.13.0

data/lib/capybara/{driver/webkit → webkit}/cookie_jar.rb

@@ -3,7 +3,7 @@ require 'webrick'
 # A simple cookie jar implementation.
 # Does not take special cookie attributes
 # into account like expire, max-age, httponly, secure
-class Capybara::Driver::Webkit::CookieJar
+class Capybara::Webkit::CookieJar
   attr_reader :browser
 
   def initialize(browser)

data/lib/capybara/webkit/driver.rb

@@ -0,0 +1,186 @@
+require "capybara"
+require "capybara/webkit/version"
+require "capybara/webkit/node"
+require "capybara/webkit/connection"
+require "capybara/webkit/browser"
+require "capybara/webkit/socket_debugger"
+require "capybara/webkit/cookie_jar"
+require "capybara/webkit/errors"
+
+module Capybara::Webkit
+  class Driver
+    attr_reader :browser
+
+    def initialize(app, options={})
+      @app = app
+      @options = options
+      @rack_server = Capybara::Server.new(@app)
+      @rack_server.boot if Capybara.run_server
+      @browser = options[:browser] || Browser.new(Connection.new(options))
+    end
+
+    def enable_logging
+      browser.enable_logging
+    end
+
+    def current_url
+      browser.current_url
+    end
+
+    def requested_url
+      browser.requested_url
+    end
+
+    def visit(path)
+      browser.visit(url(path))
+    end
+
+    def find(query)
+      browser.find(query).map { |native| Node.new(self, native) }
+    end
+
+    def source
+      browser.source
+    end
+
+    def body
+      browser.body
+    end
+
+    def header(key, value)
+      browser.header(key, value)
+    end
+
+    def execute_script(script)
+      value = browser.execute_script script
+      value.empty? ? nil : value
+    end
+
+    def evaluate_script(script)
+      browser.evaluate_script script
+    end
+
+    def console_messages
+      browser.console_messages
+    end
+
+    def error_messages
+      browser.error_messages
+    end
+
+    def alert_messages
+      browser.alert_messages
+    end
+
+    def confirm_messages
+      browser.confirm_messages
+    end
+
+    def prompt_messages
+      browser.prompt_messages
+    end
+
+    def response_headers
+      browser.response_headers
+    end
+
+    def status_code
+      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
+        yield
+      ensure
+        browser.frame_focus
+      end
+    end
+
+    def within_window(selector)
+      current_window = window_handle
+      browser.window_focus(selector)
+      begin
+        yield
+      ensure
+        browser.window_focus(current_window)
+      end
+    end
+
+    def window_handles
+      browser.get_window_handles
+    end
+
+    def window_handle
+      browser.get_window_handle
+    end
+
+    def accept_js_confirms!
+      browser.accept_js_confirms
+    end
+
+    def dismiss_js_confirms!
+      browser.reject_js_confirms
+    end
+
+    def accept_js_prompts!
+      browser.accept_js_prompts
+    end
+
+    def dismiss_js_prompts!
+      browser.reject_js_prompts
+    end
+
+    def js_prompt_input=(value)
+      if value.nil?
+        browser.clear_prompt_text
+      else
+        browser.set_prompt_text_to(value)
+      end
+    end
+
+    def wait?
+      true
+    end
+
+    def wait_until(*args)
+    end
+
+    def reset!
+      browser.reset!
+    end
+
+    def has_shortcircuit_timeout?
+      false
+    end
+
+    def render(path, options={})
+      options[:width]  ||= 1000
+      options[:height] ||= 10
+
+      browser.render path, options[:width], options[:height]
+    end
+
+    def server_port
+      @rack_server.port
+    end
+
+    def cookies
+      @cookie_jar ||= CookieJar.new(browser)
+    end
+
+    def invalid_element_errors
+      []
+    end
+
+    private
+
+    def url(path)
+      @rack_server.url(path)
+    end
+  end
+end

data/lib/capybara/webkit/errors.rb

@@ -0,0 +1,10 @@
+module Capybara::Webkit
+  class InvalidResponseError < StandardError
+  end
+
+  class NoResponseError < StandardError
+  end
+
+  class NodeNotAttachedError < Capybara::ElementNotFound
+  end
+end

data/lib/capybara/{driver/webkit → webkit}/node.rb

@@ -1,4 +1,4 @@
-class Capybara::Driver::Webkit
+module Capybara::Webkit
   class Node < Capybara::Driver::Node
     NBSP = "\xC2\xA0"
     NBSP.force_encoding("UTF-8") if NBSP.respond_to?(:force_encoding)
@@ -9,7 +9,7 @@ class Capybara::Driver::Webkit
 
     def [](name)
       value = invoke("attribute", name)
-      if name == 'checked' || name == 'disabled'
+      if name == 'checked' || name == 'disabled' || name == 'multiple'
         value == 'true'
       else
         value
@@ -24,6 +24,14 @@ class Capybara::Driver::Webkit
       end
     end
 
+    def inner_html
+      invoke 'getInnerHTML'
+    end
+
+    def inner_html=(value)
+      invoke 'setInnerHTML', value
+    end
+
     def set(value)
       invoke "set", value
     end
@@ -91,7 +99,7 @@ class Capybara::Driver::Webkit
       if allow_unattached_nodes? || attached?
         browser.command "Node", name, native, *args
       else
-        raise Capybara::Driver::Webkit::NodeNotAttachedError
+        raise Capybara::Webkit::NodeNotAttachedError
       end
     end
 
@@ -112,7 +120,7 @@ class Capybara::Driver::Webkit
     end
 
     def multiple_select?
-      self.tag_name == "select" && self["multiple"] == "multiple"
+      self.tag_name == "select" && self["multiple"]
     end
   end
 end

data/lib/capybara/{driver/webkit → webkit}/socket_debugger.rb

@@ -1,6 +1,6 @@
 # Wraps the TCP socket and prints data sent and received. Used for debugging
 # the wire protocol. You can use this by passing a :socket_class to Browser.
-class Capybara::Driver::Webkit
+module Capybara::Webkit
   class SocketDebugger
     def self.open(host, port)
       real_socket = TCPSocket.open(host, port)
@@ -29,6 +29,9 @@ class Capybara::Driver::Webkit
       received @socket.gets
     end
 
+    def setsockopt(level, name, value)
+    end
+
     private
 
     def sent(content)

data/lib/capybara/{driver/webkit → webkit}/version.rb

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

data/lib/capybara_webkit_builder.rb

@@ -4,6 +4,9 @@ require "rbconfig"
 module CapybaraWebkitBuilder
   extend self
 
+  SUCCESS_STATUS = 0
+  COMMAND_NOT_FOUND_STATUS = 127
+
   def make_bin
     ENV['MAKE'] || 'make'
   end
@@ -29,12 +32,23 @@ module CapybaraWebkitBuilder
     end
   end
 
+  def sh(command)
+    system(command)
+    success = $?.exitstatus == SUCCESS_STATUS
+    if $?.exitstatus == COMMAND_NOT_FOUND_STATUS
+      puts "Command '#{command}' not available"
+    elsif !success
+      puts "Command '#{command}' failed"
+    end
+    success
+  end
+
   def makefile
-    system("#{qmake_bin} -spec #{spec}")
+    sh("#{qmake_bin} -spec #{spec}")
   end
 
   def qmake
-    system("#{make_bin} qmake")
+    sh("#{make_bin} qmake")
   end
 
   def path_to_binary
@@ -47,7 +61,7 @@ module CapybaraWebkitBuilder
   end
 
   def build
-    system(make_bin) or return false
+    sh(make_bin) or return false
 
     FileUtils.mkdir("bin") unless File.directory?("bin")
     FileUtils.cp(path_to_binary, "bin", :preserve => true)

data/spec/browser_spec.rb

@@ -1,19 +1,23 @@
 require 'spec_helper'
 require 'self_signed_ssl_cert'
 require 'stringio'
-require 'capybara/driver/webkit/browser'
-require 'capybara/driver/webkit/connection'
+require 'capybara/webkit/driver'
 require 'socket'
 require 'base64'
 
-describe Capybara::Driver::Webkit::Browser do
+describe Capybara::Webkit::Browser do
 
-  let(:browser) { Capybara::Driver::Webkit::Browser.new(Capybara::Driver::Webkit::Connection.new) }
+  let(:browser) { Capybara::Webkit::Browser.new(Capybara::Webkit::Connection.new) }
   let(:browser_ignore_ssl_err) do
-    Capybara::Driver::Webkit::Browser.new(Capybara::Driver::Webkit::Connection.new).tap do |browser|
+    Capybara::Webkit::Browser.new(Capybara::Webkit::Connection.new).tap do |browser|
       browser.ignore_ssl_errors
     end
   end
+  let(:browser_skip_images) do
+    Capybara::Webkit::Browser.new(Capybara::Webkit::Connection.new).tap do |browser|
+      browser.set_skip_image_loading(true)
+    end
+  end
 
   context 'handling of SSL validation errors' do
     before do
@@ -57,6 +61,90 @@ describe Capybara::Driver::Webkit::Browser do
     it 'accepts a self-signed certificate if configured to do so' do
       browser_ignore_ssl_err.visit "https://#{@host}:#{@port}/"
     end
+
+    it "doesn't accept a self-signed certificate in a new window by default" do
+      browser.execute_script("window.open('about:blank')")
+      browser.window_focus(browser.get_window_handles.last)
+      lambda { browser.visit "https://#{@host}:#{@port}/" }.should raise_error
+    end
+
+    it 'accepts a self-signed certificate in a new window if configured to do so' do
+      browser_ignore_ssl_err.execute_script("window.open('about:blank')")
+      browser_ignore_ssl_err.window_focus(browser_ignore_ssl_err.get_window_handles.last)
+      browser_ignore_ssl_err.visit "https://#{@host}:#{@port}/"
+    end
+  end
+
+  context "skip image loading" do
+    before(:each) do
+      # set up minimal HTTP server
+      @host = "127.0.0.1"
+      @server = TCPServer.new(@host, 0)
+      @port = @server.addr[1]
+      @received_requests = []
+
+      @server_thread = Thread.new do
+        while conn = @server.accept
+          Thread.new(conn) do |conn|
+            # read request
+            request = []
+            until (line = conn.readline.strip).empty?
+              request << line
+            end
+
+            @received_requests << request.join("\n")
+
+            # write response
+            html = <<-HTML
+            <html>
+              <head>
+                <style>
+                  body {
+                    background-image: url(/path/to/bgimage);
+                  }
+                </style>
+              </head>
+              <body>
+                <img src="/path/to/image"/>
+              </body>
+            </html>
+            HTML
+            conn.write "HTTP/1.1 200 OK\r\n"
+            conn.write "Content-Type:text/html\r\n"
+            conn.write "Content-Length: %i\r\n" % html.size
+            conn.write "\r\n"
+            conn.write html
+            conn.write("\r\n\r\n")
+            conn.close
+          end
+        end
+      end
+    end
+
+    after(:each) do
+      @server_thread.kill
+      @server.close
+    end
+
+    it "should load images in image tags by default" do
+      browser.visit("http://#{@host}:#{@port}/")
+      @received_requests.find {|r| r =~ %r{/path/to/image}   }.should_not be_nil
+    end
+
+    it "should load images in css by default" do
+      browser.visit("http://#{@host}:#{@port}/")
+      @received_requests.find {|r| r =~ %r{/path/to/image}   }.should_not be_nil
+    end
+
+    it "should not load images in image tags when skip_image_loading is true" do
+      browser_skip_images.visit("http://#{@host}:#{@port}/")
+      @received_requests.find {|r| r =~ %r{/path/to/image} }.should be_nil
+    end
+
+    it "should not load images in css when skip_image_loading is true" do
+      browser_skip_images.visit("http://#{@host}:#{@port}/")
+      @received_requests.find {|r| r =~ %r{/path/to/bgimage} }.should be_nil
+    end
   end
 
   describe "forking", :skip_on_windows => true do
@@ -148,7 +236,7 @@ describe Capybara::Driver::Webkit::Browser do
 
     it 'uses URLs changed by javascript' do
       browser.execute_script "window.history.pushState('', '', '/blah')"
-      browser.requested_url.should == 'http://example.org/blah'
+      browser.current_url.should == 'http://example.org/blah'
     end
 
     it 'is possible to disable proxy again' do
@@ -166,7 +254,7 @@ describe Capybara::Driver::Webkit::Browser do
     connection.stub(:gets).and_return("ok\n", "0\n")
     connection.stub(:read).and_raise(StandardError.new("tried to read empty response"))
 
-    browser = Capybara::Driver::Webkit::Browser.new(connection)
+    browser = Capybara::Webkit::Browser.new(connection)
 
     expect { browser.visit("/") }.not_to raise_error(/empty response/)
   end