X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/c53db246f606e0233a524e8f3c6390ea74e96890..650adc10b2fbcbaa9a9fb1827bc3abe1a58fe051:/test/helpers/application_helper_test.rb diff --git a/test/helpers/application_helper_test.rb b/test/helpers/application_helper_test.rb index f9aeb73cc..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,7 +7,7 @@ class ApplicationHelperTest < ActionView::TestCase I18n.locale = "en" end - def setup + def teardown I18n.locale = "en" end @@ -17,11 +17,11 @@ class ApplicationHelperTest < ActionView::TestCase 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| @@ -29,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 @@ -95,26 +95,26 @@ class ApplicationHelperTest < ActionView::TestCase def test_if_logged_in html = if_logged_in { "Test 1" } - assert_equal "