From 3e70e891feff895f8fd31210136dc0a8d7cd7935 Mon Sep 17 00:00:00 2001 From: Joe Ferris Date: Wed, 4 Feb 2009 19:41:08 -0500 Subject: [PATCH] Fixed the Rails initializer to integrate with RSpec when needed --- rails/init.rb | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/rails/init.rb b/rails/init.rb index 473ee021..3f683d8e 100644 --- a/rails/init.rb +++ b/rails/init.rb @@ -1 +1,7 @@ -require 'shoulda/rails' if RAILS_ENV == 'test' +if RAILS_ENV == 'test' + if defined? Spec + require 'shoulda/rspec' + else + require 'shoulda/rails' + end +end