diff options
author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2012-08-10 16:35:58 +0000 |
---|---|---|
committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2012-08-10 16:35:58 +0000 |
commit | 02b2a61e1578e4ae118c24752249f029f5024bb5 (patch) | |
tree | 3075e6bbbf38e4ecdfd0819fdb7378f96f735ea5 | |
parent | 8b12702ebef20e54987673d898f8d261a317db02 (diff) | |
download | redmine-02b2a61e1578e4ae118c24752249f029f5024bb5.tar.gz redmine-02b2a61e1578e4ae118c24752249f029f5024bb5.zip |
Reverted r10184 (#9365).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10186 e93f8b46-1217-0410-a6f0-8f06a7374b81
-rw-r--r-- | app/helpers/application_helper.rb | 2 | ||||
-rw-r--r-- | test/unit/helpers/application_helper_test.rb | 50 |
2 files changed, 20 insertions, 32 deletions
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index cbdbcca4e..983f3fd8b 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -1134,7 +1134,7 @@ module ApplicationHelper # +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 diff --git a/test/unit/helpers/application_helper_test.rb b/test/unit/helpers/application_helper_test.rb index edb01ea6d..b3757b092 100644 --- a/test/unit/helpers/application_helper_test.rb +++ b/test/unit/helpers/application_helper_test.rb @@ -970,37 +970,25 @@ RAW end end - def test_avatar_enabled - with_settings :gravatar_enabled => '1' do - 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>').include?('size=50') - assert avatar('jsmith <jsmith@somenet.foo>', :size => 24).include?('size=24') - # Non-avatar options should be considered html options - assert avatar('jsmith <jsmith@somenet.foo>', :title => 'John Smith').include?('title="John Smith"') - # The default class of the img tag should be gravatar - assert avatar('jsmith <jsmith@somenet.foo>').include?('class="gravatar"') - 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 - assert_equal '', avatar(User.find_by_mail('jsmith@somenet.foo')) - end + 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>').include?('size=50') + assert avatar('jsmith <jsmith@somenet.foo>', :size => 24).include?('size=24') + # Non-avatar options should be considered html options + assert avatar('jsmith <jsmith@somenet.foo>', :title => 'John Smith').include?('title="John Smith"') + # The default class of the img tag should be gravatar + assert avatar('jsmith <jsmith@somenet.foo>').include?('class="gravatar"') + assert !avatar('jsmith <jsmith@somenet.foo>', :class => 'picture').include?('class="gravatar"') + assert_nil avatar('jsmith') + assert_nil avatar(nil) + + # turn off avatars + Setting.gravatar_enabled = '0' + assert_equal '', avatar(User.find_by_mail('jsmith@somenet.foo')) end def test_link_to_user |