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 11578cc111d2e65265d7d59e123cf464dc521612..c30f793d3f603f079da6199ac9ddd531b1bd4dd2 100644 (file)
--- a/test/helpers/title_helper_test.rb
+++ b/test/helpers/title_helper_test.rb
@@ -1,17 +1,26 @@
-require 'test_helper'
+
+require "test_helper"
 
 class TitleHelperTest < ActionView::TestCase
   def test_set_title
+    set_title
+    assert_equal "OpenStreetMap", response.header["X-Page-Title"]
+    assert_nil @title
+
     set_title(nil)
     assert_equal "OpenStreetMap", response.header["X-Page-Title"]
     assert_nil @title
 
     set_title("Test Title")
-    assert_equal "OpenStreetMap | Test Title", 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 | Test & Title", 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 "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