From f2978409e9b8aca7b9f54472a06ae631032f3243 Mon Sep 17 00:00:00 2001
From: Santiago Pastorino <santiago@wyeworks.com>
Date: Tue, 26 Jul 2016 15:46:18 -0300
Subject: Return ActionDispatch.test_app when no app is set on
 IntegrationTest.app method

Fixes #25926
---
 actionpack/test/controller/integration_test.rb | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

(limited to 'actionpack/test/controller')

diff --git a/actionpack/test/controller/integration_test.rb b/actionpack/test/controller/integration_test.rb
index 3b89531e90..fc24857570 100644
--- a/actionpack/test/controller/integration_test.rb
+++ b/actionpack/test/controller/integration_test.rb
@@ -397,6 +397,25 @@ 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 ActionDispatch.test_app, self.class.app
+  end
+end
+
 class IntegrationProcessTest < ActionDispatch::IntegrationTest
   class IntegrationController < ActionController::Base
     def get
-- 
cgit v1.2.3