diff --git a/init.rb b/init.rb index 43ca08d9..7b460ade 100644 --- a/init.rb +++ b/init.rb @@ -1,6 +1,9 @@ require 'rubygems' require 'active_support' require 'shoulda' +require 'shoulda/active_record' +require 'shoulda/controller' +require 'shoulda/action_mailer' if defined?(RAILS_ROOT) # load in the 3rd party macros from vendorized plugins and gems diff --git a/lib/shoulda.rb b/lib/shoulda.rb index 816c3efa..93a5bdd5 100644 --- a/lib/shoulda.rb +++ b/lib/shoulda.rb @@ -15,9 +15,6 @@ module Test # :nodoc: all end end -require 'shoulda/active_record' -require 'shoulda/controller' -require 'shoulda/action_mailer' require 'yaml' shoulda_options = {}