github/rails
1
1
Fork 0
mirror of https://github.com/github/rails.git synced 2026-04-26 03:00:59 -04:00
Code Issues Packages Projects Releases Wiki Activity

Removed the require hack used in functional tests that worked around an earlier bug in rake.

Browse Source 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1421 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
This commit is contained in:
Jamis Buck
2005-06-14 16:17:56 +00:00
parent ed7bfc9662
commit ac1fa98bb9
2 changed files with 2 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
actionpack/CHANGELOG
View File

@@ -1,5 +1,7 @@
*SVN*
* Removed the require hack used by functional testing to work around an earlier bug in rake.
* Allow distance_of_time_in_words to work with any value that responds to #to_time (like dates) #969
* Support :render option for :verify #1440 [TobiasLuetke]

16
actionpack/lib/action_controller/test_process.rb
View File

@@ -1,22 +1,6 @@
require File.dirname(__FILE__) + '/assertions'
require File.dirname(__FILE__) + '/deprecated_assertions'
if defined?(RAILS_ROOT)
# Temporary hack for getting functional tests in Rails running under 1.8.2
class Object #:nodoc:
alias_method :require_without_load_path_reloading, :require
def require(file_name)
begin
require_without_load_path_reloading(file_name)
rescue Object => e
ADDITIONAL_LOAD_PATHS.reverse.each { |dir| $:.unshift(dir) if File.directory?(dir) }
require_without_load_path_reloading(file_name)
end
end
end
end
module ActionController #:nodoc:
class Base
# Process a test request called with a +TestRequest+ object.