aboutsummaryrefslogtreecommitdiffstats
path: root/actionpack
diff options
context:
space:
mode:
authorEileen M. Uchitelle <eileencodes@users.noreply.github.com>2019-03-19 08:34:37 -0400
committerGitHub <noreply@github.com>2019-03-19 08:34:37 -0400
commitd17340c00299c400a75e0a40e2dd21e9fb3a9630 (patch)
treeda1134c033407cf8384a9fc5c3a2f966fb9b72b1 /actionpack
parent3d0850bfb8b6d0e4acce489a86353a21fd4df21a (diff)
parente4401c6436ed223a37a4cb95651b34c0e006b1a7 (diff)
downloadrails-d17340c00299c400a75e0a40e2dd21e9fb3a9630.tar.gz
rails-d17340c00299c400a75e0a40e2dd21e9fb3a9630.tar.bz2
rails-d17340c00299c400a75e0a40e2dd21e9fb3a9630.zip
Merge pull request #35667 from sharang-d/fix-content-test-name
Fix a ContentNegotiation test description
Diffstat (limited to 'actionpack')
-rw-r--r--actionpack/test/controller/new_base/content_negotiation_test.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/actionpack/test/controller/new_base/content_negotiation_test.rb b/actionpack/test/controller/new_base/content_negotiation_test.rb
index 6de91c57b7..00b2798aeb 100644
--- a/actionpack/test/controller/new_base/content_negotiation_test.rb
+++ b/actionpack/test/controller/new_base/content_negotiation_test.rb
@@ -25,7 +25,7 @@ module ContentNegotiation
assert_body "Hello world text/html!"
end
- test "A js or */* Accept header on xhr will return HTML" do
+ test "A js or */* Accept header on xhr will return JavaScript" do
get "/content_negotiation/basic/hello", headers: { "HTTP_ACCEPT" => "text/javascript, */*" }, xhr: true
assert_body "Hello world text/javascript!"
end