test/unit/gravatarify_subdomain_test.rb in gravatarify-3.1.0 vs test/unit/gravatarify_subdomain_test.rb in gravatarify-3.1.1

@@ -3,54 +3,52 @@
 require 'net/https'
 require 'uri'
 
 class GravatarifySubdomainTest < Test::Unit::TestCase
   include Gravatarify::Base
-  
+
   def setup; reset_gravatarify! end
-    
+
   context "changing hosts through Gravatarify#subdomains" do
     should "override default subdomains (useful to e.g. switch back to 'www' only)" do
       Gravatarify.subdomains = ['a', 'b']
       assert_match %r{\Ahttp://[ab].gravatar.com/avatar/4979dd9653e759c78a81d4997f56bae2.jpg\z}, gravatar_url('[e-mail]')
       assert_match %r{\Ahttp://[ab].gravatar.com/avatar/d4489907918035d0bc6ff3f6c76e760d.jpg\z}, gravatar_url('[e-mail]')
     end
-    
+
     should "take in a string only argument, like www" do
       Gravatarify.subdomains = 'www'
       assert_equal "http://www.gravatar.com/avatar/4979dd9653e759c78a81d4997f56bae2.jpg", gravatar_url('[e-mail]')
-      assert_equal "http://www.gravatar.com/avatar/d4489907918035d0bc6ff3f6c76e760d.jpg", gravatar_url('[e-mail]')      
+      assert_equal "http://www.gravatar.com/avatar/d4489907918035d0bc6ff3f6c76e760d.jpg", gravatar_url('[e-mail]')
     end
-    
+
     should "still work as expected if passed in `nil` and return urls without subdomain (default)" do
       Gravatarify.subdomains = []
       assert_equal "http://gravatar.com/avatar/4979dd9653e759c78a81d4997f56bae2.jpg", gravatar_url('[e-mail]')
-      assert_equal "http://gravatar.com/avatar/d4489907918035d0bc6ff3f6c76e760d.jpg", gravatar_url('[e-mail]')            
+      assert_equal "http://gravatar.com/avatar/d4489907918035d0bc6ff3f6c76e760d.jpg", gravatar_url('[e-mail]')
     end
   end
-    
+
   context "with Net::HTTP the gravatar.com subdomains" do
-    should "return an image of type image/jpeg" do
-      %w{ 0 1 2 www }.each do |subdomain|
+    %w{ 0 1 2 3 www secure }.each do |subdomain|
+      should "respond to http://#{subdomain}.gravatar.com/" do
         response = Net::HTTP.get_response URI.parse("http://#{subdomain}.gravatar.com/avatar/4979dd9653e759c78a81d4997f56bae2.jpg")
         assert_equal 200, response.code.to_i
         assert_equal "image/jpeg", response.content_type
       end
+
+      should "respond to https://#{subdomain}.gravatar.com/ urls as well" do
+        http = Net::HTTP.new("#{subdomain}.gravatar.com", 443)
+        http.use_ssl = true
+        http.verify_mode = OpenSSL::SSL::VERIFY_PEER
+
+        response = http.get '/avatar/4979dd9653e759c78a81d4997f56bae2.jpg'
+        assert_equal 200, response.code.to_i
+        assert_equal "image/jpeg", response.content_type
+      end
     end
-    
-    should "not respond to 3.gravatar.com, if so add to subdomains dude!!!" do
-      assert_raises(SocketError) { Net::HTTP.get_response URI.parse('http://3.gravatar.com/avatar/4979dd9653e759c78a81d4997f56bae2.jpg') }
+
+    should "not respond to 4.gravatar.com, if so add to subdomains dude!!!" do
+      assert_raises(SocketError) { Net::HTTP.get_response URI.parse('http://4.gravatar.com/avatar/4979dd9653e759c78a81d4997f56bae2.jpg') }
     end
-    
-    should "respond to https://secure.gravatar.com/ urls as well" do
-      http = Net::HTTP.new('secure.gravatar.com', 443)
-      http.use_ssl = true
-      
-      # do not verify peer certificate (just get rid of that warning!)      
-      http.verify_mode = OpenSSL::SSL::VERIFY_NONE
-      
-      response = http.get '/avatar/4979dd9653e759c78a81d4997f56bae2.jpg'
-      assert_equal 200, response.code.to_i
-      assert_equal "image/jpeg", response.content_type
-    end
   end
-end
\ No newline at end of file
+end