X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/b13018cc96899e54b9b952112243068bbe4d1024..9ef85e42ba4a3b10157b2aa0711e68acaf9e3f9e:/test/helpers/application_helper_test.rb
diff --git a/test/helpers/application_helper_test.rb b/test/helpers/application_helper_test.rb
index f9aeb73cc..97b35467b 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 "
Test 1
", html
+ assert_dom_equal "Test 1
", html
html = if_logged_in(:span) { "Test 2" }
- assert_equal "Test 2", html
+ assert_dom_equal "Test 2", html
end
def test_if_not_logged_in
html = if_not_logged_in { "Test 1" }
- assert_equal "Test 1
", html
+ assert_dom_equal "Test 1
", html
html = if_not_logged_in(:span) { "Test 2" }
- assert_equal "Test 2", html
+ assert_dom_equal "Test 2", html
end
def test_if_user
html = if_user(users(:normal_user)) { "Test 1" }
- assert_equal "Test 1
", html
+ assert_dom_equal "Test 1
", html
html = if_user(users(:normal_user), :span) { "Test 2" }
- assert_equal "Test 2", html
+ assert_dom_equal "Test 2", html
html = if_user(nil) { "Test 3" }
assert_nil html
@@ -125,24 +125,24 @@ class ApplicationHelperTest < ActionView::TestCase
def test_unless_user
html = unless_user(users(:normal_user)) { "Test 1" }
- assert_equal "Test 1
", html
+ assert_dom_equal "Test 1
", html
html = unless_user(users(:normal_user), :span) { "Test 2" }
- assert_equal "Test 2", html
+ assert_dom_equal "Test 2", html
html = unless_user(nil) { "Test 3" }
- assert_equal "Test 3
", html
+ assert_dom_equal "Test 3
", html
html = unless_user(nil, :span) { "Test 4" }
- assert_equal "Test 4", html
+ assert_dom_equal "Test 4", html
end
def test_if_administrator
html = if_administrator { "Test 1" }
- assert_equal "Test 1
", html
+ assert_dom_equal "Test 1
", html
html = if_administrator(:span) { "Test 2" }
- assert_equal "Test 2", html
+ assert_dom_equal "Test 2", html
end
def test_richtext_area
@@ -168,19 +168,19 @@ class ApplicationHelperTest < ActionView::TestCase
def test_friendly_date
date = friendly_date(Time.new(2014, 3, 5, 18, 58, 23))
- assert_match /^.*<\/span>$/, date
+ assert_match %r{^.*$}, date
date = friendly_date(Time.now - 1.hour)
- assert_match /^about 1 hour<\/span>$/, date
+ assert_match %r{^about 1 hour$}, date
date = friendly_date(Time.now - 2.days)
- assert_match /^2 days<\/span>$/, date
+ assert_match %r{^2 days$}, date
date = friendly_date(Time.now - 3.weeks)
- assert_match /^21 days<\/span>$/, date
+ assert_match %r{^21 days$}, date
date = friendly_date(Time.now - 4.months)
- assert_match /^4 months<\/span>$/, date
+ assert_match %r{^4 months$}, date
end
def test_body_class