diff options
| author | Santiago Pastorino <santiago@wyeworks.com> | 2016-07-26 22:02:38 -0300 |
|---|---|---|
| committer | Santiago Pastorino <santiago@wyeworks.com> | 2016-07-26 22:04:56 -0300 |
| commit | 1a2f1c48bdeda5df88e8031fe51943527ebc381e (patch) | |
| tree | d79de419d72dcfb5108f732c62b2dad3c8e965d3 /actionpack | |
| parent | d980abdb23f70409dfec90306cbf5ce9d9df17d7 (diff) | |
| download | rails-1a2f1c48bdeda5df88e8031fe51943527ebc381e.tar.gz rails-1a2f1c48bdeda5df88e8031fe51943527ebc381e.tar.bz2 rails-1a2f1c48bdeda5df88e8031fe51943527ebc381e.zip | |
There are some cases where @@app is not defined
Diffstat (limited to 'actionpack')
| -rw-r--r-- | actionpack/lib/action_dispatch/testing/integration.rb | 6 | ||||
| -rw-r--r-- | actionpack/test/controller/integration_test.rb | 19 |
2 files changed, 5 insertions, 20 deletions
diff --git a/actionpack/lib/action_dispatch/testing/integration.rb b/actionpack/lib/action_dispatch/testing/integration.rb index c6577d3d15..9a76b68ae1 100644 --- a/actionpack/lib/action_dispatch/testing/integration.rb +++ b/actionpack/lib/action_dispatch/testing/integration.rb @@ -717,7 +717,11 @@ module ActionDispatch module ClassMethods def app - @@app || ActionDispatch.test_app + if defined?(@@app) && @@app + @@app + else + ActionDispatch.test_app + end end def app=(app) diff --git a/actionpack/test/controller/integration_test.rb b/actionpack/test/controller/integration_test.rb index 5a711ae150..3b89531e90 100644 --- a/actionpack/test/controller/integration_test.rb +++ b/actionpack/test/controller/integration_test.rb @@ -397,25 +397,6 @@ class IntegrationTestUsesCorrectClass < ActionDispatch::IntegrationTest end end -class IntegrationTestDefaultApp < ActionDispatch::IntegrationTest - def setup - @app = self.class.app - self.class.app = nil - - @test_app = ActionDispatch.test_app - ActionDispatch.test_app = 'fake_app' - end - - def teardown - self.class.app = @app - ActionDispatch.test_app = @test_app - end - - def test_class_app_returns_ad_test_app_by_default - assert_equal 'fake_app', self.class.app - end -end - class IntegrationProcessTest < ActionDispatch::IntegrationTest class IntegrationController < ActionController::Base def get |