Merge branch 'pull/843' into titles

[rails.git] / test / helpers / title_helper_test.rb

diff --git a/test/helpers/title_helper_test.rb b/test/helpers/title_helper_test.rb
index 25486f7991227bcf0adb2b529ec2beb1b1676d98..c30f793d3f603f079da6199ac9ddd531b1bd4dd2 100644 (file)
--- a/test/helpers/title_helper_test.rb
+++ b/test/helpers/title_helper_test.rb
@@ -12,15 +12,15 @@ class TitleHelperTest < ActionView::TestCase
     assert_nil @title
 
     set_title("Test Title")
-    assert_equal "OpenStreetMap%20%7C%20Test%20Title", response.header["X-Page-Title"]
+    assert_equal "Test%20Title%20%7C%20OpenStreetMap", response.header["X-Page-Title"]
     assert_equal "Test Title", @title
 
     set_title("Test & Title")
-    assert_equal "OpenStreetMap%20%7C%20Test%20%26%20Title", response.header["X-Page-Title"]
+    assert_equal "Test%20%26%20Title%20%7C%20OpenStreetMap", response.header["X-Page-Title"]
     assert_equal "Test & Title", @title
 
     set_title("Tést & Tïtlè")
-    assert_equal "OpenStreetMap%20%7C%20T%C3%A9st%20%26%20T%C3%AFtl%C3%A8", response.header["X-Page-Title"]
+    assert_equal "T%C3%A9st%20%26%20T%C3%AFtl%C3%A8%20%7C%20OpenStreetMap", response.header["X-Page-Title"]
     assert_equal "Tést & Tïtlè", @title
   end
 end