1 files changed, 49 insertions, 3 deletions
diff --git a/actionpack/test/controller/live_stream_test.rb b/actionpack/test/controller/live_stream_test.rb
index 4224ac2a1b..0c3884cd38 100644
--- a/actionpack/test/controller/live_stream_test.rb
+++ b/actionpack/test/controller/live_stream_test.rb
@@ -1,5 +1,5 @@
 require 'abstract_unit'
-require 'concurrent/atomics'
+require 'concurrent/atomic/count_down_latch'
 Thread.abort_on_exception = true
 
 module ActionController
@@ -152,7 +152,6 @@ module ActionController
 
       def thread_locals
         tc.assert_equal 'aaron', Thread.current[:setting]
-        tc.assert_not_equal Thread.current.object_id, Thread.current[:originating_thread]
 
         response.headers['Content-Type'] = 'text/event-stream'
         %w{ hello world }.each do |word|
@@ -261,6 +260,14 @@ module ActionController
       end
     end
 
+    def setup
+      super
+
+      def @controller.new_controller_thread
+        Thread.new { yield }
+      end
+    end
+
     def test_set_cookie
       get :set_cookie
       assert_equal({'hello' => 'world'}, @response.cookies)
@@ -429,7 +436,7 @@ module ActionController
     end
 
     def test_stale_with_etag
-      @request.if_none_match = Digest::MD5.hexdigest("123")
+      @request.if_none_match = %(W/"#{Digest::MD5.hexdigest('123')}")
       get :with_stale
       assert_equal 304, response.status.to_i
     end
@@ -442,3 +449,42 @@ module ActionController
     end
   end
 end
+
+class LiveStreamRouterTest < ActionDispatch::IntegrationTest
+  class TestController < ActionController::Base
+    include ActionController::Live
+
+    def index
+      response.headers['Content-Type'] = 'text/event-stream'
+      sse = SSE.new(response.stream)
+      sse.write("{\"name\":\"John\"}")
+      sse.write({ name: "Ryan" })
+    ensure
+      sse.close
+    end
+  end
+
+  def self.call(env)
+    routes.call(env)
+  end
+
+  def self.routes
+    @routes ||= ActionDispatch::Routing::RouteSet.new
+  end
+
+  routes.draw do
+    get '/test' => 'live_stream_router_test/test#index'
+  end
+
+  def app
+    self.class
+  end
+
+  test "streaming served through the router" do
+    get "/test"
+
+    assert_response :ok
+    assert_match(/data: {\"name\":\"John\"}/, response.body)
+    assert_match(/data: {\"name\":\"Ryan\"}/, response.body)
+  end
+end