Switch to shoulda-matcher and bump cucumber-rails

Gemfile

@@ -3,11 +3,12 @@ gem "aruba", "~> 0.3.6"
 gem "rake"
 gem "rails", ">= 3.0.7"
 gem "thin"
-gem "shoulda"
+gem "shoulda-matchers", :git => "git://github.com/thoughtbot/shoulda-matchers.git"
 gem "sqlite3"
 gem "factory_girl"
 gem "diesel", :git => "git://github.com/thoughtbot/diesel.git", :branch => "rails-3-1"
-gem "cucumber-rails", '0.3.2'
+gem "cucumber-rails", '>= 0.5.2'
+gem "database_cleaner"
 gem "capybara"
 gem "factory_girl_rails"
 gem "rspec-rails"

Gemfile.lock

@@ -1,74 +1,80 @@
 GIT
   remote: git://github.com/thoughtbot/diesel.git
-  revision: eb1858456b6b8046bd6c14e477ccf16c61c4b120
+  revision: 1abb5d0e7dfefa42c3f215b06971bb7345599136
   branch: rails-3-1
   specs:
     diesel (0.1.4)
       railties
 
+GIT
+  remote: git://github.com/thoughtbot/shoulda-matchers.git
+  revision: 85d3e5ea000cf162ef672059ea5e5f77f3ca9f03
+  specs:
+    shoulda-matchers (1.0.0.beta3)
+
 GEM
   remote: http://rubygems.org/
   specs:
     abstract (1.0.0)
-    actionmailer (3.0.7)
-      actionpack (= 3.0.7)
-      mail (~> 2.2.15)
-    actionpack (3.0.7)
-      activemodel (= 3.0.7)
-      activesupport (= 3.0.7)
+    actionmailer (3.0.8)
+      actionpack (= 3.0.8)
+      mail (~> 2.2.19)
+    actionpack (3.0.8)
+      activemodel (= 3.0.8)
+      activesupport (= 3.0.8)
       builder (~> 2.1.2)
       erubis (~> 2.6.6)
       i18n (~> 0.5.0)
       rack (~> 1.2.1)
       rack-mount (~> 0.6.14)
       rack-test (~> 0.5.7)
       tzinfo (~> 0.3.23)
-    activemodel (3.0.7)
-      activesupport (= 3.0.7)
+    activemodel (3.0.8)
+      activesupport (= 3.0.8)
       builder (~> 2.1.2)
       i18n (~> 0.5.0)
-    activerecord (3.0.7)
-      activemodel (= 3.0.7)
-      activesupport (= 3.0.7)
-      arel (~> 2.0.2)
+    activerecord (3.0.8)
+      activemodel (= 3.0.8)
+      activesupport (= 3.0.8)
+      arel (~> 2.0.10)
       tzinfo (~> 0.3.23)
-    activeresource (3.0.7)
-      activemodel (= 3.0.7)
-      activesupport (= 3.0.7)
-    activesupport (3.0.7)
+    activeresource (3.0.8)
+      activemodel (= 3.0.8)
+      activesupport (= 3.0.8)
+    activesupport (3.0.8)
     appraisal (0.3.5)
       aruba (~> 0.3.6)
       bundler
       rake
-    arel (2.0.9)
-    aruba (0.3.6)
-      childprocess (>= 0.1.7)
-      cucumber (>= 0.10.0)
-      rspec (>= 2.5.0)
+    arel (2.0.10)
+    aruba (0.3.7)
+      childprocess (>= 0.1.9)
+      cucumber (>= 0.10.5)
+      rspec (>= 2.6.0)
     builder (2.1.2)
-    capybara (0.4.1.2)
-      celerity (>= 0.7.9)
-      culerity (>= 0.2.4)
+    capybara (1.0.0.rc1)
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
-      selenium-webdriver (>= 0.0.27)
-      xpath (~> 0.1.3)
-    celerity (0.8.9)
-    childprocess (0.1.8)
+      selenium-webdriver (~> 0.2.0)
+      xpath (~> 0.1.4)
+    childprocess (0.1.9)
       ffi (~> 1.0.6)
     configuration (1.2.0)
-    cucumber (0.10.2)
+    cucumber (0.10.6)
       builder (>= 2.1.2)
       diff-lcs (>= 1.1.2)
-      gherkin (>= 2.3.5)
+      gherkin (~> 2.4.0)
       json (>= 1.4.6)
       term-ansicolor (>= 1.0.5)
-    cucumber-rails (0.3.2)
-      cucumber (>= 0.8.0)
-    culerity (0.2.15)
+    cucumber-rails (0.5.2)
+      capybara (>= 1.0.0.rc1)
+      cucumber (>= 0.10.5)
+      nokogiri (>= 1.4.4)
+      rack-test (>= 0.5.7)
     daemons (1.1.3)
+    database_cleaner (0.6.7)
     diff-lcs (1.1.2)
     erubis (2.6.6)
       abstract (>= 1.0.0)
@@ -77,9 +83,8 @@ GEM
     factory_girl_rails (1.0.1)
       factory_girl (~> 1.3)
       railties (>= 3.0.0)
-    ffi (1.0.7)
-      rake (>= 0.8.7)
-    gherkin (2.3.6)
+    ffi (1.0.9)
+    gherkin (2.4.0)
       json (>= 1.4.6)
     i18n (0.5.0)
     json (1.5.1)
@@ -101,17 +106,17 @@ GEM
       rack (>= 1.0.0)
     rack-test (0.5.7)
       rack (>= 1.0)
-    rails (3.0.7)
-      actionmailer (= 3.0.7)
-      actionpack (= 3.0.7)
-      activerecord (= 3.0.7)
-      activeresource (= 3.0.7)
-      activesupport (= 3.0.7)
+    rails (3.0.8)
+      actionmailer (= 3.0.8)
+      actionpack (= 3.0.8)
+      activerecord (= 3.0.8)
+      activeresource (= 3.0.8)
+      activesupport (= 3.0.8)
       bundler (~> 1.0)
-      railties (= 3.0.7)
-    railties (3.0.7)
-      actionpack (= 3.0.7)
-      activesupport (= 3.0.7)
+      railties (= 3.0.8)
+    railties (3.0.8)
+      actionpack (= 3.0.8)
+      activesupport (= 3.0.8)
       rake (>= 0.8.7)
       thor (~> 0.14.4)
     rake (0.9.2)
@@ -129,12 +134,11 @@ GEM
       railties (~> 3.0)
       rspec (~> 2.6.0)
     rubyzip (0.9.4)
-    selenium-webdriver (0.2.0)
+    selenium-webdriver (0.2.1)
       childprocess (>= 0.1.7)
       ffi (>= 1.0.7)
       json_pure
       rubyzip
-    shoulda (2.11.3)
     sqlite3 (1.3.3)
     term-ansicolor (1.0.5)
     thin (1.2.11)
@@ -155,7 +159,8 @@ DEPENDENCIES
   appraisal (~> 0.3.5)
   aruba (~> 0.3.6)
   capybara
-  cucumber-rails (= 0.3.2)
+  cucumber-rails (>= 0.5.2)
+  database_cleaner
   diesel!
   factory_girl
   factory_girl_rails
@@ -164,6 +169,6 @@ DEPENDENCIES
   rails (>= 3.0.7)
   rake
   rspec-rails
-  shoulda
+  shoulda-matchers!
   sqlite3
   thin

spec/controllers/passwords_controller_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe Clearance::PasswordsController do
-  include Shoulda::ActionMailer::Matchers
+  include Shoulda::Matchers::ActionMailer
 
   it { should route(:get, '/users/1/password/edit').
                 to(:controller => 'clearance/passwords', :action  => 'edit', :user_id => '1') }