aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Schneeman <richard.schneeman@gmail.com>2015-01-17 11:35:56 -0600
committerRichard Schneeman <richard.schneeman@gmail.com>2015-01-17 11:35:56 -0600
commit1303288ba814a4876fcb4590e5bbed051443b1d4 (patch)
treee120c75e133fc3ee3e22f775be542161e209459a
parentd34bf0befd09d9cb4a65910b430dcd08cafeabc6 (diff)
parent88ff9fd2a36bdf9bce62d2d0c701ffce65616509 (diff)
downloadrails-1303288ba814a4876fcb4590e5bbed051443b1d4.tar.gz
rails-1303288ba814a4876fcb4590e5bbed051443b1d4.tar.bz2
rails-1303288ba814a4876fcb4590e5bbed051443b1d4.zip
Merge pull request #18567 from prathamesh-sonpatki/fix-assert-welcome-test
Fixed test for assert_welcome
-rw-r--r--railties/test/isolation/abstract_unit.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/railties/test/isolation/abstract_unit.rb b/railties/test/isolation/abstract_unit.rb
index 17c3f979c0..2c4d9c5995 100644
--- a/railties/test/isolation/abstract_unit.rb
+++ b/railties/test/isolation/abstract_unit.rb
@@ -69,7 +69,8 @@ module TestHelpers
def assert_welcome(resp)
assert_equal 200, resp[0]
- assert resp[1]["Content-Type"] = "text/html"
+ assert_match 'text/html', resp[1]["Content-Type"]
+ assert_match 'charset=utf-8', resp[1]["Content-Type"]
assert extract_body(resp).match(/Welcome aboard/)
end