diff options
| author | Sean Griffin <sean@seantheprogrammer.com> | 2017-07-17 07:10:27 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-17 07:10:27 -0600 |
| commit | 404eceba8c8f0951407c2508567f6abefec76e4c (patch) | |
| tree | cb8c690084083b6aee4a70ad29c24c0050f88bed /actionpack/lib/action_dispatch/testing/test_process.rb | |
| parent | e505bc8acd4448030fd4d2f85796bdb61d45a5b1 (diff) | |
| parent | fbade51248ea48db87703ba7418badbd3ed85e36 (diff) | |
| download | rails-404eceba8c8f0951407c2508567f6abefec76e4c.tar.gz rails-404eceba8c8f0951407c2508567f6abefec76e4c.tar.bz2 rails-404eceba8c8f0951407c2508567f6abefec76e4c.zip | |
Merge branch 'master' into make-reverse-merge-bang-order-consistent
Diffstat (limited to 'actionpack/lib/action_dispatch/testing/test_process.rb')
| -rw-r--r-- | actionpack/lib/action_dispatch/testing/test_process.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/actionpack/lib/action_dispatch/testing/test_process.rb b/actionpack/lib/action_dispatch/testing/test_process.rb index 0282eb15c3..8061ac2e3b 100644 --- a/actionpack/lib/action_dispatch/testing/test_process.rb +++ b/actionpack/lib/action_dispatch/testing/test_process.rb @@ -1,5 +1,5 @@ -require "action_dispatch/middleware/cookies" -require "action_dispatch/middleware/flash" +require_relative "../middleware/cookies" +require_relative "../middleware/flash" module ActionDispatch module TestProcess |