From 38cdb3eba0d59f7ffc7fdbb4ca808e759fba504b Mon Sep 17 00:00:00 2001
From: Nihad Abbasov <narkoz.2008@gmail.com>
Date: Thu, 27 Oct 2011 02:23:04 +0500
Subject: [PATCH] update shoulda to edge. fixes deprecations

---
 Gemfile      | 2 +-
 Gemfile.lock | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/Gemfile b/Gemfile
index 77a00659ac7..28168095b36 100644
--- a/Gemfile
+++ b/Gemfile
@@ -34,7 +34,7 @@ end
 
 group :development, :test do
   gem 'rspec-rails'
-  gem 'shoulda'
+  gem "shoulda", "~> 3.0.0.beta2"
   gem 'capybara'
   gem 'autotest'
   gem 'autotest-rails'
diff --git a/Gemfile.lock b/Gemfile.lock
index 5ba34459752..01ec37e1ba0 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -200,7 +200,11 @@ GEM
       ffi (>= 1.0.7)
       json_pure
       rubyzip
-    shoulda (2.11.3)
+    shoulda (3.0.0.beta2)
+      shoulda-context (~> 1.0.0.beta1)
+      shoulda-matchers (~> 1.0.0.beta1)
+    shoulda-context (1.0.0.beta1)
+    shoulda-matchers (1.0.0.beta3)
     simplecov (0.5.3)
       multi_json (~> 1.0.3)
       simplecov-html (~> 0.5.3)
@@ -265,7 +269,7 @@ DEPENDENCIES
   ruby-debug19
   sass-rails (~> 3.1.0)
   seed-fu!
-  shoulda
+  shoulda (~> 3.0.0.beta2)
   simplecov
   six
   sqlite3