Merge branch 'master' into set_binds

* master: (2794 commits)
  doc, API example on how to use `Model#exists?` with multiple IDs. [ci skip]
  Restore DATABASE_URL even if it's nil in connection_handler test
  [ci skip] - error_messages_for has been deprecated since 2.3.8 - lets reduce any confusion for users
  Ensure Active Record connection consistency
  Revert "ask the fixture set for the sql statements"
  Check `respond_to` before delegation due to: https://github.com/ruby/ruby/commit/d781caaf313b8649948c107bba277e5ad7307314
  Adding Hash#compact and Hash#compact! methods
  MySQL version 4.1 was EOL on December 31, 2009 We should at least recommend modern versions of MySQL to users.
  clear cache on body close so that cache remains during rendering
  add a more restricted codepath for templates fixes #13390
  refactor generator tests to use block form of Tempfile
  Fix typo [ci skip]
  Move finish_template as the last public method in the generator
  Minor typos fix [ci skip]
  make `change_column_null` reversible. Closes #13576.
  create/drop test and development databases only if RAILS_ENV is nil
  Revert "Speedup String#to"
  typo fix in test name. [ci skip].
  `core_ext/string/access.rb` test what we are documenting.
  Fix typo in image_tag documentation
  ...

Conflicts:
	activerecord/lib/active_record/associations/join_dependency/join_association.rb
	activerecord/lib/active_record/relation/query_methods.rb

1 files changed, 89 insertions, 1 deletions

diff --git a/actionpack/test/controller/live_stream_test.rb b/actionpack/test/controller/live_stream_test.rb
index 34164a19f0..0a431270b5 100644
--- a/actionpack/test/controller/live_stream_test.rb
+++ b/actionpack/test/controller/live_stream_test.rb
@@ -2,6 +2,94 @@ require 'abstract_unit'
 require 'active_support/concurrency/latch'
 
 module ActionController
+  class SSETest < ActionController::TestCase
+    class SSETestController < ActionController::Base
+      include ActionController::Live
+
+      def basic_sse
+        response.headers['Content-Type'] = 'text/event-stream'
+        sse = SSE.new(response.stream)
+        sse.write("{\"name\":\"John\"}")
+        sse.write({ name: "Ryan" })
+      ensure
+        sse.close
+      end
+
+      def sse_with_event
+        sse = SSE.new(response.stream, event: "send-name")
+        sse.write("{\"name\":\"John\"}")
+        sse.write({ name: "Ryan" })
+      ensure
+        sse.close
+      end
+
+      def sse_with_retry
+        sse = SSE.new(response.stream, retry: 1000)
+        sse.write("{\"name\":\"John\"}")
+        sse.write({ name: "Ryan" }, retry: 1500)
+      ensure
+        sse.close
+      end
+
+      def sse_with_id
+        sse = SSE.new(response.stream)
+        sse.write("{\"name\":\"John\"}", id: 1)
+        sse.write({ name: "Ryan" }, id: 2)
+      ensure
+        sse.close
+      end
+    end
+
+    tests SSETestController
+
+    def wait_for_response_stream_close
+      while !response.stream.closed?
+        sleep 0.01
+      end
+    end
+
+    def test_basic_sse
+      get :basic_sse
+
+      wait_for_response_stream_close
+      assert_match(/data: {\"name\":\"John\"}/, response.body)
+      assert_match(/data: {\"name\":\"Ryan\"}/, response.body)
+    end
+
+    def test_sse_with_event_name
+      get :sse_with_event
+
+      wait_for_response_stream_close
+      assert_match(/data: {\"name\":\"John\"}/, response.body)
+      assert_match(/data: {\"name\":\"Ryan\"}/, response.body)
+      assert_match(/event: send-name/, response.body)
+    end
+
+    def test_sse_with_retry
+      get :sse_with_retry
+
+      wait_for_response_stream_close
+      first_response, second_response = response.body.split("\n\n")
+      assert_match(/data: {\"name\":\"John\"}/, first_response)
+      assert_match(/retry: 1000/, first_response)
+
+      assert_match(/data: {\"name\":\"Ryan\"}/, second_response)
+      assert_match(/retry: 1500/, second_response)
+    end
+
+    def test_sse_with_id
+      get :sse_with_id
+
+      wait_for_response_stream_close
+      first_response, second_response = response.body.split("\n\n")
+      assert_match(/data: {\"name\":\"John\"}/, first_response)
+      assert_match(/id: 1/, first_response)
+
+      assert_match(/data: {\"name\":\"Ryan\"}/, second_response)
+      assert_match(/id: 2/, second_response)
+    end
+  end
+
   class LiveStreamTest < ActionController::TestCase
     class TestController < ActionController::Base
       include ActionController::Live
@@ -135,7 +223,7 @@ module ActionController
 
       @controller.process :blocking_stream
 
-      assert t.join
+      assert t.join(3), 'timeout expired before the thread terminated'
     end
 
     def test_thread_locals_get_copied