capybara-webkit 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 218ecbf884de71199261eb9e085c2e408313cd2c
-  data.tar.gz: 56d3b795bb714e25badb726b1a54fabaa84830ea
+  metadata.gz: 96071aafa2680ebbe7213a1f0b016c35b9a09c0e
+  data.tar.gz: 8af0313facae8400b3838c7a3267f3571161c84d
 SHA512:
-  metadata.gz: 5aa4667fe8e68fb68d02bed0d8bedfa7fa9bf0d24cbcbb95f8acc0aa8b468d9e7c27d1ca14b3b963bf98e62d75c6acf1dbc0d8aa991566a71303fba8f6ece68a
-  data.tar.gz: cc658b8ae059a0d9cbb3a3b2c4e047981c7eab045362dbfc1c840ac054d5ad30aba177886434b165e9fc2c11194e18b5b3d2c2ae453d7d35df249ec810e81e0b
+  metadata.gz: ce938a58c3fd9e640905092b24390d47091885d6545ed6390bba4cb75f53ada557bc1a78dff7cc26071c62adf3b13dfea430991ad659151b015e49b0687ef1fd
+  data.tar.gz: d49e72b00a410e69e9afecaa967a00913b7741ad14ce789314aa3ccd52f88128ed350e3a1deea62b70b1dc05085d7005f893590300c11c59e73dc2582884f38b

data/.gitignore

@@ -21,3 +21,7 @@ src/debug
 webkit_server.pro.user
 .vagrant
 *.gch
+.ruby-version
+.ruby-gemset
+.idea
+.qmake.stash

data/.travis.yml

@@ -1,30 +1,32 @@
 language: ruby
 rvm:
   - 1.9.3
-  - 2.0.0
-  - rbx-19mode
+  - 2.1.2
+  - jruby-19mode
+notifications:
+  email: false
+script: xvfb-run rake
+env:
+  global:
+    - BUNDLE_JOBS=4
+    - NOKOGIRI_USE_SYSTEM_LIBRARIES=true
 matrix:
-  exclude:
+  include:
     - rvm: 1.9.3
-      gemfile: gemfiles/2.0.gemfile
+      gemfile: gemfiles/2.1.gemfile
       env: QMAKE=/usr/lib/x86_64-linux-gnu/qt5/bin/qmake
-    - rvm: 2.0.0
-      gemfile: gemfiles/2.0.gemfile
+    - rvm: 1.9.3
+      gemfile: gemfiles/2.2.gemfile
       env: QMAKE=/usr/lib/x86_64-linux-gnu/qt5/bin/qmake
-    - rvm: rbx-19mode
-      gemfile: gemfiles/2.0.gemfile
+    - rvm: 1.9.3
+      gemfile: gemfiles/2.3.gemfile
       env: QMAKE=/usr/lib/x86_64-linux-gnu/qt5/bin/qmake
-notifications:
-  email: false
-script: xvfb-run rake
-env:
-  - QMAKE=/usr/bin/qmake
-  - QMAKE=/usr/lib/x86_64-linux-gnu/qt5/bin/qmake
 gemfile:
-  - gemfiles/2.0.gemfile
   - gemfiles/2.1.gemfile
+  - gemfiles/2.2.gemfile
+  - gemfiles/2.3.gemfile
 before_install:
-  - sudo apt-add-repository -y ppa:canonical-qt5-edgers/qt5-proper
+  - sudo apt-add-repository -y ppa:ubuntu-sdk-team/ppa
   - sudo apt-get update
   - 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/Appraisals

@@ -1,7 +1,11 @@
-appraise "2.0" do
-  gem "capybara", "~> 2.0.2"
-end
-
 appraise "2.1" do
   gem "capybara", "~> 2.1.0"
 end
+
+appraise "2.2" do
+  gem "capybara", "~> 2.2.0"
+end
+
+appraise "2.3" do
+  gem "capybara", "~> 2.3.0"
+end

data/Gemfile.lock

@@ -1,35 +1,46 @@
 PATH
   remote: .
   specs:
-    capybara-webkit (1.1.0)
-      capybara (~> 2.0, >= 2.0.2)
+    capybara-webkit (1.2.0)
+      capybara (>= 2.0.2, < 2.4.0)
       json
 
 GEM
   remote: https://rubygems.org/
   specs:
+    addressable (2.3.6)
     appraisal (0.4.0)
       bundler
       rake
-    capybara (2.2.0)
+    capybara (2.3.0)
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
       xpath (~> 2.0)
-    childprocess (0.3.9)
+    childprocess (0.4.1)
       ffi (~> 1.0, >= 1.0.11)
     diff-lcs (1.2.4)
-    ffi (1.9.0)
-    ffi (1.9.0-x86-mingw32)
+    ffi (1.9.3)
+    ffi (1.9.3-java)
+    ffi (1.9.3-x86-mingw32)
     json (1.8.1)
-    mime-types (2.0)
+    json (1.8.1-java)
+    launchy (2.4.2)
+      addressable (~> 2.3)
+    launchy (2.4.2-java)
+      addressable (~> 2.3)
+      spoon (~> 0.0.1)
+    mime-types (2.3)
     mini_magick (3.2.1)
       subexec (~> 0.0.4)
-    mini_portile (0.5.2)
-    multi_json (1.7.8)
-    nokogiri (1.6.0)
-      mini_portile (~> 0.5.0)
+    mini_portile (0.6.0)
+    multi_json (1.8.4)
+    nokogiri (1.6.2.1)
+      mini_portile (= 0.6.0)
+    nokogiri (1.6.2.1-java)
+    nokogiri (1.6.2.1-x86-mingw32)
+      mini_portile (= 0.6.0)
     rack (1.5.2)
     rack-protection (1.3.2)
       rack
@@ -44,16 +55,18 @@ GEM
     rspec-expectations (2.14.1)
       diff-lcs (>= 1.1.3, < 2.0)
     rspec-mocks (2.14.3)
-    rubyzip (0.9.9)
-    selenium-webdriver (2.33.0)
+    rubyzip (1.1.0)
+    selenium-webdriver (2.39.0)
       childprocess (>= 0.2.5)
       multi_json (~> 1.0)
-      rubyzip
+      rubyzip (~> 1.0)
       websocket (~> 1.0.4)
     sinatra (1.3.5)
       rack (~> 1.4)
       rack-protection (~> 1.3)
       tilt (~> 1.3, >= 1.3.3)
+    spoon (0.0.4)
+      ffi
     subexec (0.0.4)
     tilt (1.3.3)
     websocket (1.0.7)
@@ -61,12 +74,14 @@ GEM
       nokogiri (~> 1.3)
 
 PLATFORMS
+  java
   ruby
   x86-mingw32
 
 DEPENDENCIES
   appraisal (~> 0.4.0)
   capybara-webkit!
+  launchy
   mini_magick
   rake
   rspec (~> 2.14.0)

data/NEWS.md

@@ -1,3 +1,10 @@
+New for 1.2.0:
+* Capybara 2.3 compatibility.
+* Kill webkit_server when parent process closes stdin.
+
+New for 1.1.1:
+* Lock capybara dependency to < 2.2.0.
+
 New for 1.1.0:
 
 * Improve messages for ClickFailed errors to aid debugging.

data/README.md

@@ -19,7 +19,11 @@ capybara-webkit requires Qt version 4.8.
 Windows Support
 ---------------
 
-Currently 32-bit 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)
+Currently 32-bit Windows will compile capybara-webkit. Support for Windows is
+provided by the open source community and Windows related issues should be
+posted to [Stack Overflow].
+
+[Stack Overflow]: http://stackoverflow.com/questions/tagged/capybara-webkit
 
 Reporting Issues
 ----------------
@@ -27,15 +31,17 @@ Reporting Issues
 Without access to your application code we can't easily debug most crashes or
 generic failures, so we've included a debug version of the driver that prints a
 log of what happened during each test. Before filing a crash bug, please see
-[Reporting Crashes](https://github.com/thoughtbot/capybara-webkit/wiki/Reporting-Crashes).
-You're much more likely to get a fix if you follow those instructions.
+[Reporting Crashes]. You're much more likely to get a fix if you follow those
+instructions.
 
-If you are having compiling issues please check out the
-[capybara-webkit wiki](https://github.com/thoughtbot/capybara-webkit/wiki/Installing-Qt-and-compiling-capybara-webkit).
-If you don't have any luck there, please post to the
-[mailing list](http://groups.google.com/group/capybara-webkit). Please don't
+If you're having trouble compiling or installing, please check out the [wiki].
+If you don't have any luck there, please post to [Stack Overflow]. Please don't
 open a Github issue for a system-specific compiler issue.
 
+[Reporting Crashes]: https://github.com/thoughtbot/capybara-webkit/wiki/Reporting-Crashes
+[capybara-webkit wiki]: https://github.com/thoughtbot/capybara-webkit/wiki
+[Stack Overflow]: http://stackoverflow.com/questions/tagged/capybara-webkit
+
 CI
 --
 
@@ -60,7 +66,7 @@ Capybara.javascript_driver = :webkit
 
 In cucumber, tag scenarios with @javascript to run them using a headless WebKit browser.
 
-In RSpec, use the `:js => true` flag. See the [capybara documention](http://rubydoc.info/gems/capybara#Using_Capybara_with_RSpec) for more information about using capybara with RSpec.
+In RSpec, use the `:js => true` flag. See the [capybara documentation](http://rubydoc.info/gems/capybara#Using_Capybara_with_RSpec) for more information about using capybara with RSpec.
 
 Take note of the transactional fixtures section of the [capybara README](https://github.com/jnicklas/capybara/blob/master/README.md).
 
@@ -85,14 +91,14 @@ console.log("hello")
 ```ruby
 # In Ruby:
 page.driver.console_messages
-=> {:source=>"http://example.com", :line_number=>1, :message=>"hello"}
+=> [{:source=>"http://example.com", :line_number=>1, :message=>"hello"}]
 ```
 
 **error_messages**: returns an array of Javascript errors that occurred
 
 ```ruby
 page.driver.error_messages
-=> {:source=>"http://example.com", :line_number=>1, :message=>"SyntaxError: Parse error"}
+=> [{:source=>"http://example.com", :line_number=>1, :message=>"SyntaxError: Parse error"}]
 ```
 
 **alert_messages, confirm_messages, prompt_messages**: returns arrays of Javascript dialog messages for each dialog type

data/Rakefile

@@ -1,6 +1,6 @@
 require 'bundler'
 require 'rspec/core/rake_task'
-require 'capybara_webkit_builder'
+require_relative './lib/capybara_webkit_builder'
 require 'appraisal'
 
 Bundler::GemHelper.install_tasks

data/capybara-webkit.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |s|
 
   s.required_ruby_version = ">= 1.9.0"
 
-  s.add_runtime_dependency("capybara", "~> 2.0", ">= 2.0.2")
+  s.add_runtime_dependency("capybara", ">= 2.0.2", "< 2.4.0")
   s.add_runtime_dependency("json")
 
   s.add_development_dependency("rspec", "~> 2.14.0")
@@ -29,5 +29,6 @@ Gem::Specification.new do |s|
   s.add_development_dependency("rake")
   s.add_development_dependency("appraisal", "~> 0.4.0")
   s.add_development_dependency("selenium-webdriver")
+  s.add_development_dependency("launchy")
 end
 

data/gemfiles/2.0.gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: /home/mhoran/capybara-webkit
   specs:
-    capybara-webkit (1.0.0)
-      capybara (~> 2.0, >= 2.0.2)
+    capybara-webkit (1.1.1)
+      capybara (>= 2.0.2, < 2.2.0)
       json
 
 GEM
@@ -18,35 +18,38 @@ GEM
       rack-test (>= 0.5.4)
       selenium-webdriver (~> 2.0)
       xpath (~> 1.0.0)
-    childprocess (0.3.9)
+    childprocess (0.4.1)
       ffi (~> 1.0, >= 1.0.11)
-    diff-lcs (1.1.3)
-    ffi (1.9.0)
-    json (1.8.0)
+    diff-lcs (1.2.5)
+    ffi (1.9.3)
+    ffi (1.9.3-java)
+    json (1.8.1)
+    json (1.8.1-java)
     mime-types (1.23)
     mini_magick (3.5.0)
       subexec (~> 0.2.1)
-    multi_json (1.7.8)
+    multi_json (1.8.4)
     nokogiri (1.5.9)
+    nokogiri (1.5.9-java)
     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.33.0)
+    rspec (2.14.1)
+      rspec-core (~> 2.14.0)
+      rspec-expectations (~> 2.14.0)
+      rspec-mocks (~> 2.14.0)
+    rspec-core (2.14.7)
+    rspec-expectations (2.14.4)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.14.4)
+    rubyzip (1.1.0)
+    selenium-webdriver (2.39.0)
       childprocess (>= 0.2.5)
       multi_json (~> 1.0)
-      rubyzip
+      rubyzip (~> 1.0)
       websocket (~> 1.0.4)
     sinatra (1.3.5)
       rack (~> 1.4)
@@ -59,6 +62,7 @@ GEM
       nokogiri (~> 1.3)
 
 PLATFORMS
+  java
   ruby
 
 DEPENDENCIES
@@ -67,6 +71,6 @@ DEPENDENCIES
   capybara-webkit!
   mini_magick
   rake
-  rspec (~> 2.6.0)
+  rspec (~> 2.14.0)
   selenium-webdriver
   sinatra

data/gemfiles/2.1.gemfile.lock

@@ -1,13 +1,14 @@
 PATH
-  remote: /home/mhoran/capybara-webkit
+  remote: ../
   specs:
-    capybara-webkit (1.0.0)
-      capybara (~> 2.0, >= 2.0.2)
+    capybara-webkit (1.2.0)
+      capybara (>= 2.0.2, < 2.4.0)
       json
 
 GEM
   remote: https://rubygems.org/
   specs:
+    addressable (2.3.6)
     appraisal (0.4.1)
       bundler
       rake
@@ -17,40 +18,50 @@ GEM
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
       xpath (~> 2.0)
-    childprocess (0.3.9)
+    childprocess (0.4.1)
       ffi (~> 1.0, >= 1.0.11)
-    diff-lcs (1.1.3)
-    ffi (1.9.0)
-    json (1.8.0)
+    diff-lcs (1.2.5)
+    ffi (1.9.3)
+    ffi (1.9.3-java)
+    json (1.8.1)
+    json (1.8.1-java)
+    launchy (2.4.2)
+      addressable (~> 2.3)
+    launchy (2.4.2-java)
+      addressable (~> 2.3)
+      spoon (~> 0.0.1)
     mime-types (1.23)
     mini_magick (3.5.0)
       subexec (~> 0.2.1)
-    multi_json (1.7.8)
+    multi_json (1.8.4)
     nokogiri (1.5.9)
+    nokogiri (1.5.9-java)
     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.33.0)
+    rspec (2.14.1)
+      rspec-core (~> 2.14.0)
+      rspec-expectations (~> 2.14.0)
+      rspec-mocks (~> 2.14.0)
+    rspec-core (2.14.7)
+    rspec-expectations (2.14.4)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.14.4)
+    rubyzip (1.1.0)
+    selenium-webdriver (2.39.0)
       childprocess (>= 0.2.5)
       multi_json (~> 1.0)
-      rubyzip
+      rubyzip (~> 1.0)
       websocket (~> 1.0.4)
     sinatra (1.3.5)
       rack (~> 1.4)
       rack-protection (~> 1.3)
       tilt (~> 1.3, >= 1.3.3)
+    spoon (0.0.4)
+      ffi
     subexec (0.2.2)
     tilt (1.3.3)
     websocket (1.0.7)
@@ -58,14 +69,16 @@ GEM
       nokogiri (~> 1.3)
 
 PLATFORMS
+  java
   ruby
 
 DEPENDENCIES
   appraisal (~> 0.4.0)
   capybara (~> 2.1.0)
   capybara-webkit!
+  launchy
   mini_magick
   rake
-  rspec (~> 2.6.0)
+  rspec (~> 2.14.0)
   selenium-webdriver
   sinatra

data/gemfiles/2.2.gemfile

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

data/gemfiles/2.2.gemfile.lock

@@ -0,0 +1,77 @@
+PATH
+  remote: ../
+  specs:
+    capybara-webkit (1.2.0)
+      capybara (>= 2.0.2, < 2.4.0)
+      json
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    addressable (2.3.6)
+    appraisal (0.4.1)
+      bundler
+      rake
+    capybara (2.2.1)
+      mime-types (>= 1.16)
+      nokogiri (>= 1.3.3)
+      rack (>= 1.0.0)
+      rack-test (>= 0.5.4)
+      xpath (~> 2.0)
+    childprocess (0.5.3)
+      ffi (~> 1.0, >= 1.0.11)
+    diff-lcs (1.2.5)
+    ffi (1.9.3)
+    json (1.8.1)
+    launchy (2.4.2)
+      addressable (~> 2.3)
+    mime-types (2.3)
+    mini_magick (3.7.0)
+      subexec (~> 0.2.1)
+    mini_portile (0.6.0)
+    multi_json (1.10.1)
+    nokogiri (1.6.2.1)
+      mini_portile (= 0.6.0)
+    rack (1.5.2)
+    rack-protection (1.5.3)
+      rack
+    rack-test (0.6.2)
+      rack (>= 1.0)
+    rake (10.3.2)
+    rspec (2.14.1)
+      rspec-core (~> 2.14.0)
+      rspec-expectations (~> 2.14.0)
+      rspec-mocks (~> 2.14.0)
+    rspec-core (2.14.8)
+    rspec-expectations (2.14.5)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.14.6)
+    rubyzip (1.1.4)
+    selenium-webdriver (2.42.0)
+      childprocess (>= 0.5.0)
+      multi_json (~> 1.0)
+      rubyzip (~> 1.0)
+      websocket (~> 1.0.4)
+    sinatra (1.4.5)
+      rack (~> 1.4)
+      rack-protection (~> 1.4)
+      tilt (~> 1.3, >= 1.3.4)
+    subexec (0.2.3)
+    tilt (1.4.1)
+    websocket (1.0.7)
+    xpath (2.0.0)
+      nokogiri (~> 1.3)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  appraisal (~> 0.4.0)
+  capybara (~> 2.2.0)
+  capybara-webkit!
+  launchy
+  mini_magick
+  rake
+  rspec (~> 2.14.0)
+  selenium-webdriver
+  sinatra

data/gemfiles/2.3.gemfile

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

data/gemfiles/2.3.gemfile.lock

@@ -0,0 +1,77 @@
+PATH
+  remote: ../
+  specs:
+    capybara-webkit (1.2.0)
+      capybara (>= 2.0.2, < 2.4.0)
+      json
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    addressable (2.3.6)
+    appraisal (0.4.1)
+      bundler
+      rake
+    capybara (2.3.0)
+      mime-types (>= 1.16)
+      nokogiri (>= 1.3.3)
+      rack (>= 1.0.0)
+      rack-test (>= 0.5.4)
+      xpath (~> 2.0)
+    childprocess (0.5.3)
+      ffi (~> 1.0, >= 1.0.11)
+    diff-lcs (1.2.5)
+    ffi (1.9.3)
+    json (1.8.1)
+    launchy (2.4.2)
+      addressable (~> 2.3)
+    mime-types (2.3)
+    mini_magick (3.7.0)
+      subexec (~> 0.2.1)
+    mini_portile (0.6.0)
+    multi_json (1.10.1)
+    nokogiri (1.6.2.1)
+      mini_portile (= 0.6.0)
+    rack (1.5.2)
+    rack-protection (1.5.3)
+      rack
+    rack-test (0.6.2)
+      rack (>= 1.0)
+    rake (10.3.2)
+    rspec (2.14.1)
+      rspec-core (~> 2.14.0)
+      rspec-expectations (~> 2.14.0)
+      rspec-mocks (~> 2.14.0)
+    rspec-core (2.14.8)
+    rspec-expectations (2.14.5)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.14.6)
+    rubyzip (1.1.4)
+    selenium-webdriver (2.42.0)
+      childprocess (>= 0.5.0)
+      multi_json (~> 1.0)
+      rubyzip (~> 1.0)
+      websocket (~> 1.0.4)
+    sinatra (1.4.5)
+      rack (~> 1.4)
+      rack-protection (~> 1.4)
+      tilt (~> 1.3, >= 1.3.4)
+    subexec (0.2.3)
+    tilt (1.4.1)
+    websocket (1.0.7)
+    xpath (2.0.0)
+      nokogiri (~> 1.3)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  appraisal (~> 0.4.0)
+  capybara (~> 2.3.0)
+  capybara-webkit!
+  launchy
+  mini_magick
+  rake
+  rspec (~> 2.14.0)
+  selenium-webdriver
+  sinatra

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