Permalink
Browse files

Dispatcher test requires abstract_unit. Cleanup abstract_unit.

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@6276 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
1 parent e69390d commit 36cf67e8e50056e178f2d43705a324778fddfd0f @jeremy jeremy committed Mar 1, 2007
Showing with 3 additions and 8 deletions.
  1. +1 −4 railties/test/abstract_unit.rb
  2. +2 −4 railties/test/dispatcher_test.rb
@@ -4,10 +4,7 @@
$:.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__)
@@ -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 @@ def dispatch(output = @output)
def assert_subclasses(howmany, klass, message = klass.subclasses.inspect)
assert_equal howmany, klass.subclasses.size, message
end
-end
+end

0 comments on commit 36cf67e

Please sign in to comment.