X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/eab2eeaa47b2aa8c7f52371f9bfdd60711a41fb6..21d60e359a6e972731e0385c51dd86536b7ea777:/test/helpers/application_helper_test.rb diff --git a/test/helpers/application_helper_test.rb b/test/helpers/application_helper_test.rb index 46c35f950..4dce09c1c 100644 --- a/test/helpers/application_helper_test.rb +++ b/test/helpers/application_helper_test.rb @@ -1,4 +1,4 @@ -require 'test_helper' +require "test_helper" class ApplicationHelperTest < ActionView::TestCase fixtures :users, :user_roles @@ -7,17 +7,21 @@ class ApplicationHelperTest < ActionView::TestCase I18n.locale = "en" end + def teardown + I18n.locale = "en" + end + def test_linkify %w(http://example.com/test ftp://example.com/test https://example.com/test).each do |link| text = "Test #{link} is made into a link" html = linkify(text) assert_equal false, html.html_safe? - assert_equal "Test #{link} is made into a link", html + assert_dom_equal "Test #{link} is made into a link", html html = linkify(text.html_safe) - assert_equal true, html.html_safe? - assert_equal "Test #{link} is made into a link", html + assert_equal true, html.html_safe? + assert_dom_equal "Test #{link} is made into a link", html end %w(test@example.com mailto:test@example.com).each do |link| @@ -25,22 +29,22 @@ class ApplicationHelperTest < ActionView::TestCase html = linkify(text) assert_equal false, html.html_safe? - assert_equal text, html + assert_dom_equal text, html html = linkify(text.html_safe) - assert_equal true, html.html_safe? - assert_equal text, html + assert_equal true, html.html_safe? + assert_dom_equal text, html end end def test_rss_link_to link = rss_link_to(:controller => :diary_entry, :action => :rss) - assert_equal "", link + assert_dom_equal "", link end def test_atom_link_to link = atom_link_to(:controller => :changeset, :action => :feed) - assert_equal "", link + assert_dom_equal "", link end def test_style_rules @@ -91,26 +95,26 @@ class ApplicationHelperTest < ActionView::TestCase def test_if_logged_in html = if_logged_in { "Test 1" } - assert_equal "