2 files changed, 35 insertions, 2 deletions
diff --git a/railties/test/application/integration_test_case_test.rb b/railties/test/application/integration_test_case_test.rb
index 52df5a2e5a..68e2de80c4 100644
--- a/railties/test/application/integration_test_case_test.rb
+++ b/railties/test/application/integration_test_case_test.rb
@@ -42,4 +42,32 @@ module ApplicationTests
       assert_match(/0 failures, 0 errors/, output)
     end
   end
+
+  class IntegrationTestDefaultApp < ActiveSupport::TestCase
+    include ActiveSupport::Testing::Isolation
+
+    setup do
+      build_app
+    end
+
+    teardown do
+      teardown_app
+    end
+
+    test "app method of integration tests returns test_app by default" do
+      app_file 'test/integration/default_app_test.rb', <<-RUBY
+        require 'test_helper'
+
+        class DefaultAppIntegrationTest < ActionDispatch::IntegrationTest
+          def test_app_returns_action_dispatch_test_app_by_default
+            assert_equal ActionDispatch.test_app, app
+          end
+        end
+      RUBY
+
+      output = Dir.chdir(app_path) { `bin/rails test 2>&1` }
+      assert_equal 0, $?.to_i, output
+      assert_match(/0 failures, 0 errors/, output)
+    end
+  end
 end
diff --git a/railties/test/generators/app_generator_test.rb b/railties/test/generators/app_generator_test.rb
index 50751368c8..09309b5cd0 100644
--- a/railties/test/generators/app_generator_test.rb
+++ b/railties/test/generators/app_generator_test.rb
@@ -468,6 +468,11 @@ class AppGeneratorTest < Rails::Generators::TestCase
     assert_file "Gemfile" do |content|
       assert_no_match(/coffee-rails/, content)
       assert_no_match(/jquery-rails/, content)
+      assert_no_match(/uglifier/, content)
+    end
+
+    assert_file "config/environments/production.rb" do |content|
+      assert_no_match(/config\.assets\.js_compressor = :uglifier/, content)
     end
   end
 
@@ -574,7 +579,7 @@ class AppGeneratorTest < Rails::Generators::TestCase
 
     assert_file "Gemfile" do |content|
       assert_match(/gem 'web-console',\s+github: 'rails\/web-console'/, content)
-      assert_no_match(/\Agem 'web-console'\z/, content)
+      assert_no_match(/\Agem 'web-console', '>= 3.3.0'\z/, content)
     end
   end
 
@@ -583,7 +588,7 @@ class AppGeneratorTest < Rails::Generators::TestCase
 
     assert_file "Gemfile" do |content|
       assert_match(/gem 'web-console',\s+github: 'rails\/web-console'/, content)
-      assert_no_match(/\Agem 'web-console'\z/, content)
+      assert_no_match(/\Agem 'web-console', '>= 3.3.0'\z/, content)
     end
   end