@@ -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 rails/init.rb d11ab46334385fec8b7289fea2e8f1e4821b2b9a Joe Ferris joe.r.ferris@gmail.com http://github.com/thoughtbot/shoulda/commit/3e70e891feff895f8fd31210136dc0a8d7cd7935 3e70e891feff895f8fd31210136dc0a8d7cd7935 2009-02-04T16:41:08-08:00 2009-02-04T16:41:08-08:00 Fixed the Rails initializer to integrate with RSpec when needed e044a8b7db4517efc35ba53a4489937bbce8ba7d Joe Ferris joe.r.ferris@gmail.com