X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/501d13e1c0936cc3ba3d9639620517bae34e5784..ea9a4c2aa28a89386a1b0d118d7492e4f70990c2:/test/helpers/application_helper_test.rb diff --git a/test/helpers/application_helper_test.rb b/test/helpers/application_helper_test.rb index f9aeb73cc..720113e65 100644 --- a/test/helpers/application_helper_test.rb +++ b/test/helpers/application_helper_test.rb @@ -1,50 +1,48 @@ -require 'test_helper' +require "test_helper" class ApplicationHelperTest < ActionView::TestCase - fixtures :users, :user_roles - def setup I18n.locale = "en" end - def setup + 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| + %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| + %w[test@example.com mailto:test@example.com].each do |link| text = "Test #{link} is not made into a link" 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 "\"Rss\"", link + assert_dom_equal "\"Rss\"", link end def test_atom_link_to link = atom_link_to(:controller => :changeset, :action => :feed) - assert_equal "\"Rss\"", link + assert_dom_equal "\"Rss\"", link end def test_style_rules @@ -59,62 +57,64 @@ class ApplicationHelperTest < ActionView::TestCase assert_match /\.hide_unless_administrator /, css assert_match /\.hide_unless_moderator /, css - @user = users(:normal_user) + @user = create(:user) css = style_rules assert_match /\.hidden /, css assert_no_match /\.hide_unless_logged_in /, css assert_match /\.hide_if_logged_in /, css - assert_match /\.hide_if_user_1 /, css - assert_match /\.show_if_user_1 /, css + assert_match /\.hide_if_user_#{@user.id} /, css + assert_match /\.show_if_user_#{@user.id} /, css assert_match /\.hide_unless_administrator /, css assert_match /\.hide_unless_moderator /, css - @user = users(:moderator_user) + @user = create(:moderator_user) css = style_rules assert_match /\.hidden /, css assert_no_match /\.hide_unless_logged_in /, css assert_match /\.hide_if_logged_in /, css - assert_match /\.hide_if_user_5 /, css - assert_match /\.show_if_user_5 /, css + assert_match /\.hide_if_user_#{@user.id} /, css + assert_match /\.show_if_user_#{@user.id} /, css assert_match /\.hide_unless_administrator /, css assert_no_match /\.hide_unless_moderator /, css - @user = users(:administrator_user) + @user = create(:administrator_user) css = style_rules assert_match /\.hidden /, css assert_no_match /\.hide_unless_logged_in /, css assert_match /\.hide_if_logged_in /, css - assert_match /\.hide_if_user_6 /, css - assert_match /\.show_if_user_6 /, css + assert_match /\.hide_if_user_#{@user.id} /, css + assert_match /\.show_if_user_#{@user.id} /, css assert_no_match /\.hide_unless_administrator /, css assert_match /\.hide_unless_moderator /, css end 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 + user = create(:user) + + html = if_user(user) { "Test 1" } + assert_dom_equal "
Test 1
", html - html = if_user(users(:normal_user), :span) { "Test 2" } - assert_equal "Test 2", html + html = if_user(user, :span) { "Test 2" } + assert_dom_equal "Test 2", html html = if_user(nil) { "Test 3" } assert_nil html @@ -124,25 +124,27 @@ class ApplicationHelperTest < ActionView::TestCase end def test_unless_user - html = unless_user(users(:normal_user)) { "Test 1" } - assert_equal "
Test 1
", html + user = create(:user) - html = unless_user(users(:normal_user), :span) { "Test 2" } - assert_equal "Test 2", html + html = unless_user(user) { "Test 1" } + assert_dom_equal "
Test 1
", html + + html = unless_user(user, :span) { "Test 2" } + 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,24 +170,22 @@ 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 - end + def test_body_class; end - def test_current_page_class - end + def test_current_page_class; end end