fix and improve ability coverage to account for tokens

[rails.git] / app / helpers / user_helper.rb

diff --git a/app/helpers/user_helper.rb b/app/helpers/user_helper.rb
index 6ef654fda8ebf1719315a46531810677b9d72043..27d6faa8c67c9654dee714ed3e5ea7af8ac95056 100644 (file)
--- a/app/helpers/user_helper.rb
+++ b/app/helpers/user_helper.rb
@@ -3,6 +3,7 @@ module UserHelper
 
   def user_image(user, options = {})
     options[:class] ||= "user_image"
+    options[:alt] ||= ""
 
     if user.image_use_gravatar
       user_gravatar_tag(user, options)
@@ -13,6 +14,7 @@ module UserHelper
 
   def user_thumbnail(user, options = {})
     options[:class] ||= "user_thumbnail"
+    options[:alt] ||= ""
 
     if user.image_use_gravatar
       user_gravatar_tag(user, options)
@@ -23,6 +25,7 @@ module UserHelper
 
   def user_thumbnail_tiny(user, options = {})
     options[:class] ||= "user_thumbnail_tiny"
+    options[:alt] ||= ""
 
     if user.image_use_gravatar
       user_gravatar_tag(user, options)
@@ -39,29 +42,31 @@ module UserHelper
     end
   end
 
-  # OpenID support
+  # External authentication support
 
   def openid_logo
-    image_tag "openid_small.png", :alt => t('user.login.openid_logo_alt'), :class => "openid_logo"
+    image_tag "openid_small.png", :alt => t("user.login.openid_logo_alt"), :class => "openid_logo"
   end
 
-  def openid_button(name, url)
+  def auth_button(name, provider, options = {})
     link_to(
-      image_tag("#{name}.png", :alt => t("user.login.openid_providers.#{name}.alt")),
-      "#",
-      :class => "openid_button", :data => { :url => url },
-      :title => t("user.login.openid_providers.#{name}.title")
+      image_tag("#{name}.png", :alt => t("user.login.auth_providers.#{name}.alt")),
+      auth_path(options.merge(:provider => provider)),
+      :class => "auth_button",
+      :title => t("user.login.auth_providers.#{name}.title")
     )
   end
 
+  private
+
   # Gravatar support
 
   # See http://en.gravatar.com/site/implement/images/ for details.
   def user_gravatar_url(user, options = {})
     size = options[:size] || 100
-    hash = Digest::MD5::hexdigest(user.email.downcase)
+    hash = Digest::MD5.hexdigest(user.email.downcase)
     default_image_url = image_url("users/images/large.png")
-    url = "#{request.protocol}www.gravatar.com/avatar/#{hash}.jpg?s=#{size}&d=#{u(default_image_url)}"
+    "#{request.protocol}www.gravatar.com/avatar/#{hash}.jpg?s=#{size}&d=#{u(default_image_url)}"
   end
 
   def user_gravatar_tag(user, options = {})