rspec-webservice_matchers 1.4.2 → 1.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5d0db24cd17e0dc1da5656291cf823dc6edd8823
-  data.tar.gz: 88cb9edbd5986e4ad036cec34445a8c4a150a9b0
+  metadata.gz: e5e2f461f7c91199840fe5296000e9592ca4f7e3
+  data.tar.gz: 6d62373fefe398e53de5294763fcc9b2ccd612b4
 SHA512:
-  metadata.gz: 687ea5c0d7d5bc1197c327ade4d7f5fc0daa7d586950ace47b0326dda17c63cd95e1e40e076ae4fa8fdf83a4b60ec3e071b9b325e0f6781dfb989a04c7c0b739
-  data.tar.gz: 920efc3653699436d52518840eb4a83597463c54194a803265b9f84ffd1502567763a81fa552b9169f713194bbe0acc8d0b165530f4d25311ddb1b81fdaef384
+  metadata.gz: a63683fe144143b747a1b78dd57e5761ef38a2a32aba37867808e3388a3aa7efd3739592f85714f6e398d2be0f5e7ffc87e63dbfa28ddf24f68ba18c649168a8
+  data.tar.gz: 9105da66765a264943fa94e2b14bc64a90ab02e8f05201396e62258c0a7510b2546d5f4a0010dcc6d1041f964c5e59e3a93f7db9cfb2ce57037a5810f9447e0f

data/lib/rspec/webservice_matchers.rb

@@ -70,15 +70,41 @@ module RSpec
       end
     end
 
+
     # This is a high level matcher which checks three things:
     # 1. Permanent redirect
     # 2. to an https url
     # 3. which is correctly configured
     RSpec::Matchers.define :enforce_https_everywhere do
+      actual_status = actual_protocol = actual_valid_cert = nil
+
       match do |domain_name|
         response = RSpec::WebserviceMatchers.connection.head("http://#{domain_name}")
         new_url  = response.headers['location']
-        (response.status == 301) && (/https/ === new_url) && (RSpec::WebserviceMatchers.has_valid_ssl_cert?(new_url))
+
+        actual_status  = response.status
+        if new_url =~ /^(https?)/
+          actual_protocol = $1
+        end
+        actual_valid_cert = RSpec::WebserviceMatchers.has_valid_ssl_cert?(new_url)
+        
+        (actual_status == 301) &&
+          (actual_protocol == 'https') &&
+          (actual_valid_cert == true)
+      end
+
+      failure_message_for_should do
+        mesgs = []
+        if actual_status != 301
+          mesgs << "Received status #{actual_status} instead of 301"
+        end
+        if !actual_protocol.nil? && actual_protocol != 'https'
+          mesgs << "Destination uses protocol #{actual_protocol.upcase}"
+        end
+        if ! actual_valid_cert
+          mesgs << "There's no valid SSL certificate"
+        end
+        mesgs.join('; ')
       end
     end
 
@@ -89,12 +115,11 @@ module RSpec
       actual_code = nil
       
       match do |url_or_domain_name|
-        url      = RSpec::WebserviceMatchers.make_url(url_or_domain_name)
-        response = RSpec::WebserviceMatchers.connection.head(url)
-        actual   = response.status
-        expected = expected.to_i
-        actual_code = actual
-        actual == expected
+        url         = RSpec::WebserviceMatchers.make_url(url_or_domain_name)
+        response    = RSpec::WebserviceMatchers.connection.head(url)
+        actual_code = response.status
+        expected    = expected.to_i
+        actual_code == expected
       end
 
       failure_message_for_should do

data/lib/rspec/webservice_matchers/version.rb

@@ -1,5 +1,5 @@
 module RSpec
   module WebserviceMatchers
-    VERSION = "1.4.2"
+    VERSION = "1.4.3"
   end
 end

data/spec/rspec/webservice_matchers/ssl_spec.rb

@@ -12,10 +12,8 @@ describe 'have_a_valid_cert matcher' do
 
   it 'fails if the server is not serving SSL at all' do
     expect {
-      # www.psu.edu only supports HTTP, port 80.
-      # TODO: set up a test server for this. (?)
       expect('www.psu.edu').to have_a_valid_cert    
-    }.to raise_error(RSpec::Expectations::ExpectationNotMetError)
+    }.to fail
   end
 end
 
@@ -25,4 +23,10 @@ describe 'enforce_https_everywhere' do
   it 'passes when http requests are redirected to valid https urls' do
     expect('eff.org').to enforce_https_everywhere
   end
+
+  it 'provides a relevant error message' do
+    expect {
+      expect('www.psu.edu').to enforce_https_everywhere
+    }.to fail_matching(/200/)
+  end
 end

metadata

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