capybara-webkit 1.1.1 → 1.2.0

data/lib/capybara/webkit/browser.rb

@@ -102,6 +102,26 @@ module Capybara::Webkit
       command("WindowFocus", selector)
     end
 
+    def window_open
+      command("WindowOpen")
+    end
+
+    def window_close(selector)
+      command("WindowClose", selector)
+    end
+
+    def window_resize(handle, width, height)
+      command("WindowResize", handle, width.to_i, height.to_i)
+    end
+
+    def window_size(handle)
+      JSON.parse(command("WindowSize", handle))
+    end
+
+    def window_maximize(handle)
+      command("WindowMaximize", handle)
+    end
+
     def get_window_handles
       JSON.parse(command('GetWindowHandles'))
     end
@@ -195,14 +215,18 @@ module Capybara::Webkit
       command("SetProxy")
     end
 
-    def resize_window(width, height)
-      command("ResizeWindow", width.to_i, height.to_i)
-    end
-
     def version
       command("Version")
     end
 
+    def go_back
+      command("GoBack")
+    end
+
+    def go_forward
+      command("GoForward")
+    end
+
     private
 
     def check

data/lib/capybara/webkit/connection.rb

@@ -8,7 +8,7 @@ module Capybara::Webkit
     SERVER_PATH = File.expand_path("../../../../bin/webkit_server", __FILE__)
     WEBKIT_SERVER_START_TIMEOUT = 15
 
-    attr_reader :port
+    attr_reader :port, :pid
 
     def initialize(options = {})
       @socket = nil
@@ -16,7 +16,8 @@ module Capybara::Webkit
       if options.has_key?(:stderr)
         @output_target = options[:stderr]
       elsif options.has_key?(:stdout)
-        warn "[DEPRECATION] The `stdout` option is deprecated.  Please use `stderr` instead."
+        warn '[DEPRECATION] The Capybara::Webkit::Connection `stdout` option ' \
+          'is deprecated. Please use `stderr` instead.'
         @output_target = options[:stdout]
       else
         @output_target = $stderr
@@ -46,32 +47,12 @@ module Capybara::Webkit
     def start_server
       open_pipe
       discover_port
+      discover_pid
       forward_output_in_background_thread
     end
 
     def open_pipe
-      _, @pipe_stdout, @pipe_stderr, wait_thr = Open3.popen3(SERVER_PATH)
-      @pid = wait_thr[:pid]
-      register_shutdown_hook
-    end
-
-    def register_shutdown_hook
-      @owner_pid = Process.pid
-      at_exit do
-        if Process.pid == @owner_pid
-          kill_process
-        end
-      end
-    end
-
-    def kill_process
-      if RUBY_PLATFORM =~ /mingw32/
-        Process.kill(9, @pid)
-      else
-        Process.kill("INT", @pid)
-      end
-    rescue Errno::ESRCH
-      # This just means that the webkit_server process has already ended
+      @pipe_stdin, @pipe_stdout, @pipe_stderr, @wait_thr = Open3.popen3(SERVER_PATH)
     end
 
     def discover_port
@@ -80,6 +61,10 @@ module Capybara::Webkit
       end
     end
 
+    def discover_pid
+      @pid = @wait_thr[:pid]
+    end
+
     def forward_output_in_background_thread
       Thread.new do
         Thread.current.abort_on_exception = true

data/lib/capybara/webkit/driver.rb

@@ -89,7 +89,15 @@ module Capybara::Webkit
     end
 
     def resize_window(width, height)
-      browser.resize_window(width, height)
+      resize_window_to(current_window_handle, width, height)
+    end
+
+    def resize_window_to(handle, width, height)
+      browser.window_resize(handle, width, height)
+    end
+
+    def window_size(handle)
+      browser.window_size(handle)
     end
 
     def within_frame(selector)
@@ -102,8 +110,8 @@ module Capybara::Webkit
     end
 
     def within_window(selector)
-      current_window = window_handle
-      browser.window_focus(selector)
+      current_window = current_window_handle
+      switch_to_window(selector)
       begin
         yield
       ensure
@@ -111,14 +119,30 @@ module Capybara::Webkit
       end
     end
 
+    def switch_to_window(selector)
+      browser.window_focus(selector)
+    end
+
     def window_handles
       browser.get_window_handles
     end
 
-    def window_handle
+    def current_window_handle
       browser.get_window_handle
     end
 
+    def open_new_window
+      browser.window_open
+    end
+
+    def close_window(selector)
+      browser.window_close(selector)
+    end
+
+    def maximize_window(selector)
+      browser.window_maximize(selector)
+    end
+
     def accept_js_confirms!
       browser.accept_js_confirms
     end
@@ -143,6 +167,14 @@ module Capybara::Webkit
       end
     end
 
+    def go_back
+      browser.go_back
+    end
+
+    def go_forward
+      browser.go_forward
+    end
+
     def wait?
       true
     end
@@ -174,6 +206,10 @@ module Capybara::Webkit
       [Capybara::Webkit::ClickFailed]
     end
 
+    def no_such_window_error
+      Capybara::Webkit::NoSuchWindowError
+    end
+
     def version
       [
         "Capybara: #{Capybara::VERSION}",

data/lib/capybara/webkit/errors.rb

@@ -14,6 +14,9 @@ module Capybara::Webkit
   class TimeoutError < Timeout::Error
   end
 
+  class NoSuchWindowError < StandardError
+  end
+
   class JsonError
     def initialize(response)
       error = JSON.parse response

data/lib/capybara/webkit/version.rb

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

data/spec/browser_spec.rb

@@ -148,7 +148,7 @@ describe Capybara::Webkit::Browser do
     end
   end
 
-  describe "forking", :skip_on_windows => true do
+  describe "forking", skip_on_windows: true, skip_on_jruby: true do
     it "only shuts down the server from the main process" do
       browser.reset!
       pid = fork {}

data/spec/connection_spec.rb

@@ -2,6 +2,27 @@ require 'spec_helper'
 require 'capybara/webkit/connection'
 
 describe Capybara::Webkit::Connection do
+  it "kills the process when the parent process dies", skip_on_windows: true, skip_on_jruby: true do
+    read_io, write_io = IO.pipe
+
+    fork_pid = fork do
+      read_io.close
+      connection = Capybara::Webkit::Connection.new
+      write_io.write(connection.pid)
+      write_io.close
+      Process.wait(connection.pid)
+    end
+
+    write_io.close
+
+    webkit_pid = read_io.read.to_i
+    webkit_pid.should be > 1
+    read_io.close
+    Process.kill(9, fork_pid)
+    sleep 1
+    expect { Process.getpgid(webkit_pid) }.to raise_error Errno::ESRCH
+  end
+
   it "boots a server to talk to" do
     url = "http://#{@rack_server.host}:#{@rack_server.port}/"
     connection.puts "Visit"
@@ -19,17 +40,18 @@ describe Capybara::Webkit::Connection do
   end
 
   it 'forwards stderr to the given IO object' do
-    io = StringIO.new
-    redirected_connection = Capybara::Webkit::Connection.new(:stderr => io)
-    script = 'console.log("hello world")'
+    read_io, write_io = IO.pipe
+    redirected_connection = Capybara::Webkit::Connection.new(:stderr => write_io)
     redirected_connection.puts "EnableLogging"
     redirected_connection.puts 0
+
+    script = 'console.log("hello world")'
     redirected_connection.puts "Execute"
     redirected_connection.puts 1
     redirected_connection.puts script.to_s.bytesize
     redirected_connection.print script
-    sleep(0.5)
-    io.string.should =~ /hello world $/
+
+    expect(read_io).to include_response "\nhello world"
   end
 
   it 'does not forward stderr to nil' do

data/spec/driver_rendering_spec.rb

@@ -90,4 +90,14 @@ describe Capybara::Webkit::Driver, "rendering an image" do
       driver.evaluate_script('window.innerHeight').should eq 600
     end
   end
+
+  context "with invalid filepath" do
+    before do
+      @file_name = File.dirname(@file_name)
+    end
+
+    it "raises an InvalidResponseError" do
+      expect { render({}) }.to raise_error(Capybara::Webkit::InvalidResponseError)
+    end
+  end
 end

data/spec/driver_resize_window_spec.rb

@@ -45,4 +45,26 @@ describe Capybara::Webkit::Driver, "#resize_window(width, height)" do
     driver.visit("#{AppRunner.app_host}/")
     driver.html.should include(DEFAULT_DIMENTIONS)
   end
+
+  it "resizes windows by handle" do
+    driver.visit("#{AppRunner.app_host}/")
+    driver.open_new_window
+    driver.visit("#{AppRunner.app_host}/")
+
+    driver.resize_window_to(driver.window_handles.first, 800, 600)
+    driver.resize_window_to(driver.window_handles.last, 400, 300)
+
+    driver.window_size(driver.window_handles.first).should eq [800, 600]
+    driver.window_size(driver.window_handles.last).should eq [400, 300]
+  end
+
+  it "maximizes a window" do
+    driver.visit("#{AppRunner.app_host}/")
+    driver.resize_window(400, 300)
+    driver.maximize_window(driver.current_window_handle)
+    width, height = *driver.window_size(driver.current_window_handle)
+
+    width.should be > 400
+    height.should be > 300
+  end
 end

data/spec/driver_spec.rb

@@ -341,6 +341,9 @@ describe Capybara::Webkit::Driver do
             <div id="hidden-text">
               Some of this text is <em style="display:none">hidden!</em>
             </div>
+            <div id="hidden-ancestor" style="display: none">
+              <div>Hello</div>
+            </div>
             <input type="text" disabled="disabled"/>
             <input id="checktest" type="checkbox" checked="checked"/>
             <script type="text/javascript">
@@ -353,6 +356,12 @@ describe Capybara::Webkit::Driver do
 
     before { visit("/") }
 
+    it "doesn't return text if the ancestor is hidden" do
+      visit("/")
+
+      driver.find_css("#hidden-ancestor div").first.text.should eq ''
+    end
+
     it "handles anchor tags" do
       visit("#test")
       driver.find_xpath("//*[contains(., 'hello')]").should_not be_empty
@@ -1081,7 +1090,7 @@ describe Capybara::Webkit::Driver do
             <input class="watch" type="password"/>
             <input class="watch" type="search"/>
             <input class="watch" type="tel"/>
-            <input class="watch" type="text"/>
+            <input class="watch" type="text" value="original"/>
             <input class="watch" type="url"/>
             <textarea class="watch"></textarea>
             <input class="watch" type="checkbox"/>
@@ -1117,7 +1126,7 @@ describe Capybara::Webkit::Driver do
 
     before { visit("/") }
 
-    let(:newtext) { 'newvalue' }
+    let(:newtext) { '12345' }
 
     let(:keyevents) do
       (%w{focus} +
@@ -1125,13 +1134,22 @@ describe Capybara::Webkit::Driver do
       ).flatten
     end
 
+    let(:textevents) { keyevents + %w(change blur) }
+
     %w(email number password search tel text url).each do | field_type |
       it "triggers text input events on inputs of type #{field_type}" do
         driver.find_xpath("//input[@type='#{field_type}']").first.set(newtext)
-        driver.find_xpath("//li").map(&:visible_text).should eq keyevents
+        driver.find_xpath("//body").first.click
+        driver.find_xpath("//li").map(&:visible_text).should eq textevents
       end
     end
 
+    it "triggers events for cleared inputs" do
+      driver.find_xpath("//input[@type='text']").first.set('')
+      driver.find_xpath("//body").first.click
+      driver.find_xpath("//li").map(&:visible_text).should include('change')
+    end
+
     it "triggers textarea input events" do
       driver.find_xpath("//textarea").first.set(newtext)
       driver.find_xpath("//li").map(&:visible_text).should eq keyevents
@@ -1925,6 +1943,42 @@ describe Capybara::Webkit::Driver do
       end
     end
 
+    it "can switch to another window" do
+      visit("/new_window")
+      driver.switch_to_window(driver.window_handles.last)
+      driver.find_xpath("//p").first.visible_text.should eq "finished"
+    end
+
+    it "knows the current window handle" do
+      visit("/new_window")
+      driver.within_window(driver.window_handles.last) do
+        driver.current_window_handle.should eq driver.window_handles.last
+      end
+    end
+
+    it "can close the current window" do
+      visit("/new_window")
+      original_handle = driver.current_window_handle
+      driver.switch_to_window(driver.window_handles.last)
+      driver.close_window(driver.current_window_handle)
+
+      driver.current_window_handle.should eq(original_handle)
+    end
+
+    it "can close an unfocused window" do
+      visit("/new_window")
+      driver.close_window(driver.window_handles.last)
+      driver.window_handles.size.should eq(1)
+    end
+
+    it "can close the last window" do
+      visit("/new_window")
+      handles = driver.window_handles
+      handles.each { |handle| driver.close_window(handle) }
+      driver.html.should be_empty
+      handles.should_not include(driver.current_window_handle)
+    end
+
     it "waits for the new window to load" do
       visit("/new_window?sleep=1")
       driver.within_window(driver.window_handles.last) do
@@ -1969,7 +2023,7 @@ describe Capybara::Webkit::Driver do
 
     it "raises an error if the window is not found" do
       expect { driver.within_window('myWindowDoesNotExist') }.
-        to raise_error(Capybara::Webkit::InvalidResponseError)
+        to raise_error(Capybara::Webkit::NoSuchWindowError)
     end
 
     it "has a number of window handles equal to the number of open windows" do
@@ -1978,12 +2032,35 @@ describe Capybara::Webkit::Driver do
       driver.window_handles.size.should eq 2
     end
 
+    it "removes windows when closed via JavaScript" do
+      visit("/new_window")
+      driver.execute_script('console.log(window.document.title); window.close()')
+      sleep 2
+      driver.window_handles.size.should eq 1
+    end
+
     it "closes new windows on reset" do
       visit("/new_window")
       last_handle = driver.window_handles.last
       driver.reset!
       driver.window_handles.should_not include(last_handle)
     end
+
+    it "leaves the old window focused when opening a new window" do
+      visit("/new_window")
+      current_window = driver.current_window_handle
+      driver.open_new_window
+
+      driver.current_window_handle.should eq current_window
+      driver.window_handles.size.should eq 3
+    end
+
+    it "opens blank windows" do
+      visit("/new_window")
+      driver.open_new_window
+      driver.switch_to_window(driver.window_handles.last)
+      driver.html.should be_empty
+    end
   end
 
   it "preserves cookies across windows" do
@@ -2246,28 +2323,31 @@ describe Capybara::Webkit::Driver do
   describe "logger app" do
     it "logs nothing before turning on the logger" do
       visit("/")
+      @write.close
       log.should_not include logging_message
     end
 
     it "logs its commands after turning on the logger" do
       driver.enable_logging
       visit("/")
+      @write.close
       log.should include logging_message
     end
 
+    before do
+      @read, @write = IO.pipe
+    end
+
     let(:logging_message) { 'Wrote response true' }
 
     let(:driver) do
-      connection = Capybara::Webkit::Connection.new(:stderr => output)
+      connection = Capybara::Webkit::Connection.new(:stderr => @write)
       browser = Capybara::Webkit::Browser.new(connection)
       Capybara::Webkit::Driver.new(AppRunner.app, :browser => browser)
     end
 
-    let(:output) { StringIO.new }
-
     def log
-      output.rewind
-      output.read
+      @read.read
     end
   end
 
@@ -2383,6 +2463,34 @@ describe Capybara::Webkit::Driver do
     end
   end
 
+  context "history" do
+    let(:driver) do
+      driver_for_app do
+        get "/:param" do |param|
+          <<-HTML
+            <html>
+              <body>
+                <p>#{param}</p>
+                <a href="/navigated">Navigate</a>
+              </body>
+            </html>
+          HTML
+        end
+      end
+    end
+
+    it "can navigate in history" do
+      visit("/first")
+      driver.find_xpath("//p").first.text.should eq('first')
+      driver.find_xpath("//a").first.click
+      driver.find_xpath("//p").first.text.should eq('navigated')
+      driver.go_back
+      driver.find_xpath("//p").first.text.should eq('first')
+      driver.go_forward
+      driver.find_xpath("//p").first.text.should eq('navigated')
+    end
+  end
+
   def driver_url(driver, path)
     URI.parse(driver.current_url).merge(path).to_s
   end