Merge remote branch 'smparkes/master'

README.rdoc

@@ -8,7 +8,8 @@ Capybara aims to simplify the process of integration testing Rack applications,
 such as Rails, Sinatra or Merb. It is inspired by and aims to replace Webrat as
 a DSL for interacting with a webapplication. It is agnostic about the driver
 running your tests and currently comes bundled with rack-test, Culerity,
-Celerity and Selenium support built in.
+Celerity and Selenium support built in. env.js support is available as the
+{capybara-envjs gem}[http://github.com/smparkes/capybara-envjs].
 
 == Install:
 
@@ -123,6 +124,16 @@ being.
 Install celerity as noted above, make sure JRuby is in your path. Note that
 Culerity doesn't seem to be working under Ruby 1.9 at the moment.
 
+== env.js
+
+The {capybara-envjs driver}[http://github.com/smparkes/capybara-envjs]
+uses the envjs gem ({GitHub}[http://github.com/smparkes/env-js],
+{rubygems.org}[http://rubygems.org/gems/envjs]) to interpret
+JavaScript outside the browser. The driver is installed by installing the capybara-envjs gem:
+  gem install capybara-envjs
+More info about the driver and env.js are available through the links above. The envjs gem only supports
+Ruby 1.8.7 at this time.
+
 == The DSL
 
 Capybara's DSL is inspired by Webrat. While backwards compatibility is retained

lib/capybara/spec/session/click_button_spec.rb

@@ -224,6 +224,7 @@
 
     it "should follow redirects" do
       @session.click_button('Go FAR')
+      @session.driver.current_url.should match(%r{/landed$})
       @session.body.should include('You landed')
     end