From 6d214c953b74c40d6247dfd2d4526991a0f99f5c Mon Sep 17 00:00:00 2001 From: Joshua Peek Date: Sun, 13 Sep 2009 16:30:27 -0500 Subject: Merge abstract_controller/test_helper and new_base/test_helper since they are expected to run in the same testing sandbox --- actionpack/test/abstract_controller/layouts_test.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'actionpack/test/abstract_controller/layouts_test.rb') diff --git a/actionpack/test/abstract_controller/layouts_test.rb b/actionpack/test/abstract_controller/layouts_test.rb index 995aac7fad..bee3b5c556 100644 --- a/actionpack/test/abstract_controller/layouts_test.rb +++ b/actionpack/test/abstract_controller/layouts_test.rb @@ -1,4 +1,4 @@ -require File.join(File.expand_path(File.dirname(__FILE__)), "test_helper") +require 'abstract_unit2' require 'active_support/core_ext/class/removal' module AbstractControllerTests -- cgit v1.2.3