Merge remote-tracking branch 'upstream/pull/3301'

[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 523313eaf64f36e71fc2b38f54f6dc7772f472a8..1c26a7220d5f8eba9cdc063e37a74cd4c46e9b7c 100644 (file)
--- a/test/helpers/title_helper_test.rb
+++ b/test/helpers/title_helper_test.rb
@@ -1,4 +1,3 @@
-# coding: utf-8

 require "test_helper"
 
 class TitleHelperTest < ActionView::TestCase
 require "test_helper"
 
 class TitleHelperTest < ActionView::TestCase


@@ -12,15 +11,15 @@ class TitleHelperTest < ActionView::TestCase
     assert_nil @title
 
     set_title("Test Title")
     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 "Test Title", @title
 
     set_title("Test & Title")

-    assert_equal "OpenStreetMap%20%7C%20Test%20&%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 "Test & Title", @title
 
     set_title("Tést & Tïtlè")

-    assert_equal "OpenStreetMap%20%7C%20T%C3%A9st%20&%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
     assert_equal "Tést & Tïtlè", @title
   end
 end