aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack/lib/action_dispatch/testing/integration.rb
diff options
context:
space:
mode:
authoryuuji.yaginuma <yuuji.yaginuma@gmail.com>2016-09-03 15:17:05 +0900
committeryuuji.yaginuma <yuuji.yaginuma@gmail.com>2016-09-04 11:37:43 +0900
commit333f10e32c0b8cbaf4dbaaee3333d21b138a7d4a (patch)
treed0464284d513fb8af1737ecf2eeb0a7d7f835d0f /actionpack/lib/action_dispatch/testing/integration.rb
parent55c5dffd9f2220507ff1a7635c00a81577a8a391 (diff)
downloadrails-333f10e32c0b8cbaf4dbaaee3333d21b138a7d4a.tar.gz
rails-333f10e32c0b8cbaf4dbaaee3333d21b138a7d4a.tar.bz2
rails-333f10e32c0b8cbaf4dbaaee3333d21b138a7d4a.zip
make `fixture_file_upload` work in integration tests
Currently, `fixture_file_upload` does not work in integration test. Because, `TestProcess` module has been include in `Session` class, but `fixture_path` can not get from `Session` class. Modify to include `TestProcess` in `IntegrationTest` class in order to get correct value of `fixture_path`.
Diffstat (limited to 'actionpack/lib/action_dispatch/testing/integration.rb')
-rw-r--r--actionpack/lib/action_dispatch/testing/integration.rb4
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