diff options
Diffstat (limited to 'railties')
| -rw-r--r-- | railties/test/abstract_unit.rb | 5 | ||||
| -rw-r--r-- | railties/test/dispatcher_test.rb | 6 |
2 files changed, 3 insertions, 8 deletions
diff --git a/railties/test/abstract_unit.rb b/railties/test/abstract_unit.rb index 07aeb77fdf..68ddb0c24f 100644 --- a/railties/test/abstract_unit.rb +++ b/railties/test/abstract_unit.rb @@ -4,10 +4,7 @@ $:.unshift File.dirname(__FILE__) + "/../lib" $:.unshift File.dirname(__FILE__) + "/../builtin/rails_info" require 'test/unit' -require 'rubygems' - -# Needed for the class mock delegation -#require File.dirname(__FILE__) + "/../../activesupport/lib/active_support/core_ext/class/attribute_accessors" +require 'active_support' if defined?(RAILS_ROOT) RAILS_ROOT.replace File.dirname(__FILE__) diff --git a/railties/test/dispatcher_test.rb b/railties/test/dispatcher_test.rb index 31d1634cc0..ad5a4d6275 100644 --- a/railties/test/dispatcher_test.rb +++ b/railties/test/dispatcher_test.rb @@ -1,8 +1,6 @@ -$:.unshift File.dirname(__FILE__) + "/../lib" -$:.unshift File.dirname(__FILE__) + "/../../actionpack/lib" +require "#{File.dirname(__FILE__)}/abstract_unit" $:.unshift File.dirname(__FILE__) + "/../../actionmailer/lib" -require 'test/unit' require 'stringio' require 'cgi' @@ -138,4 +136,4 @@ class DispatcherTest < Test::Unit::TestCase def assert_subclasses(howmany, klass, message = klass.subclasses.inspect) assert_equal howmany, klass.subclasses.size, message end -end
\ No newline at end of file +end |