diff options
| author | Matthew Draper <matthew@trebex.net> | 2016-12-07 14:03:57 +1030 |
|---|---|---|
| committer | Matthew Draper <matthew@trebex.net> | 2016-12-07 14:03:57 +1030 |
| commit | 8d0aa1977116954d38b4bc64919ebc84b7e1845a (patch) | |
| tree | 1daf3c5e7fe44c400b5a3ee8080e9ce08461cb92 /actionpack/lib/action_dispatch/testing/integration.rb | |
| parent | a8380f12dbd15f725343850b87b3b44df6f2615d (diff) | |
| download | rails-8d0aa1977116954d38b4bc64919ebc84b7e1845a.tar.gz rails-8d0aa1977116954d38b4bc64919ebc84b7e1845a.tar.bz2 rails-8d0aa1977116954d38b4bc64919ebc84b7e1845a.zip | |
Only move fixture_file_upload to IntegrationTest
The rest of the helpers are better placed on Session -- and this is the
only one that cares which class it is defined on.
Diffstat (limited to 'actionpack/lib/action_dispatch/testing/integration.rb')
| -rw-r--r-- | actionpack/lib/action_dispatch/testing/integration.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_dispatch/testing/integration.rb b/actionpack/lib/action_dispatch/testing/integration.rb index 1ab6158c90..021ffec862 100644 --- a/actionpack/lib/action_dispatch/testing/integration.rb +++ b/actionpack/lib/action_dispatch/testing/integration.rb @@ -69,7 +69,7 @@ module ActionDispatch DEFAULT_HOST = "www.example.com" include Minitest::Assertions - include RequestHelpers, Assertions + include TestProcess, RequestHelpers, Assertions %w( status status_message headers body redirect? ).each do |method| delegate method, to: :response, allow_nil: true @@ -598,7 +598,7 @@ module ActionDispatch # Consult the Rails Testing Guide for more. class IntegrationTest < ActiveSupport::TestCase - include TestProcess + include TestProcess::FixtureFile module UrlOptions extend ActiveSupport::Concern |