4 files changed, 84 insertions, 5 deletions
diff --git a/actionpack/test/controller/flash_test.rb b/actionpack/test/controller/flash_test.rb
index 9d4356f546..3b874a739a 100644
--- a/actionpack/test/controller/flash_test.rb
+++ b/actionpack/test/controller/flash_test.rb
@@ -1,5 +1,4 @@
 require 'abstract_unit'
-# FIXME remove DummyKeyGenerator and this require in 4.1
 require 'active_support/key_generator'
 
 class FlashTest < ActionController::TestCase
@@ -219,7 +218,7 @@ end
 
 class FlashIntegrationTest < ActionDispatch::IntegrationTest
   SessionKey = '_myapp_session'
-  Generator  = ActiveSupport::DummyKeyGenerator.new('b3c631c314c0bbca50c1b2843150fe33')
+  Generator  = ActiveSupport::LegacyKeyGenerator.new('b3c631c314c0bbca50c1b2843150fe33')
 
   class TestController < ActionController::Base
     add_flash_types :bar
diff --git a/actionpack/test/controller/http_digest_authentication_test.rb b/actionpack/test/controller/http_digest_authentication_test.rb
index 4287856550..9f1c168209 100644
--- a/actionpack/test/controller/http_digest_authentication_test.rb
+++ b/actionpack/test/controller/http_digest_authentication_test.rb
@@ -1,5 +1,4 @@
 require 'abstract_unit'
-# FIXME remove DummyKeyGenerator and this require in 4.1
 require 'active_support/key_generator'
 
 class HttpDigestAuthenticationTest < ActionController::TestCase
@@ -43,7 +42,7 @@ class HttpDigestAuthenticationTest < ActionController::TestCase
   setup do
     # Used as secret in generating nonce to prevent tampering of timestamp
     @secret = "4fb45da9e4ab4ddeb7580d6a35503d99"
-    @request.env["action_dispatch.key_generator"] = ActiveSupport::DummyKeyGenerator.new(@secret)
+    @request.env["action_dispatch.key_generator"] = ActiveSupport::LegacyKeyGenerator.new(@secret)
   end
 
   teardown do
diff --git a/actionpack/test/controller/live_stream_test.rb b/actionpack/test/controller/live_stream_test.rb
index 5755444a65..34164a19f0 100644
--- a/actionpack/test/controller/live_stream_test.rb
+++ b/actionpack/test/controller/live_stream_test.rb
@@ -52,6 +52,29 @@ module ActionController
       def with_stale
         render :text => 'stale' if stale?(:etag => "123")
       end
+
+      def exception_in_view
+        render 'doesntexist'
+      end
+
+      def exception_with_callback
+        response.headers['Content-Type'] = 'text/event-stream'
+
+        response.stream.on_error do
+          response.stream.write %(data: "500 Internal Server Error"\n\n)
+          response.stream.close
+        end
+
+        raise 'An exception occurred...'
+      end
+
+      def exception_in_exception_callback
+        response.headers['Content-Type'] = 'text/event-stream'
+        response.stream.on_error do
+          raise 'We need to go deeper.'
+        end
+        response.stream.write params[:widget][:didnt_check_for_nil]
+      end
     end
 
     tests TestController
@@ -66,6 +89,21 @@ module ActionController
       TestResponse.new
     end
 
+    def assert_stream_closed
+      assert response.stream.closed?, 'stream should be closed'
+    end
+
+    def capture_log_output
+      output = StringIO.new
+      old_logger, ActionController::Base.logger = ActionController::Base.logger, ActiveSupport::Logger.new(output)
+
+      begin
+        yield output
+      ensure
+        ActionController::Base.logger = old_logger
+      end
+    end
+
     def test_set_response!
       @controller.set_response!(@request)
       assert_kind_of(Live::Response, @controller.response)
@@ -119,7 +157,43 @@ module ActionController
     def test_render_text
       get :render_text
       assert_equal 'zomg', response.body
-      assert response.stream.closed?, 'stream should be closed'
+      assert_stream_closed
+    end
+
+    def test_exception_handling_html
+      capture_log_output do |output|
+        get :exception_in_view
+        assert_match %r((window\.location = "/500\.html"</script></html>)$), response.body
+        assert_match 'Missing template test/doesntexist', output.rewind && output.read
+        assert_stream_closed
+      end
+    end
+
+    def test_exception_handling_plain_text
+      capture_log_output do |output|
+        get :exception_in_view, format: :json
+        assert_equal '', response.body
+        assert_match 'Missing template test/doesntexist', output.rewind && output.read
+        assert_stream_closed
+      end
+    end
+
+    def test_exception_callback
+      capture_log_output do |output|
+        get :exception_with_callback, format: 'text/event-stream'
+        assert_equal %(data: "500 Internal Server Error"\n\n), response.body
+        assert_match 'An exception occurred...', output.rewind && output.read
+        assert_stream_closed
+      end
+    end
+
+    def test_exceptions_raised_handling_exceptions
+      capture_log_output do |output|
+        get :exception_in_exception_callback, format: 'text/event-stream'
+        assert_equal '', response.body
+        assert_match 'We need to go deeper', output.rewind && output.read
+        assert_stream_closed
+      end
     end
 
     def test_stale_without_etag
diff --git a/actionpack/test/controller/url_for_test.rb b/actionpack/test/controller/url_for_test.rb
index ba24e7fac5..088ad73f2f 100644
--- a/actionpack/test/controller/url_for_test.rb
+++ b/actionpack/test/controller/url_for_test.rb
@@ -89,6 +89,13 @@ module AbstractController
         )
       end
 
+      def test_subdomain_may_be_removed_with_blank_string
+        W.default_url_options[:host] = 'api.basecamphq.com'
+        assert_equal('http://basecamphq.com/c/a/i',
+          W.new.url_for(:subdomain => '', :controller => 'c', :action => 'a', :id => 'i')
+        )
+      end
+
       def test_multiple_subdomains_may_be_removed
         W.default_url_options[:host] = 'mobile.www.api.basecamphq.com'
         assert_equal('http://basecamphq.com/c/a/i',