cherry-pick avatar test from reverted r10184

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@10194 e93f8b46-1217-0410-a6f0-8f06a7374b81

test/unit/helpers/application_helper_test.rb

@@ -970,9 +970,8 @@ RAW
     end
   end
 
-  def test_avatar
+  def test_avatar_enabled
-    # turn on avatars
+    with_settings :gravatar_enabled => '1' do
-    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
@@ -985,11 +984,14 @@ RAW
       assert !avatar('jsmith <jsmith@somenet.foo>', :class => 'picture').include?('class="gravatar"')
       assert_nil avatar('jsmith')
       assert_nil avatar(nil)
+    end
+  end
 
-    # turn off avatars
+  def test_avatar_disabled
-    Setting.gravatar_enabled = '0'
+    with_settings :gravatar_enabled => '0' do
       assert_equal '', avatar(User.find_by_mail('jsmith@somenet.foo'))
     end
+  end
 
   def test_link_to_user
     user = User.find(2)