improve fix for Devise/Cucumber issue, update mongoid from 2.1.9 to 2…

….2.0
jerefrer · Aug 29, 2011 · 520a4b5 · 520a4b5
1 parent 4b173a5
commit 520a4b5
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/CHANGELOG.textile b/CHANGELOG.textile
@@ -1,5 +1,10 @@
 h1. CHANGELOG
 
+h2. 1.0.16 August 30, 2011
+
+* update gem 'mongoid' from 2.1.9 to 2.2.0
+* improve fix for Devise/Cucumber issue https://github.com/RailsApps/rails3-devise-rspec-cucumber/issues/3
+
 h2. 1.0.15 August 24, 2011
 
 * update gem 'mongoid' from 2.1.5 to 2.1.9
@@ -22,7 +27,7 @@ h2. 1.0.12 July 9, 2011
 
 * update gem 'factory_girl_rails' from 1.1.beta3 to 1.1.rc1
 * update gem 'devise' from 1.4.0 to 1.4.2
-* fix for issue https://github.com/RailsApps/rails3-devise-rspec-cucumber/issues/3
+* fix for Devise/Cucumber issue https://github.com/RailsApps/rails3-devise-rspec-cucumber/issues/3
 
 h2. 1.0.11 June 29, 2011
 

diff --git a/recipes/devise.rb b/recipes/devise.rb
@@ -37,7 +37,7 @@
     if recipes.include? 'cucumber'
       # Cucumber wants to test GET requests not DELETE requests for destroy_user_session_path
       # (see https://github.com/RailsApps/rails3-devise-rspec-cucumber/issues/3)
-      gsub_file 'config/initializers/devise.rb', 'config.sign_out_via = :delete', 'config.sign_out_via = :get'
+      gsub_file 'config/initializers/devise.rb', 'config.sign_out_via = :delete', 'config.sign_out_via = Rails.env.test? ? :get : :delete'
     end
 
   end

diff --git a/recipes/mongoid.rb b/recipes/mongoid.rb
@@ -11,7 +11,7 @@
   else
     # for Rails 3.1+, use optimistic versioning for gems
     gem 'bson_ext', '>= 1.3.1'
-    gem 'mongoid', '>= 2.1.9'
+    gem 'mongoid', '>= 2.2.0'
   end
 else
   recipes.delete('mongoid')