diff options
author | Joshua Peek <josh@joshpeek.com> | 2009-09-13 16:30:27 -0500 |
---|---|---|
committer | Joshua Peek <josh@joshpeek.com> | 2009-09-13 16:30:27 -0500 |
commit | 6d214c953b74c40d6247dfd2d4526991a0f99f5c (patch) | |
tree | 83349dfa5e523a3afa4a6a1f61e6f3a848412f75 /actionpack/test/new_base/etag_test.rb | |
parent | 199a423f42c58f3904d75d7a2ab08496bba907c4 (diff) | |
download | rails-6d214c953b74c40d6247dfd2d4526991a0f99f5c.tar.gz rails-6d214c953b74c40d6247dfd2d4526991a0f99f5c.tar.bz2 rails-6d214c953b74c40d6247dfd2d4526991a0f99f5c.zip |
Merge abstract_controller/test_helper and new_base/test_helper since they are expected to run in the same testing sandbox
Diffstat (limited to 'actionpack/test/new_base/etag_test.rb')
-rw-r--r-- | actionpack/test/new_base/etag_test.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/test/new_base/etag_test.rb b/actionpack/test/new_base/etag_test.rb index 3a69e7dac4..64ae10b7a7 100644 --- a/actionpack/test/new_base/etag_test.rb +++ b/actionpack/test/new_base/etag_test.rb @@ -1,4 +1,4 @@ -require File.join(File.expand_path(File.dirname(__FILE__)), "test_helper") +require 'abstract_unit2' module Etags class BasicController < ActionController::Base @@ -43,4 +43,4 @@ module Etags %("#{Digest::MD5.hexdigest(text)}") end end -end
\ No newline at end of file +end |