From 6d214c953b74c40d6247dfd2d4526991a0f99f5c Mon Sep 17 00:00:00 2001
From: Joshua Peek <josh@joshpeek.com>
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/new_base/render_implicit_action_test.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'actionpack/test/new_base/render_implicit_action_test.rb')

diff --git a/actionpack/test/new_base/render_implicit_action_test.rb b/actionpack/test/new_base/render_implicit_action_test.rb
index fd96e1955f..03b9ff6eeb 100644
--- a/actionpack/test/new_base/render_implicit_action_test.rb
+++ b/actionpack/test/new_base/render_implicit_action_test.rb
@@ -1,4 +1,4 @@
-require File.join(File.expand_path(File.dirname(__FILE__)), "test_helper")
+require 'abstract_unit2'
 
 module RenderImplicitAction
   class SimpleController < ::ApplicationController
@@ -25,4 +25,4 @@ module RenderImplicitAction
       assert_status 200
     end
   end
-end
\ No newline at end of file
+end
-- 
cgit v1.2.3