diff options
| author | Santiago Pastorino <santiago@wyeworks.com> | 2011-06-25 12:12:49 -0700 |
|---|---|---|
| committer | Santiago Pastorino <santiago@wyeworks.com> | 2011-06-25 12:12:49 -0700 |
| commit | 095f0466c880e802c287e899e4ed645e44453484 (patch) | |
| tree | 756b83ca83ef43a9ce712bd3fc8dc9f1ffa7b537 /actionpack/lib/action_dispatch | |
| parent | 211fa2d28d0f8a875792e078e1fca3718649de3c (diff) | |
| parent | a7af1e0051c5fae0a851a9c7f84892573639e5c5 (diff) | |
| download | rails-095f0466c880e802c287e899e4ed645e44453484.tar.gz rails-095f0466c880e802c287e899e4ed645e44453484.tar.bz2 rails-095f0466c880e802c287e899e4ed645e44453484.zip | |
Merge pull request #1861 from dchelimsky/fixture_path
Get the fixture_path from self.class instead of ActiveSupport::TestCase.
Diffstat (limited to 'actionpack/lib/action_dispatch')
| -rw-r--r-- | actionpack/lib/action_dispatch/testing/test_process.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_dispatch/testing/test_process.rb b/actionpack/lib/action_dispatch/testing/test_process.rb index 367c295cf5..f668b81b45 100644 --- a/actionpack/lib/action_dispatch/testing/test_process.rb +++ b/actionpack/lib/action_dispatch/testing/test_process.rb @@ -39,7 +39,7 @@ module ActionDispatch # # post :change_avatar, :avatar => fixture_file_upload('/files/spongebob.png', 'image/png', :binary) def fixture_file_upload(path, mime_type = nil, binary = false) - fixture_path = ActionController::TestCase.send(:fixture_path) if ActionController::TestCase.respond_to?(:fixture_path) + fixture_path = self.class.fixture_path if self.class.respond_to?(:fixture_path) Rack::Test::UploadedFile.new("#{fixture_path}#{path}", mime_type, binary) end end |