capybara-webkit 0.14.2 → 1.0.0

data/Vagrantfile

@@ -0,0 +1,7 @@
+# -*- mode: ruby -*-
+# vi: set ft=ruby :
+
+Vagrant::Config.run do |config|
+  config.vm.box = "precise32"
+  config.vm.provision :shell, :path => 'vagrant_setup.sh'
+end

data/capybara-webkit.gemspec

@@ -16,6 +16,8 @@ Gem::Specification.new do |s|
 
   s.extensions = "extconf.rb"
 
+  s.required_ruby_version = ">= 1.9.0"
+
   s.add_runtime_dependency("capybara", "~> 2.0", ">= 2.0.2")
   s.add_runtime_dependency("json")
 
@@ -25,5 +27,6 @@ Gem::Specification.new do |s|
   s.add_development_dependency("mini_magick")
   s.add_development_dependency("rake")
   s.add_development_dependency("appraisal", "~> 0.4.0")
+  s.add_development_dependency("selenium-webdriver")
 end
 

data/gemfiles/2.0.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "capybara", "~> 2.0.2"
+
+gemspec :path=>"../"

data/gemfiles/2.0.gemfile.lock

@@ -0,0 +1,72 @@
+PATH
+  remote: /home/mhoran/capybara-webkit
+  specs:
+    capybara-webkit (1.0.0)
+      capybara (~> 2.0, >= 2.0.2)
+      json
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    appraisal (0.4.1)
+      bundler
+      rake
+    capybara (2.0.2)
+      mime-types (>= 1.16)
+      nokogiri (>= 1.3.3)
+      rack (>= 1.0.0)
+      rack-test (>= 0.5.4)
+      selenium-webdriver (~> 2.0)
+      xpath (~> 1.0.0)
+    childprocess (0.3.8)
+      ffi (~> 1.0, >= 1.0.11)
+    diff-lcs (1.1.3)
+    ffi (1.4.0)
+    json (1.8.0)
+    mime-types (1.21)
+    mini_magick (3.5.0)
+      subexec (~> 0.2.1)
+    multi_json (1.6.1)
+    nokogiri (1.5.6)
+    rack (1.5.2)
+    rack-protection (1.3.2)
+      rack
+    rack-test (0.6.2)
+      rack (>= 1.0)
+    rake (10.0.3)
+    rspec (2.6.0)
+      rspec-core (~> 2.6.0)
+      rspec-expectations (~> 2.6.0)
+      rspec-mocks (~> 2.6.0)
+    rspec-core (2.6.4)
+    rspec-expectations (2.6.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.6.0)
+    rubyzip (0.9.9)
+    selenium-webdriver (2.30.0)
+      childprocess (>= 0.2.5)
+      multi_json (~> 1.0)
+      rubyzip
+      websocket (~> 1.0.4)
+    sinatra (1.3.5)
+      rack (~> 1.4)
+      rack-protection (~> 1.3)
+      tilt (~> 1.3, >= 1.3.3)
+    subexec (0.2.2)
+    tilt (1.3.3)
+    websocket (1.0.7)
+    xpath (1.0.0)
+      nokogiri (~> 1.3)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  appraisal (~> 0.4.0)
+  capybara (~> 2.0.2)
+  capybara-webkit!
+  mini_magick
+  rake
+  rspec (~> 2.6.0)
+  selenium-webdriver
+  sinatra

data/gemfiles/2.1.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "capybara", "~> 2.1.0"
+
+gemspec :path=>"../"

data/gemfiles/2.1.gemfile.lock

@@ -0,0 +1,71 @@
+PATH
+  remote: /home/mhoran/capybara-webkit
+  specs:
+    capybara-webkit (1.0.0)
+      capybara (~> 2.0, >= 2.0.2)
+      json
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    appraisal (0.4.1)
+      bundler
+      rake
+    capybara (2.1.0)
+      mime-types (>= 1.16)
+      nokogiri (>= 1.3.3)
+      rack (>= 1.0.0)
+      rack-test (>= 0.5.4)
+      xpath (~> 2.0)
+    childprocess (0.3.8)
+      ffi (~> 1.0, >= 1.0.11)
+    diff-lcs (1.1.3)
+    ffi (1.4.0)
+    json (1.8.0)
+    mime-types (1.22)
+    mini_magick (3.5.0)
+      subexec (~> 0.2.1)
+    multi_json (1.6.1)
+    nokogiri (1.5.9)
+    rack (1.5.2)
+    rack-protection (1.3.2)
+      rack
+    rack-test (0.6.2)
+      rack (>= 1.0)
+    rake (10.0.3)
+    rspec (2.6.0)
+      rspec-core (~> 2.6.0)
+      rspec-expectations (~> 2.6.0)
+      rspec-mocks (~> 2.6.0)
+    rspec-core (2.6.4)
+    rspec-expectations (2.6.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.6.0)
+    rubyzip (0.9.9)
+    selenium-webdriver (2.30.0)
+      childprocess (>= 0.2.5)
+      multi_json (~> 1.0)
+      rubyzip
+      websocket (~> 1.0.4)
+    sinatra (1.3.5)
+      rack (~> 1.4)
+      rack-protection (~> 1.3)
+      tilt (~> 1.3, >= 1.3.3)
+    subexec (0.2.2)
+    tilt (1.3.3)
+    websocket (1.0.7)
+    xpath (2.0.0)
+      nokogiri (~> 1.3)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  appraisal (~> 0.4.0)
+  capybara (~> 2.1.0)
+  capybara-webkit!
+  mini_magick
+  rake
+  rspec (~> 2.6.0)
+  selenium-webdriver
+  sinatra

data/lib/capybara/webkit/browser.rb

@@ -22,8 +22,16 @@ module Capybara::Webkit
       command("Header", key, value)
     end
 
-    def find(query)
-      command("Find", query).split(",")
+    def title
+      command("Title")
+    end
+
+    def find_xpath(query)
+      command("FindXpath", query).split(",")
+    end
+
+    def find_css(query)
+      command("FindCss", query).split(",")
     end
 
     def reset!
@@ -70,11 +78,13 @@ module Capybara::Webkit
       command("CurrentUrl")
     end
 
-    def frame_focus(frame_id_or_index=nil)
-      if frame_id_or_index.is_a? Fixnum
-        command("FrameFocus", "", frame_id_or_index.to_s)
-      elsif frame_id_or_index
-        command("FrameFocus", frame_id_or_index)
+    def frame_focus(selector=nil)
+      if selector.respond_to?(:base)
+        selector.base.invoke('focus')
+      elsif selector.is_a? Fixnum
+        command("FrameFocus", "", selector.to_s)
+      elsif selector
+        command("FrameFocus", selector)
       else
         command("FrameFocus")
       end
@@ -189,6 +199,10 @@ module Capybara::Webkit
       command("ResizeWindow", width.to_i, height.to_i)
     end
 
+    def version
+      command("Version")
+    end
+
     private
 
     def check
@@ -198,26 +212,12 @@ module Capybara::Webkit
       if result.nil?
         raise NoResponseError, "No response received from the server."
       elsif result != 'ok'
-        case response = read_response
-        when "timeout"
-          raise Timeout::Error, "Request timed out after #{timeout_seconds}"
-        else
-          raise InvalidResponseError, response
-        end
+        raise JsonError.new(read_response)
       end
 
       result
     end
 
-    def timeout_seconds
-      seconds = timeout
-      if seconds > 1
-        "#{seconds} seconds"
-      else
-        "1 second"
-      end
-    end
-
     def read_response
       response_length = @connection.gets.to_i
       if response_length > 0

data/lib/capybara/webkit/connection.rb

@@ -12,7 +12,14 @@ module Capybara::Webkit
 
     def initialize(options = {})
       @socket_class = options[:socket_class] || TCPSocket
-      @output_target = options.has_key?(:stdout) ? options[:stdout] : $stdout
+      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."
+        @output_target = options[:stdout]
+      else
+        @output_target = $stderr
+      end
       start_server
       connect
     end
@@ -75,11 +82,7 @@ module Capybara::Webkit
     def forward_output_in_background_thread
       Thread.new do
         Thread.current.abort_on_exception = true
-        IO.copy_stream(@pipe_stdout, @output_target)
-      end
-      Thread.new do
-        Thread.current.abort_on_exception = true
-        IO.copy_stream(@pipe_stderr, @output_target)
+        IO.copy_stream(@pipe_stderr, @output_target) if @output_target
       end
     end
 

data/lib/capybara/webkit/driver.rb

@@ -29,8 +29,14 @@ module Capybara::Webkit
       browser.visit(path)
     end
 
-    def find(query)
-      browser.find(query).map { |native| Node.new(self, native) }
+    def find_xpath(xpath)
+      browser.find_xpath(xpath).map { |native| Node.new(self, native) }
+    end
+
+    alias_method :find, :find_xpath
+
+    def find_css(selector)
+      browser.find_css(selector).map { |native| Node.new(self, native) }
     end
 
     def html
@@ -41,6 +47,10 @@ module Capybara::Webkit
       browser.header(key, value)
     end
 
+    def title
+      browser.title
+    end
+
     def execute_script(script)
       value = browser.execute_script script
       value.empty? ? nil : value
@@ -82,8 +92,8 @@ module Capybara::Webkit
       browser.resize_window(width, height)
     end
 
-    def within_frame(frame_id_or_index)
-      browser.frame_focus(frame_id_or_index)
+    def within_frame(selector)
+      browser.frame_focus(selector)
       begin
         yield
       ensure
@@ -161,9 +171,15 @@ module Capybara::Webkit
     end
 
     def invalid_element_errors
-      []
+      [Capybara::Webkit::ClickFailed]
     end
 
-    private
+    def version
+      [
+        "Capybara: #{Capybara::VERSION}",
+        "capybara-webkit: #{Capybara::Driver::Webkit::VERSION}",
+        browser.version
+      ].join("\n")
+    end
   end
 end

data/lib/capybara/webkit/errors.rb

@@ -7,4 +7,29 @@ module Capybara::Webkit
 
   class NodeNotAttachedError < Capybara::ElementNotFound
   end
+
+  class ClickFailed < StandardError
+  end
+
+  class TimeoutError < Timeout::Error
+  end
+
+  class JsonError
+    def initialize(response)
+      error = JSON.parse response
+
+      @class_name = error['class']
+      @message = error['message']
+    end
+
+    def exception
+      error_class.new @message
+    end
+
+    private
+
+    def error_class
+      Capybara::Webkit.const_get @class_name
+    end
+  end
 end

data/lib/capybara/webkit/node.rb

@@ -1,10 +1,12 @@
 module Capybara::Webkit
   class Node < Capybara::Driver::Node
-    NBSP = "\xC2\xA0"
-    NBSP.force_encoding("UTF-8") if NBSP.respond_to?(:force_encoding)
+    def visible_text
+      Capybara::Helpers.normalize_whitespace(invoke("text"))
+    end
+    alias_method :text, :visible_text
 
-    def text
-      invoke("text").gsub(NBSP, ' ').gsub(/\s+/u, ' ').strip
+    def all_text
+      Capybara::Helpers.normalize_whitespace(invoke("allText"))
     end
 
     def [](name)
@@ -22,7 +24,7 @@ module Capybara::Webkit
 
     def value
       if multiple_select?
-        self.find(".//option").select(&:selected?).map(&:value)
+        self.find_xpath(".//option").select(&:selected?).map(&:value)
       else
         invoke "value"
       end
@@ -45,7 +47,7 @@ module Capybara::Webkit
     end
 
     def unselect_option
-      select = find("ancestor::select").first
+      select = find_xpath("ancestor::select").first
       if select.multiple_select?
         invoke "unselectOption"
       else
@@ -54,7 +56,19 @@ module Capybara::Webkit
     end
 
     def click
-      invoke "click"
+      invoke("leftClick")
+    end
+
+    def double_click
+      invoke("doubleClick")
+    end
+
+    def right_click
+      invoke("rightClick")
+    end
+
+    def hover
+      invoke("hover")
     end
 
     def drag_to(element)
@@ -78,7 +92,11 @@ module Capybara::Webkit
     end
 
     def disabled?
-      self['disabled']
+      if %w(option optgroup).include? tag_name
+        self['disabled'] || find_xpath("parent::*")[0].disabled?
+      else
+        self['disabled']
+      end
     end
 
     def path
@@ -93,8 +111,16 @@ module Capybara::Webkit
       invoke "trigger", event
     end
 
-    def find(xpath)
-      invoke("findWithin", xpath).split(',').map do |native|
+    def find_xpath(xpath)
+      invoke("findXpathWithin", xpath).split(',').map do |native|
+        self.class.new(driver, native)
+      end
+    end
+
+    alias_method :find, :find_xpath
+
+    def find_css(selector)
+      invoke("findCssWithin", selector).split(',').map do |native|
         self.class.new(driver, native)
       end
     end