test/unit/gravatarify_subdomain_test.rb in gravatarify-1.2.1 vs test/unit/gravatarify_subdomain_test.rb in gravatarify-2.0.3

@@ -9,38 +9,30 @@
   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 = ['0', '1']
-      assert_equal "http://0.gravatar.com/avatar/4979dd9653e759c78a81d4997f56bae2.jpg", build_gravatar_url('[e-mail]')
-      assert_equal "http://1.gravatar.com/avatar/d4489907918035d0bc6ff3f6c76e760d.jpg", build_gravatar_url('[e-mail]')
+      assert_equal "http://0.gravatar.com/avatar/4979dd9653e759c78a81d4997f56bae2.jpg", gravatar_url('[e-mail]')
+      assert_equal "http://1.gravatar.com/avatar/d4489907918035d0bc6ff3f6c76e760d.jpg", gravatar_url('[e-mail]')
     end
     
-    should "take in a string only argument, like www (and be aliased to 'subdomain' to singularize it :D)" do
-      Gravatarify.subdomain = 'www'
-      assert_equal "http://www.gravatar.com/avatar/4979dd9653e759c78a81d4997f56bae2.jpg", build_gravatar_url('[e-mail]')
-      assert_equal "http://www.gravatar.com/avatar/d4489907918035d0bc6ff3f6c76e760d.jpg", build_gravatar_url('[e-mail]')      
+    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]')      
     end
     
     should "still work as expected if passed in `nil` and return urls with default subdomain `www`" do
-      Gravatarify.subdomain = nil
-      assert_equal "http://www.gravatar.com/avatar/4979dd9653e759c78a81d4997f56bae2.jpg", build_gravatar_url('[e-mail]')
-      assert_equal "http://www.gravatar.com/avatar/d4489907918035d0bc6ff3f6c76e760d.jpg", build_gravatar_url('[e-mail]')            
+      Gravatarify.subdomains = nil
+      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]')            
     end
   end
-  
-  context "Gravatarify#use_only_www!" do
-    should "only generate www.gravatar.com urls" do
-      Gravatarify.use_www_only!
-      assert_equal "http://www.gravatar.com/avatar/4979dd9653e759c78a81d4997f56bae2.jpg", build_gravatar_url('[e-mail]')
-      assert_equal "http://www.gravatar.com/avatar/d4489907918035d0bc6ff3f6c76e760d.jpg", build_gravatar_url('[e-mail]')      
-    end
-  end
-  
+    
   context "with Net::HTTP the gravatar.com subdomains" do
     should "return an image of type image/jpeg" do
-      Gravatarify.subdomains.each do |subdomain|
+      %w{ 0 1 2 www }.each do |subdomain|
         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
     end
@@ -51,14 +43,14 @@
     
     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 (get rid of that warning dude!)
+      # do not verify peer certificate (just get rid of that warning!)
       http.instance_variable_get('@ssl_context').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      
+      assert_equal "image/jpeg", response.content_type
     end
   end
 end
\ No newline at end of file