diff options
| author | Rick Olson <technoweenie@gmail.com> | 2006-08-09 00:11:28 +0000 |
|---|---|---|
| committer | Rick Olson <technoweenie@gmail.com> | 2006-08-09 00:11:28 +0000 |
| commit | f06cae36524a579f3cd1f2ab78e0b5dd8361feab (patch) | |
| tree | 5af745cccf57fbe8e4aa9c51d4e07f7abc7e2c8f /actionpack | |
| parent | 4679e1bf7f83b501f4a9507d530d4c707d16921f (diff) | |
| download | rails-f06cae36524a579f3cd1f2ab78e0b5dd8361feab.tar.gz rails-f06cae36524a579f3cd1f2ab78e0b5dd8361feab.tar.bz2 rails-f06cae36524a579f3cd1f2ab78e0b5dd8361feab.zip | |
Require Tempfile explicitly for TestUploadedFile due to changes in class auto loading. [Rick Olson]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4734 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/CHANGELOG | 2 | ||||
| -rw-r--r-- | actionpack/lib/action_controller/test_process.rb | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG index 1b844f46b3..762a3bd7a5 100644 --- a/actionpack/CHANGELOG +++ b/actionpack/CHANGELOG @@ -1,5 +1,7 @@ *SVN* +* Require Tempfile explicitly for TestUploadedFile due to changes in class auto loading. [Rick Olson] + * Add RoutingError exception when RouteSet fails to generate a path from a Named Route. [Rick Olson] * Replace Reloadable with Reloadable::Deprecated. [Nicholas Seckar] diff --git a/actionpack/lib/action_controller/test_process.rb b/actionpack/lib/action_controller/test_process.rb index 2ae17c7adc..118e48e5cf 100644 --- a/actionpack/lib/action_controller/test_process.rb +++ b/actionpack/lib/action_controller/test_process.rb @@ -305,6 +305,7 @@ module ActionController #:nodoc: # # Usage example, within a functional test: # post :change_avatar, :avatar => ActionController::TestUploadedFile.new(Test::Unit::TestCase.fixture_path + '/files/spongebob.png', 'image/png') + require 'tempfile' class TestUploadedFile # The filename, *not* including the path, of the "uploaded" file attr_reader :original_filename |