rspec-webservice_matchers 1.4.4 → 1.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 61e21d1a503a63265b3ff7608ac69a75daa846b6
-  data.tar.gz: 89c6aa33d5e010a2835e30b1d0a99a4d830587eb
+  metadata.gz: 02eddd454df17509b576e24d1ed58c35db8710f5
+  data.tar.gz: 6f6adc6984c5831ce98d5469824c43d63fce4923
 SHA512:
-  metadata.gz: dc905ac397698db66464b220afe03b19aa704e7cf4d83d17bdd5f5cbf914ff349ffdde0f1796678f8dab7cfc6677e8b93879ca5ccd553d6fcf141f0164604503
-  data.tar.gz: 25380cba323ad7aac3d13b6b27533d0d0fe88b0dcd0bd83359b2c045673430a8bc088e7a1a6849628f4332d3468036e1ad4e789fafad6d1ff192f90d2760abbf
+  metadata.gz: 5de73f534072a2ba6bfb08334e6288e023ed464f6142bf5fff420a03f6b32a2076b2daf4cd5ad2818b318f6a0d313fedd0f5150c166ae750afb171abcff89a21
+  data.tar.gz: a1d958399fe04fd78638ba264082e4e878bd17e8bc241523b9a4e100c9883b2b18dbd5b7a837de0b7cfe83591c4740671cf4faa71cffa3562360fccec38800e8

data/lib/rspec/webservice_matchers.rb

@@ -66,34 +66,81 @@ module RSpec
       failure_message_for_should do
         error_message
       end
-
-      failure_message_for_should_not do
-        error_message
-      end
     end
 
 
     # Pass successfully if we get a 301 to the place we intend.
     RSpec::Matchers.define :redirect_permanently_to do |expected|
+      error_message = actual_status = actual_location = nil
+
       match do |url_or_domain_name|
-        response = RSpec::WebserviceMatchers.connection.head(RSpec::WebserviceMatchers.make_url url_or_domain_name)
-        expected = RSpec::WebserviceMatchers.make_url(expected)
-        actual   = response.headers['location']
-        status   = response.status
+        begin
+          response = RSpec::WebserviceMatchers.connection.head(RSpec::WebserviceMatchers.make_url url_or_domain_name)
+          expected = RSpec::WebserviceMatchers.make_url(expected)
+          actual_location = response.headers['location']
+          actual_status   = response.status
+
+          (actual_status == 301) && (%r|#{expected}/?| === actual_location)
+        rescue Exception => e
+          error_message = e.message
+          false  
+        end
+      end
 
-        (status == 301) && (%r|#{expected}/?| === actual)
+      failure_message_for_should do
+        if ! error_message.nil?
+          error_message
+        else
+          mesgs = []
+          if [302, 307].include? actual_status
+            mesgs << "received a temporary redirect, status #{actual_status}"
+          end
+          if ! actual_location.nil? && ! (%r|#{expected}/?| === actual_location)
+            mesgs << "received location #{actual_location}"
+          end
+          if ! [301, 302, 307].include? actual_status
+            mesgs << "not a redirect: received status #{actual_status}"
+          end
+          mesgs.join('; ').capitalize
+        end
       end
     end
 
+
     # Pass successfully if we get a 302 or 307 to the place we intend.
     RSpec::Matchers.define :redirect_temporarily_to do |expected|
-      match do |url|
-        response = RSpec::WebserviceMatchers.connection.head(RSpec::WebserviceMatchers.make_url(url))
-        expected = RSpec::WebserviceMatchers.make_url(expected)
-        actual   = response.headers['location']
-        status   = response.status
+      error_message = actual_status = actual_location = nil
+
+      match do |url_or_domain_name|
+        begin
+          response = RSpec::WebserviceMatchers.connection.head(RSpec::WebserviceMatchers.make_url url_or_domain_name)
+          expected = RSpec::WebserviceMatchers.make_url(expected)
+          actual_location = response.headers['location']
+          actual_status   = response.status
+
+          [302, 307].include?(actual_status) && (%r|#{expected}/?| === actual_location)
+        rescue Exception => e
+          error_message = e.message
+          false  
+        end
+      end
 
-        [302, 307].include?(status) && (%r|#{expected}/?| === actual)
+      failure_message_for_should do
+        if ! error_message.nil?
+          error_message
+        else
+          mesgs = []
+          if actual_status == 301
+            mesgs << "received a permanent redirect, status #{actual_status}"
+          end
+          if ! actual_location.nil? && ! (%r|#{expected}/?| === actual_location)
+            mesgs << "received location #{actual_location}"
+          end
+          if ! [301, 302, 307].include? actual_status
+            mesgs << "not a redirect: received status #{actual_status}"
+          end
+          mesgs.join('; ').capitalize
+        end
       end
     end
 
@@ -123,7 +170,6 @@ module RSpec
         end
       end
 
-
       # Create a compound error message listing all of the
       # relevant actual values received.
       failure_message_for_should do

data/lib/rspec/webservice_matchers/version.rb

@@ -1,5 +1,5 @@
 module RSpec
   module WebserviceMatchers
-    VERSION = "1.4.4"
+    VERSION = "1.4.5"
   end
 end

data/spec/rspec/webservice_matchers/redirect_spec.rb

@@ -4,16 +4,40 @@ require 'rspec/webservice_matchers'
 
 describe 'redirect_permanently_to' do
   it 'passes when receiving a 301 to the given URL' do
-    expect('http://perm-redirector.com').to redirect_permanently_to('http://www.website.com/')
+    expect('http://perm-redirector.com').to redirect_permanently_to 'http://www.website.com/' 
   end
 
   it 'handles domain names gracefully' do
-    expect('perm-redirector.com').to redirect_permanently_to('www.website.com/')
+    expect('perm-redirector.com').to redirect_permanently_to 'www.website.com/'
   end
 
-  it 'handles missing final slash' do
-    expect('perm-redirector.com').to redirect_permanently_to('www.website.com')
+  it 'handles a missing final slash' do
+    expect('perm-redirector.com').to redirect_permanently_to 'www.website.com'
   end 
+
+  it 'gives a good error message for the wrong redirect type' do
+    expect {
+      expect('temp-redirector.org').to redirect_permanently_to 'http://a-page.com/a/page.txt'
+    }.to fail_matching(/temporary/i)
+  end
+
+  it 'gives a good error message for a redirect to the wrong location' do
+    expect {
+      expect('perm-redirector.com').to redirect_permanently_to 'http://the-wrong-site.com/'
+    }.to fail_matching(/location/i)
+  end
+
+  it 'gives a good error message for a non-redirect status' do
+    expect {
+      expect('notfound.com').to redirect_permanently_to 'http://the-wrong-site.com/'
+    }.to fail_matching(/404/i)    
+  end
+
+  it 'gives a good error message when the hostname is bad' do
+    expect {
+      expect('asdhfjadhsfksd.com').to redirect_permanently_to 'http://the-wrong-site.com/'
+    }.to fail_matching(/not known/i)    
+  end    
 end
 
 
@@ -29,4 +53,28 @@ describe 'redirect_temporarily_to' do
   it 'passes when it gets a 307' do
     'temp-307-redirector.net'.should redirect_temporarily_to 'a-page.com/a/page.txt'
   end
-end
+
+  it 'gives a good error message for the wrong redirect type' do
+    expect {
+      expect('perm-redirector.com').to redirect_temporarily_to 'www.website.com/'
+    }.to fail_matching(/permanent/i)
+  end
+
+  it 'gives a good error message for a redirect to the wrong location' do
+    expect {
+      expect('temp-307-redirector.net').to redirect_temporarily_to 'www.nowhere.com'
+    }.to fail_matching(/location/i)
+  end
+
+  it 'gives a good error message for a non-redirect status' do
+    expect {
+      expect('notfound.com').to redirect_temporarily_to 'www.nowhere.com'
+    }.to fail_matching(/404/i)
+  end
+
+  it 'gives a good error message when the hostname is bad' do
+    expect {
+      expect('234678234687234.com').to redirect_temporarily_to 'www.nowhere.com'
+    }.to fail_matching(/not known/i)
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rspec-webservice_matchers
 version: !ruby/object:Gem::Version
-  version: 1.4.4
+  version: 1.4.5
 platform: ruby
 authors:
 - Robb Shecter