diff options
| author | Santiago Pastorino <santiago@wyeworks.com> | 2016-07-26 15:46:18 -0300 |
|---|---|---|
| committer | Santiago Pastorino <santiago@wyeworks.com> | 2016-07-26 15:47:44 -0300 |
| commit | f2978409e9b8aca7b9f54472a06ae631032f3243 (patch) | |
| tree | 4eef7fda234d6904e7a36c8d0cfc1cf745da583e /actionpack/lib/action_dispatch/testing | |
| parent | cbc61f513641ef3c311d671c322dc93f2d37d7fc (diff) | |
| download | rails-f2978409e9b8aca7b9f54472a06ae631032f3243.tar.gz rails-f2978409e9b8aca7b9f54472a06ae631032f3243.tar.bz2 rails-f2978409e9b8aca7b9f54472a06ae631032f3243.zip | |
Return ActionDispatch.test_app when no app is set on IntegrationTest.app method
Fixes #25926
Diffstat (limited to 'actionpack/lib/action_dispatch/testing')
| -rw-r--r-- | actionpack/lib/action_dispatch/testing/integration.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/lib/action_dispatch/testing/integration.rb b/actionpack/lib/action_dispatch/testing/integration.rb index 4897f44268..c6577d3d15 100644 --- a/actionpack/lib/action_dispatch/testing/integration.rb +++ b/actionpack/lib/action_dispatch/testing/integration.rb @@ -717,7 +717,7 @@ module ActionDispatch module ClassMethods def app - defined?(@@app) ? @@app : ActionDispatch.test_app + @@app || ActionDispatch.test_app end def app=(app) |