Merge pull request #43 from georgeclaghorn/media-type

Prefer ActionDispatch::Response#media_type when it's available
turbolinks · Jun 14, 2019 · 7505284 · 7505284
2 parents 2f42a3e + 8da1f63
commit 7505284
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/lib/turbolinks/assertions.rb b/lib/turbolinks/assertions.rb
@@ -12,7 +12,7 @@ def assert_redirected_to(options = {}, message = nil)
 
     def assert_turbolinks_visited(options = {}, message = nil)
       assert_response(:ok, message)
-      assert_equal("text/javascript", response.content_type)
+      assert_equal("text/javascript", response.try(:media_type) || response.content_type)
 
       visit_location, _ = turbolinks_visit_location_and_action
 
@@ -34,7 +34,7 @@ def assert_turbolinks_visited(options = {}, message = nil)
     # header is cleared after controller action processing to prevent it
     # from leaking into subsequent requests.
     def turbolinks_request?
-      !request.get? && response.content_type == "text/javascript"
+      !request.get? && (response.try(:media_type) || response.content_type) == "text/javascript"
     end
 
     def turbolinks_visit_location_and_action