diff options
| author | Eileen M. Uchitelle <eileencodes@gmail.com> | 2016-09-04 08:13:40 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-09-04 08:13:40 -0400 |
| commit | 10fcf42497a3c3e561b38af38d57cf5cbe8da195 (patch) | |
| tree | 97b822f7fe225072be917db8b6e82d5503bcbe4c /actionpack/lib/action_dispatch/testing/integration.rb | |
| parent | ce97dc1abf4d301c8a4aaa7e790088b8d318afd4 (diff) | |
| parent | 333f10e32c0b8cbaf4dbaaee3333d21b138a7d4a (diff) | |
| download | rails-10fcf42497a3c3e561b38af38d57cf5cbe8da195.tar.gz rails-10fcf42497a3c3e561b38af38d57cf5cbe8da195.tar.bz2 rails-10fcf42497a3c3e561b38af38d57cf5cbe8da195.zip | |
Merge pull request #26384 from y-yagi/make_fixture_file_upload_in_integration_test
make `fixture_file_upload` work in integration tests
Diffstat (limited to 'actionpack/lib/action_dispatch/testing/integration.rb')
| -rw-r--r-- | actionpack/lib/action_dispatch/testing/integration.rb | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/actionpack/lib/action_dispatch/testing/integration.rb b/actionpack/lib/action_dispatch/testing/integration.rb index 0082b3d8cb..720651fa1f 100644 --- a/actionpack/lib/action_dispatch/testing/integration.rb +++ b/actionpack/lib/action_dispatch/testing/integration.rb @@ -179,7 +179,7 @@ module ActionDispatch DEFAULT_HOST = "www.example.com" include Minitest::Assertions - include TestProcess, RequestHelpers, Assertions + include RequestHelpers, Assertions %w( status status_message headers body redirect? ).each do |method| delegate method, to: :response, allow_nil: true @@ -711,6 +711,8 @@ module ActionDispatch # Consult the Rails Testing Guide for more. class IntegrationTest < ActiveSupport::TestCase + include TestProcess + module UrlOptions extend ActiveSupport::Concern def url_options |