X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/e1c62f1bf21fa80d5873c0a75583450ae88b16d7..2312dd902e96786649ad9289c425a22ec73fbd80:/test/helpers/application_helper_test.rb?ds=inline
diff --git a/test/helpers/application_helper_test.rb b/test/helpers/application_helper_test.rb
index 80613a81a..43e27c529 100644
--- a/test/helpers/application_helper_test.rb
+++ b/test/helpers/application_helper_test.rb
@@ -3,53 +3,40 @@ require "test_helper"
class ApplicationHelperTest < ActionView::TestCase
attr_accessor :current_user
- def setup
- 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"
+ text = "Test #{link} is made into a link"
html = linkify(text)
- assert_equal false, html.html_safe?
- assert_dom_equal "Test #{link} is made into a link", html
+ assert html.html_safe?
+ assert_dom_equal "Test #{link} is <b>made</b> into a link", html
html = linkify(text.html_safe)
- assert_equal true, html.html_safe?
- assert_dom_equal "Test #{link} is made into a link", html
+ assert 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|
- text = "Test #{link} is not made into a link"
+ text = "Test #{link} is not made into a link"
html = linkify(text)
- assert_equal false, html.html_safe?
- assert_dom_equal text, html
+ assert html.html_safe?
+ assert_dom_equal "Test #{link} is not <b>made</b> into a link", html
html = linkify(text.html_safe)
- assert_equal true, html.html_safe?
- assert_dom_equal text, html
+ assert html.html_safe?
+ assert_dom_equal "Test #{link} is not made into a link", html
end
end
def test_rss_link_to
- link = rss_link_to(:controller => :diary_entry, :action => :rss)
- assert_dom_equal "", link
+ link = rss_link_to(:controller => :diary_entries, :action => :rss)
+ assert_dom_equal "", link
end
def test_atom_link_to
- link = atom_link_to(:controller => :changeset, :action => :feed)
- assert_dom_equal "", link
- end
-
- def test_richtext_area
- html = richtext_area(:message, :body, :cols => 40, :rows => 20)
- assert_not_nil html
+ link = atom_link_to(:controller => :changesets, :action => :feed)
+ assert_dom_equal "", link
end
def test_dir
@@ -59,13 +46,13 @@ class ApplicationHelperTest < ActionView::TestCase
assert_equal "rtl", dir
params.delete(:dir)
- I18n.locale = "he"
+ I18n.with_locale "he" do
+ assert_equal "rtl", dir
- assert_equal "rtl", dir
-
- params[:dir] = "ltr"
- assert_equal "ltr", dir
- params.delete(:dir)
+ params[:dir] = "ltr"
+ assert_equal "ltr", dir
+ params.delete(:dir)
+ end
end
def test_friendly_date