jro_apps/redmine Commit - r10003:02b2a61e1578

Reverted r10184 (#9365)....

Jean-Philippe Lang -

r10003:02b2a61e1578

parent child

Context file:

r10003:02b2a61e1578

Collapse all files

app/helpers/application_helper.rb +1 -1

                # +user+ can be a User or a string that will be scanned for an email address (eg. 'joe <joe@foo.bar>')
                def avatar(user, options = { })
                  if Setting.gravatar_enabled?
-                   options.merge!({:ssl => (Setting.protocol == 'https'), :default => Setting.gravatar_default})
+                   options.merge!({:ssl => (request && request.ssl?), :default => Setting.gravatar_default})
                    email = nil
                    if user.respond_to?(:mail)
                      email = user.mail

test/unit/helpers/application_helper_test.rb +5 -17

                  end
                end
-               def test_avatar_enabled
-                 with_settings :gravatar_enabled => '1' do
+               def test_avatar
+                 # turn on avatars
+                 Setting.gravatar_enabled = '1'
-                   assert avatar(User.find_by_mail('jsmith@somenet.foo')).include?(Digest::MD5.hexdigest('jsmith@somenet.foo'))
-                   assert avatar('jsmith <jsmith@somenet.foo>').include?(Digest::MD5.hexdigest('jsmith@somenet.foo'))
-                   # Default size is 50
-                   assert !avatar('jsmith <jsmith@somenet.foo>', :class => 'picture').include?('class="gravatar"')
-                   assert_nil avatar('jsmith')
-                   assert_nil avatar(nil)
-                 end
-               end
-               def test_avatar_should_use_ssl_if_protocol_is_https
-                 with_settings :gravatar_enabled => '1', :protocol => 'https' do
-                   assert_include 'https://', avatar(User.find_by_mail('jsmith@somenet.foo'))
-                 end
-                 with_settings :gravatar_enabled => '1', :protocol => 'http' do
-                   assert_include 'http://', avatar(User.find_by_mail('jsmith@somenet.foo'))
-                 end
-               end
-               def test_avatar_disabled
-                 with_settings :gravatar_enabled => '0' do
+                 # turn off avatars
+                 Setting.gravatar_enabled = '0'
-                   assert_equal '', avatar(User.find_by_mail('jsmith@somenet.foo'))
-                 end
-               end
                def test_link_to_user
                  user = User.find(2)

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages