capybara-webkit 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 96071aafa2680ebbe7213a1f0b016c35b9a09c0e
-  data.tar.gz: 8af0313facae8400b3838c7a3267f3571161c84d
+  metadata.gz: d61a9d2568a46053dfe21bf58cc9263454c4b489
+  data.tar.gz: e9689291ccf578f1a2c79e72c3ceb6b0d545dc4c
 SHA512:
-  metadata.gz: ce938a58c3fd9e640905092b24390d47091885d6545ed6390bba4cb75f53ada557bc1a78dff7cc26071c62adf3b13dfea430991ad659151b015e49b0687ef1fd
-  data.tar.gz: d49e72b00a410e69e9afecaa967a00913b7741ad14ce789314aa3ccd52f88128ed350e3a1deea62b70b1dc05085d7005f893590300c11c59e73dc2582884f38b
+  metadata.gz: 0553617872da58e661c35a40ed83195d5ee013f0f8ca04bb2519f2bff1342b5023580fc3dc5ac6427c645a16511662133036aef648900401cbf46b2bd0ba734a
+  data.tar.gz: 6dfe749f35bf08f94c31467034eecc7e94e11205bce989a8643addf46d69e0f5295384e39e00ea23c0f21ae463719b8521e42564ee7b5bebbada5d56d2a1f8db

data/.travis.yml

@@ -12,19 +12,19 @@ env:
     - NOKOGIRI_USE_SYSTEM_LIBRARIES=true
 matrix:
   include:
-    - rvm: 1.9.3
-      gemfile: gemfiles/2.1.gemfile
-      env: QMAKE=/usr/lib/x86_64-linux-gnu/qt5/bin/qmake
     - rvm: 1.9.3
       gemfile: gemfiles/2.2.gemfile
       env: QMAKE=/usr/lib/x86_64-linux-gnu/qt5/bin/qmake
     - rvm: 1.9.3
       gemfile: gemfiles/2.3.gemfile
       env: QMAKE=/usr/lib/x86_64-linux-gnu/qt5/bin/qmake
+    - rvm: 1.9.3
+      gemfile: gemfiles/2.4.gemfile
+      env: QMAKE=/usr/lib/x86_64-linux-gnu/qt5/bin/qmake
 gemfile:
-  - gemfiles/2.1.gemfile
   - gemfiles/2.2.gemfile
   - gemfiles/2.3.gemfile
+  - gemfiles/2.4.gemfile
 before_install:
   - sudo apt-add-repository -y ppa:ubuntu-sdk-team/ppa
   - sudo apt-get update

data/Appraisals

@@ -9,3 +9,7 @@ end
 appraise "2.3" do
   gem "capybara", "~> 2.3.0"
 end
+
+appraise "2.4" do
+  gem "capybara", "~> 2.4.0"
+end

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    capybara-webkit (1.2.0)
-      capybara (>= 2.0.2, < 2.4.0)
+    capybara-webkit (1.3.0)
+      capybara (>= 2.0.2, < 2.5.0)
       json
 
 GEM
@@ -12,7 +12,7 @@ GEM
     appraisal (0.4.0)
       bundler
       rake
-    capybara (2.3.0)
+    capybara (2.4.1)
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
       rack (>= 1.0.0)
@@ -25,7 +25,6 @@ GEM
     ffi (1.9.3-java)
     ffi (1.9.3-x86-mingw32)
     json (1.8.1)
-    json (1.8.1-java)
     launchy (2.4.2)
       addressable (~> 2.3)
     launchy (2.4.2-java)
@@ -38,9 +37,6 @@ GEM
     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

data/NEWS.md

@@ -1,3 +1,10 @@
+New for 1.3.0:
+
+* Capybara 2.4 compatibility.
+* Raise better errors if server fails to start
+* Offline application cache support.
+* Wildcard URL blacklist support.
+
 New for 1.2.0:
 * Capybara 2.3 compatibility.
 * Kill webkit_server when parent process closes stdin.

data/README.md

@@ -14,7 +14,7 @@ development toolkit. You'll need to download the Qt libraries to build and
 install the gem. You can find instructions for downloading and installing QT on
 the
 [capybara-webkit wiki](https://github.com/thoughtbot/capybara-webkit/wiki/Installing-Qt-and-compiling-capybara-webkit).
-capybara-webkit requires Qt version 4.8.
+capybara-webkit requires Qt version 4.8 or greater.
 
 Windows Support
 ---------------
@@ -47,7 +47,13 @@ CI
 
 If you're like us, you'll be using capybara-webkit on CI.
 
-On Linux platforms, capybara-webkit requires an X server to run, although it doesn't create any visible windows. Xvfb works fine for this. You can setup Xvfb yourself and set a DISPLAY variable, or try out the [headless gem](https://github.com/leonid-shevtsov/headless).
+On Linux platforms, capybara-webkit requires an X server to run, although it doesn't create any visible windows. Xvfb works fine for this. You can setup Xvfb yourself and set a DISPLAY variable, try out the [headless gem](https://github.com/leonid-shevtsov/headless), or use the xvfb-run utility as follows:
+
+```
+xvfb-run -a bundle exec spec
+```
+
+This automatically sets up a virtual X server on a free server number.
 
 Usage
 -----
@@ -76,6 +82,13 @@ If you're using capybara-webkit with Sinatra, don't forget to set
 Capybara.app = MySinatraApp.new
 ```
 
+Offline Application Cache
+-------------------------
+
+The offline application cache needs a directory to write to for the cached files. Capybara-webkit
+will look at if the working directory has a tmp directory and when it exists offline application
+cache will be enabled.
+
 Non-Standard Driver Methods
 ---------------------------
 
@@ -101,33 +114,6 @@ page.driver.error_messages
 => [{: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
-
-```js
-// In Javascript:
-alert("HI");
-confirm("Ok?");
-prompt("Number?", "42");
-```
-
-```ruby
-# In Ruby:
-page.driver.alert_messages
-=> ["Hi"]
-page.driver.confirm_messages
-=> ["Ok?"]
-page.driver.prompt_messages
-=> ["Number?"]
-```
-
-**resize_window**: change the viewport size to the given width and height
-
-```ruby
-page.driver.resize_window(500, 300)
-page.driver.evaluate_script("window.innerWidth")
-=> 500
-```
-
 **cookies**: allows read-only access of cookies for the current session
 
 ```ruby
@@ -135,94 +121,6 @@ page.driver.cookies["alpha"]
 => "abc"
 ```
 
-**accept_js_confirms!**: accept any Javascript confirm that is triggered by the page's Javascript
-
-```js
-// In Javascript:
-if (confirm("Ok?"))
-  console.log("Hi");
-else
-  console.log("Bye");
-```
-
-```ruby
-# In Ruby:
-page.driver.accept_js_confirms!
-visit "/"
-page.driver.console_messages.first[:message]
-=> "Hi"
-```
-
-**dismiss_js_confirms!**: dismiss any Javascript confirm that is triggered by the page's Javascript
-
-```js
-// In Javascript:
-if (confirm("Ok?"))
-  console.log("Hi");
-else
-  console.log("Bye");
-```
-
-```ruby
-# In Ruby:
-page.driver.dismiss_js_confirms!
-visit "/"
-page.driver.console_messages.first[:message]
-=> "Bye"
-```
-
-**accept_js_prompts!**: accept any Javascript prompt that is triggered by the page's Javascript
-
-```js
-// In Javascript:
-var a = prompt("Number?", "0")
-console.log(a);
-```
-
-```ruby
-# In Ruby:
-page.driver.accept_js_prompts!
-visit "/"
-page.driver.console_messages.first[:message]
-=> "0"
-```
-
-**dismiss_js_prompts!**: dismiss any Javascript prompt that is triggered by the page's Javascript
-
-```js
-// In Javascript:
-var a = prompt("Number?", "0")
-if (a != null)
-  console.log(a);
-else
-  console.log("you said no"));
-```
-
-```ruby
-# In Ruby:
-page.driver.dismiss_js_prompts!
-visit "/"
-page.driver.console_messages.first[:message]
-=> "you said no"
-```
-
-**js_prompt_input=(value)**: set the text to use if a Javascript prompt is encountered and accepted
-
-```js
-// In Javascript:
-var a = prompt("Number?", "0")
-console.log(a);
-```
-
-```ruby
-# In Ruby:
-page.driver.js_prompt_input = "42"
-page.driver.accept_js_prompts!
-visit "/"
-page.driver.console_messages.first[:message]
-=> "42"
-```
-
 **header**: set the given HTTP header for subsequent requests
 
 ```ruby
@@ -248,4 +146,4 @@ The names and logos for thoughtbot are trademarks of thoughtbot, inc.
 License
 -------
 
-capybara-webkit is Copyright (c) 2010-2013 thoughtbot, inc. It is free software, and may be redistributed under the terms specified in the LICENSE file.
+capybara-webkit is Copyright (c) 2010-2014 thoughtbot, inc. It is free software, and may be redistributed under the terms specified in the LICENSE file.

data/Rakefile

@@ -3,7 +3,9 @@ require 'rspec/core/rake_task'
 require_relative './lib/capybara_webkit_builder'
 require 'appraisal'
 
-Bundler::GemHelper.install_tasks
+namespace :bundler do
+  Bundler::GemHelper.install_tasks
+end
 
 desc "Generate a Makefile using qmake"
 file 'Makefile' do

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", "< 2.4.0")
+  s.add_runtime_dependency("capybara", ">= 2.0.2", "< 2.5.0")
   s.add_runtime_dependency("json")
 
   s.add_development_dependency("rspec", "~> 2.14.0")

data/gemfiles/2.1.gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: ../
   specs:
-    capybara-webkit (1.2.0)
-      capybara (>= 2.0.2, < 2.4.0)
+    capybara-webkit (1.3.0)
+      capybara (>= 2.0.2, < 2.5.0)
       json
 
 GEM
@@ -24,7 +24,6 @@ GEM
     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)

data/gemfiles/2.2.gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: ../
   specs:
-    capybara-webkit (1.2.0)
-      capybara (>= 2.0.2, < 2.4.0)
+    capybara-webkit (1.3.0)
+      capybara (>= 2.0.2, < 2.5.0)
       json
 
 GEM

data/gemfiles/2.3.gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: ../
   specs:
-    capybara-webkit (1.2.0)
-      capybara (>= 2.0.2, < 2.4.0)
+    capybara-webkit (1.3.0)
+      capybara (>= 2.0.2, < 2.5.0)
       json
 
 GEM

data/gemfiles/2.4.gemfile

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

data/gemfiles/2.4.gemfile.lock

@@ -0,0 +1,77 @@
+PATH
+  remote: ../
+  specs:
+    capybara-webkit (1.3.0)
+      capybara (>= 2.0.2, < 2.5.0)
+      json
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    addressable (2.3.6)
+    appraisal (0.4.1)
+      bundler
+      rake
+    capybara (2.4.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.6)
+    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.4.0)
+  capybara-webkit!
+  launchy
+  mini_magick
+  rake
+  rspec (~> 2.14.0)
+  selenium-webdriver
+  sinatra

data/lib/capybara/webkit/browser.rb

@@ -126,26 +126,54 @@ module Capybara::Webkit
       JSON.parse(command('GetWindowHandles'))
     end
 
-    alias_method :window_handles, :get_window_handles
+    def window_handles
+      warn '[DEPRECATION] Capybara::Webkit::Browser#window_handles ' \
+        'is deprecated. Please use Capybara::Session#windows instead.'
+      get_window_handles
+    end
 
     def get_window_handle
       command('GetWindowHandle')
     end
 
-    alias_method :window_handle, :get_window_handle
+    def window_handle
+      warn '[DEPRECATION] Capybara::Webkit::Browser#window_handle ' \
+        'is deprecated. Please use Capybara::Session#current_window instead.'
+      get_window_handle
+    end
+
+    def accept_confirm(options)
+      command("SetConfirmAction", "Yes", options[:text])
+    end
 
     def accept_js_confirms
       command("SetConfirmAction", "Yes")
     end
 
+    def reject_confirm(options)
+      command("SetConfirmAction", "No", options[:text])
+    end
+
     def reject_js_confirms
       command("SetConfirmAction", "No")
     end
 
+    def accept_prompt(options)
+      if options[:with]
+        command("SetPromptAction", "Yes", options[:text], options[:with])
+      else
+        command("SetPromptAction", "Yes", options[:text])
+      end
+    end
+
     def accept_js_prompts
       command("SetPromptAction", "Yes")
     end
 
+    def reject_prompt(options)
+      command("SetPromptAction", "No", options[:text])
+    end
+
     def reject_js_prompts
       command("SetPromptAction", "No")
     end
@@ -158,6 +186,14 @@ module Capybara::Webkit
       command("ClearPromptText")
     end
 
+    def accept_alert(options)
+      command("AcceptAlert", options[:text])
+    end
+
+    def find_modal(id)
+      command("FindModal", id)
+    end
+
     def url_blacklist=(black_list)
       command("SetUrlBlacklist", *Array(black_list))
     end