lib/spec/rails.rb in dchelimsky-rspec-rails-1.1.11.1 vs lib/spec/rails.rb in dchelimsky-rspec-rails-1.1.11.2
- old
+ new
@@ -1,7 +1,12 @@
silence_warnings { RAILS_ENV = "test" }
-require_dependency 'application'
+begin
+ require_dependency 'application_controller'
+rescue MissingSourceFile
+ require_dependency 'application'
+end
+
require 'action_controller/test_process'
require 'action_controller/integration'
require 'active_record/fixtures' if defined?(ActiveRecord::Base)
require 'test/unit'
\ No newline at end of file