X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/cb87f02642d0097ebc067ca1f9371dde274a41e3..73026e1615ab94873f70fcc30775d8613b6d7075:/test/helpers/application_helper_test.rb

diff --git a/test/helpers/application_helper_test.rb b/test/helpers/application_helper_test.rb
index d1c41d62c..16b1040e5 100644
--- a/test/helpers/application_helper_test.rb
+++ b/test/helpers/application_helper_test.rb
@@ -38,115 +38,13 @@ class ApplicationHelperTest < ActionView::TestCase
   end
 
   def test_rss_link_to
-    link = rss_link_to(:controller => :diary_entry, :action => :rss)
-    assert_dom_equal "<a class=\"rsssmall\" href=\"/diary/rss\"><img alt=\"Rss\" border=\"0\" height=\"16\" src=\"/images/RSS.png\" width=\"16\" /></a>", link
+    link = rss_link_to(:controller => :diary_entries, :action => :rss)
+    assert_dom_equal "<a class=\"rsssmall\" href=\"/diary/rss\"><img border=\"0\" height=\"16\" src=\"/images/RSS.png\" width=\"16\" /></a>", link
   end
 
   def test_atom_link_to
-    link = atom_link_to(:controller => :changeset, :action => :feed)
-    assert_dom_equal "<a class=\"rsssmall\" href=\"/history/feed\"><img alt=\"Rss\" border=\"0\" height=\"16\" src=\"/images/RSS.png\" width=\"16\" /></a>", link
-  end
-
-  def test_style_rules
-    self.current_user = nil
-
-    css = style_rules
-    assert_match /\.hidden /, css
-    assert_match /\.hide_unless_logged_in /, css
-    assert_no_match /\.hide_if_logged_in /, css
-    assert_no_match /\.hide_if_user_/, css
-    assert_no_match /\.show_if_user_/, css
-    assert_match /\.hide_unless_administrator /, css
-    assert_match /\.hide_unless_moderator /, css
-
-    self.current_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_#{current_user.id} /, css
-    assert_match /\.show_if_user_#{current_user.id} /, css
-    assert_match /\.hide_unless_administrator /, css
-    assert_match /\.hide_unless_moderator /, css
-
-    self.current_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_#{current_user.id} /, css
-    assert_match /\.show_if_user_#{current_user.id} /, css
-    assert_match /\.hide_unless_administrator /, css
-    assert_no_match /\.hide_unless_moderator /, css
-
-    self.current_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_#{current_user.id} /, css
-    assert_match /\.show_if_user_#{current_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_dom_equal "<div class=\"hide_unless_logged_in\">Test 1</div>", html
-
-    html = if_logged_in(:span) { "Test 2" }
-    assert_dom_equal "<span class=\"hide_unless_logged_in\">Test 2</span>", html
-  end
-
-  def test_if_not_logged_in
-    html = if_not_logged_in { "Test 1" }
-    assert_dom_equal "<div class=\"hide_if_logged_in\">Test 1</div>", html
-
-    html = if_not_logged_in(:span) { "Test 2" }
-    assert_dom_equal "<span class=\"hide_if_logged_in\">Test 2</span>", html
-  end
-
-  def test_if_user
-    user = create(:user)
-
-    html = if_user(user) { "Test 1" }
-    assert_dom_equal "<div class=\"hidden show_if_user_#{user.id}\">Test 1</div>", html
-
-    html = if_user(user, :span) { "Test 2" }
-    assert_dom_equal "<span class=\"hidden show_if_user_#{user.id}\">Test 2</span>", html
-
-    html = if_user(nil) { "Test 3" }
-    assert_nil html
-
-    html = if_user(nil, :span) { "Test 4" }
-    assert_nil html
-  end
-
-  def test_unless_user
-    user = create(:user)
-
-    html = unless_user(user) { "Test 1" }
-    assert_dom_equal "<div class=\"hide_if_user_#{user.id}\">Test 1</div>", html
-
-    html = unless_user(user, :span) { "Test 2" }
-    assert_dom_equal "<span class=\"hide_if_user_#{user.id}\">Test 2</span>", html
-
-    html = unless_user(nil) { "Test 3" }
-    assert_dom_equal "<div>Test 3</div>", html
-
-    html = unless_user(nil, :span) { "Test 4" }
-    assert_dom_equal "<span>Test 4</span>", html
-  end
-
-  def test_if_administrator
-    html = if_administrator { "Test 1" }
-    assert_dom_equal "<div class=\"hide_unless_administrator\">Test 1</div>", html
-
-    html = if_administrator(:span) { "Test 2" }
-    assert_dom_equal "<span class=\"hide_unless_administrator\">Test 2</span>", html
+    link = atom_link_to(:controller => :changesets, :action => :feed)
+    assert_dom_equal "<a class=\"rsssmall\" href=\"/history/feed\"><img border=\"0\" height=\"16\" src=\"/images/RSS.png\" width=\"16\" /></a>", link
   end
 
   def test_richtext_area