capybara-webkit 1.0.0 → 1.1.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 218ecbf884de71199261eb9e085c2e408313cd2c
+  data.tar.gz: 56d3b795bb714e25badb726b1a54fabaa84830ea
+SHA512:
+  metadata.gz: 5aa4667fe8e68fb68d02bed0d8bedfa7fa9bf0d24cbcbb95f8acc0aa8b468d9e7c27d1ca14b3b963bf98e62d75c6acf1dbc0d8aa991566a71303fba8f6ece68a
+  data.tar.gz: cc658b8ae059a0d9cbb3a3b2c4e047981c7eab045362dbfc1c840ac054d5ad30aba177886434b165e9fc2c11194e18b5b3d2c2ae453d7d35df249ec810e81e0b

data/.gitignore

@@ -1,5 +1,6 @@
 *.swp
 bin/webkit_server*
+test/testwebkitserver
 *.swo
 *~
 *.o

data/.travis.yml

@@ -4,8 +4,6 @@ rvm:
   - 2.0.0
   - rbx-19mode
 matrix:
-  allow_failures:
-    - rvm: rbx-19mode
   exclude:
     - rvm: 1.9.3
       gemfile: gemfiles/2.0.gemfile
@@ -28,4 +26,5 @@ gemfile:
 before_install:
   - sudo apt-add-repository -y ppa:canonical-qt5-edgers/qt5-proper
   - sudo apt-get update
-  - sudo apt-get install libqt5webkit5-dev qtdeclarative5-dev qtlocation5-dev qtsensors5-dev libgstreamer0.10-dev libgstreamer-plugins-base0.10-dev
+  - sudo apt-get install libqt5webkit5-dev qtdeclarative5-dev qtlocation5-dev qtsensors5-dev libgstreamer0.10-dev libgstreamer-plugins-base0.10-dev qt4-default
+install: bundle

data/Gemfile.lock

@@ -1,64 +1,62 @@
 PATH
   remote: .
   specs:
-    capybara-webkit (1.0.0)
+    capybara-webkit (1.1.0)
       capybara (~> 2.0, >= 2.0.2)
       json
 
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.3.2)
     appraisal (0.4.0)
       bundler
       rake
-    capybara (2.1.0)
+    capybara (2.2.0)
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
       xpath (~> 2.0)
-    childprocess (0.3.6)
-      ffi (~> 1.0, >= 1.0.6)
-    diff-lcs (1.1.2)
-    ffi (1.2.0)
-    ffi (1.2.0-x86-mingw32)
-    json (1.8.0)
-    libwebsocket (0.1.7.1)
-      addressable
-      websocket
-    mime-types (1.22)
+    childprocess (0.3.9)
+      ffi (~> 1.0, >= 1.0.11)
+    diff-lcs (1.2.4)
+    ffi (1.9.0)
+    ffi (1.9.0-x86-mingw32)
+    json (1.8.1)
+    mime-types (2.0)
     mini_magick (3.2.1)
       subexec (~> 0.0.4)
-    multi_json (1.5.0)
-    nokogiri (1.5.9)
+    mini_portile (0.5.2)
+    multi_json (1.7.8)
+    nokogiri (1.6.0)
+      mini_portile (~> 0.5.0)
     rack (1.5.2)
     rack-protection (1.3.2)
       rack
     rack-test (0.6.2)
       rack (>= 1.0)
     rake (0.9.2)
-    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)
+    rspec (2.14.1)
+      rspec-core (~> 2.14.0)
+      rspec-expectations (~> 2.14.0)
+      rspec-mocks (~> 2.14.0)
+    rspec-core (2.14.4)
+    rspec-expectations (2.14.1)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.14.3)
     rubyzip (0.9.9)
-    selenium-webdriver (2.27.2)
+    selenium-webdriver (2.33.0)
       childprocess (>= 0.2.5)
-      libwebsocket (~> 0.1.3)
       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.0.4)
     tilt (1.3.3)
-    websocket (1.0.6)
+    websocket (1.0.7)
     xpath (2.0.0)
       nokogiri (~> 1.3)
 
@@ -71,6 +69,6 @@ DEPENDENCIES
   capybara-webkit!
   mini_magick
   rake
-  rspec (~> 2.6.0)
+  rspec (~> 2.14.0)
   selenium-webdriver
   sinatra

data/NEWS.md

@@ -1,3 +1,15 @@
+New for 1.1.0:
+
+* Improve messages for ClickFailed errors to aid debugging.
+* Fix long load times on Ruby 2.0.0-p195.
+* Automatically save screenshots on ClickFailed errors.
+* Render a mouse pointer in screenshots for the current mouse location.
+* Silent debug messages from Qt.
+* Fix OS X keychain bug in Qt 5 related to basic authentication.
+* Fix issues visiting URLs with square brackets.
+* Fail immediately when trying to install with unsupported versions of Qt.
+* Fix race condition leading to InvalidResponseErrors.
+
 New for 1.0.0:
 
 * Fix a memory leak in the logger.

data/README.md

@@ -4,7 +4,7 @@ capybara-webkit
 [![Build Status](https://secure.travis-ci.org/thoughtbot/capybara-webkit.png?branch=master)](https://travis-ci.org/thoughtbot/capybara-webkit)
 [![Code Climate](https://codeclimate.com/github/thoughtbot/capybara-webkit.png)](https://codeclimate.com/github/thoughtbot/capybara-webkit)
 
-A [capybara](https://github.com/jnicklas/capybara) driver that uses [WebKit](http://webkit.org) via [QtWebKit](http://doc.qt.nokia.com/4.7/qtwebkit.html).
+A [capybara](https://github.com/jnicklas/capybara) driver that uses [WebKit](http://webkit.org) via [QtWebKit](http://trac.webkit.org/wiki/QtWebKit).
 
 Qt Dependency and Installation Issues
 -------------------------------------

data/Rakefile

@@ -7,7 +7,7 @@ Bundler::GemHelper.install_tasks
 
 desc "Generate a Makefile using qmake"
 file 'Makefile' do
-  CapybaraWebkitBuilder.makefile or exit(1)
+  CapybaraWebkitBuilder.makefile('CONFIG+=test') or exit(1)
 end
 
 desc "Regenerate dependencies using qmake"
@@ -20,6 +20,11 @@ task :build => :qmake do
   CapybaraWebkitBuilder.build or exit(1)
 end
 
+desc "Run QtTest unit tests for webkit server"
+task :check => :build do
+  sh("make check") or exit(1)
+end
+
 file 'bin/webkit_server' => :build
 
 RSpec::Core::RakeTask.new do |t|
@@ -27,16 +32,15 @@ RSpec::Core::RakeTask.new do |t|
   t.rspec_opts = "--format progress"
 end
 
+task :spec => :build
+
 desc "Default: build and run all specs"
-task :default => [:build, :spec]
+task :default => [:check, :spec]
 
 desc "Generate a new command called NAME"
 task :generate_command do
   name = ENV['NAME'] or raise "Provide a name with NAME="
 
-  header = "src/#{name}.h"
-  source = "src/#{name}.cpp"
-
   %w(h cpp).each do |extension|
     File.open("templates/Command.#{extension}", "r") do |source_file|
       contents = source_file.read

data/capybara-webkit.gemspec

@@ -9,6 +9,7 @@ Gem::Specification.new do |s|
   s.email    = "support@thoughtbot.com"
   s.homepage = "http://github.com/thoughtbot/capybara-webkit"
   s.summary  = "Headless Webkit driver for Capybara"
+  s.license  = 'MIT'
 
   s.files        = `git ls-files`.split("\n")
   s.test_files   = `git ls-files -- {spec,features}/*`.split("\n")
@@ -21,7 +22,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency("capybara", "~> 2.0", ">= 2.0.2")
   s.add_runtime_dependency("json")
 
-  s.add_development_dependency("rspec", "~> 2.6.0")
+  s.add_development_dependency("rspec", "~> 2.14.0")
   # Sinatra is used by Capybara's TestApp
   s.add_development_dependency("sinatra")
   s.add_development_dependency("mini_magick")

data/gemfiles/2.0.gemfile.lock

@@ -11,23 +11,23 @@ GEM
     appraisal (0.4.1)
       bundler
       rake
-    capybara (2.0.2)
+    capybara (2.0.3)
       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)
+    childprocess (0.3.9)
       ffi (~> 1.0, >= 1.0.11)
     diff-lcs (1.1.3)
-    ffi (1.4.0)
+    ffi (1.9.0)
     json (1.8.0)
-    mime-types (1.21)
+    mime-types (1.23)
     mini_magick (3.5.0)
       subexec (~> 0.2.1)
-    multi_json (1.6.1)
-    nokogiri (1.5.6)
+    multi_json (1.7.8)
+    nokogiri (1.5.9)
     rack (1.5.2)
     rack-protection (1.3.2)
       rack
@@ -43,7 +43,7 @@ GEM
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.6.0)
     rubyzip (0.9.9)
-    selenium-webdriver (2.30.0)
+    selenium-webdriver (2.33.0)
       childprocess (>= 0.2.5)
       multi_json (~> 1.0)
       rubyzip

data/gemfiles/2.1.gemfile.lock

@@ -17,15 +17,15 @@ GEM
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
       xpath (~> 2.0)
-    childprocess (0.3.8)
+    childprocess (0.3.9)
       ffi (~> 1.0, >= 1.0.11)
     diff-lcs (1.1.3)
-    ffi (1.4.0)
+    ffi (1.9.0)
     json (1.8.0)
-    mime-types (1.22)
+    mime-types (1.23)
     mini_magick (3.5.0)
       subexec (~> 0.2.1)
-    multi_json (1.6.1)
+    multi_json (1.7.8)
     nokogiri (1.5.9)
     rack (1.5.2)
     rack-protection (1.3.2)
@@ -42,7 +42,7 @@ GEM
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.6.0)
     rubyzip (0.9.9)
-    selenium-webdriver (2.30.0)
+    selenium-webdriver (2.33.0)
       childprocess (>= 0.2.5)
       multi_json (~> 1.0)
       rubyzip

data/lib/capybara/webkit/connection.rb

@@ -11,6 +11,7 @@ module Capybara::Webkit
     attr_reader :port
 
     def initialize(options = {})
+      @socket = nil
       @socket_class = options[:socket_class] || TCPSocket
       if options.has_key?(:stderr)
         @output_target = options[:stderr]

data/lib/capybara/webkit/cookie_jar.rb

@@ -1,4 +1,4 @@
-require 'webrick'
+require 'webrick/cookie'
 
 # A simple cookie jar implementation.
 # Does not take special cookie attributes

data/lib/capybara/webkit/node.rb

@@ -126,11 +126,7 @@ module Capybara::Webkit
     end
 
     def invoke(name, *args)
-      if allow_unattached_nodes? || attached?
-        browser.command "Node", name, native, *args
-      else
-        raise Capybara::Webkit::NodeNotAttachedError
-      end
+      browser.command "Node", name, allow_unattached_nodes?, native, *args
     end
 
     def allow_unattached_nodes?

data/lib/capybara/webkit/version.rb

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

data/lib/capybara_webkit_builder.rb

@@ -52,8 +52,8 @@ module CapybaraWebkitBuilder
     success
   end
 
-  def makefile
-    sh("#{qmake_bin} -spec #{spec}")
+  def makefile(config = '')
+    sh("#{qmake_bin} -spec #{spec} #{config}")
   end
 
   def qmake

data/spec/browser_spec.rb

@@ -86,10 +86,10 @@ describe Capybara::Webkit::Browser do
 
       @server_thread = Thread.new do
         while conn = @server.accept
-          Thread.new(conn) do |conn|
+          Thread.new(conn) do |thread_conn|
             # read request
             request = []
-            until (line = conn.readline.strip).empty?
+            until (line = thread_conn.readline.strip).empty?
               request << line
             end
 
@@ -110,13 +110,13 @@ describe Capybara::Webkit::Browser do
               </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
+            thread_conn.write "HTTP/1.1 200 OK\r\n"
+            thread_conn.write "Content-Type:text/html\r\n"
+            thread_conn.write "Content-Length: %i\r\n" % html.size
+            thread_conn.write "\r\n"
+            thread_conn.write html
+            thread_conn.write("\r\n\r\n")
+            thread_conn.close
           end
         end
       end
@@ -202,7 +202,7 @@ describe Capybara::Webkit::Browser do
                         :user => @user,
                         :pass => @pass)
       browser.visit @url
-      @proxy_requests.size.should == 2
+      @proxy_requests.size.should eq 2
       @request = @proxy_requests[-1]
     end
 
@@ -212,7 +212,7 @@ describe Capybara::Webkit::Browser do
     end
 
     it 'uses the HTTP proxy correctly' do
-      @request[0].should match /^GET\s+http:\/\/example.org\/\s+HTTP/i
+      @request[0].should match(/^GET\s+http:\/\/example.org\/\s+HTTP/i)
       @request.find { |header|
         header =~ /^Host:\s+example.org$/i }.should_not be nil
     end
@@ -223,8 +223,8 @@ describe Capybara::Webkit::Browser do
       auth_header.should_not be nil
 
       user, pass = Base64.decode64(auth_header.split(/\s+/)[-1]).split(":")
-      user.should == @user
-      pass.should == @pass
+      user.should eq @user
+      pass.should eq @pass
     end
 
     it "uses the proxies' response" do
@@ -232,24 +232,24 @@ describe Capybara::Webkit::Browser do
     end
 
     it 'uses original URL' do
-      browser.current_url.should == @url
+      browser.current_url.should eq @url
     end
 
     it 'uses URLs changed by javascript' do
       browser.execute_script "window.history.pushState('', '', '/blah')"
-      browser.current_url.should == 'http://example.org/blah'
+      browser.current_url.should eq 'http://example.org/blah'
     end
 
     it 'is possible to disable proxy again' do
       @proxy_requests.clear
       browser.clear_proxy
       browser.visit "http://#{@host}:#{@port}/"
-      @proxy_requests.size.should == 0
+      @proxy_requests.size.should eq 0
     end
   end
 
   it "doesn't try to read an empty response" do
-    connection = stub("connection")
+    connection = double("connection")
     connection.stub(:puts)
     connection.stub(:print)
     connection.stub(:gets).and_return("ok\n", "0\n")
@@ -257,7 +257,7 @@ describe Capybara::Webkit::Browser do
 
     browser = Capybara::Webkit::Browser.new(connection)
 
-    expect { browser.visit("/") }.not_to raise_error(/empty response/)
+    expect { browser.visit("/") }.not_to raise_error
   end
 
   describe '#command' do

data/spec/connection_spec.rb

@@ -8,11 +8,11 @@ describe Capybara::Webkit::Connection do
     connection.puts 1
     connection.puts url.to_s.bytesize
     connection.print url
-    connection.gets.should == "ok\n"
-    connection.gets.should == "0\n"
+    connection.gets.should eq "ok\n"
+    connection.gets.should eq "0\n"
     connection.puts "Body"
     connection.puts 0
-    connection.gets.should == "ok\n"
+    connection.gets.should eq "ok\n"
     response_length = connection.gets.to_i
     response = connection.read(response_length)
     response.should include("Hey there")
@@ -53,7 +53,7 @@ describe Capybara::Webkit::Connection do
   end
 
   it 'sets appropriate options on its socket' do
-    socket = stub('socket')
+    socket = double('socket')
     TCPSocket.stub(:open).and_return(socket)
     if defined?(Socket::TCP_NODELAY)
       socket.should_receive(:setsockopt).with(Socket::IPPROTO_TCP, Socket::TCP_NODELAY, true)