rspec-webservice_matchers 1.4.3 → 1.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e5e2f461f7c91199840fe5296000e9592ca4f7e3
-  data.tar.gz: 6d62373fefe398e53de5294763fcc9b2ccd612b4
+  metadata.gz: 61e21d1a503a63265b3ff7608ac69a75daa846b6
+  data.tar.gz: 89c6aa33d5e010a2835e30b1d0a99a4d830587eb
 SHA512:
-  metadata.gz: a63683fe144143b747a1b78dd57e5761ef38a2a32aba37867808e3388a3aa7efd3739592f85714f6e398d2be0f5e7ffc87e63dbfa28ddf24f68ba18c649168a8
-  data.tar.gz: 9105da66765a264943fa94e2b14bc64a90ab02e8f05201396e62258c0a7510b2546d5f4a0010dcc6d1041f964c5e59e3a93f7db9cfb2ce57037a5810f9447e0f
+  metadata.gz: dc905ac397698db66464b220afe03b19aa704e7cf4d83d17bdd5f5cbf914ff349ffdde0f1796678f8dab7cfc6677e8b93879ca5ccd553d6fcf141f0164604503
+  data.tar.gz: 25380cba323ad7aac3d13b6b27533d0d0fe88b0dcd0bd83359b2c045673430a8bc088e7a1a6849628f4332d3468036e1ad4e789fafad6d1ff192f90d2760abbf

data/lib/rspec/webservice_matchers.rb

@@ -26,6 +26,7 @@ module RSpec
       end
     end
 
+
     # Return true if the given page has status 200,
     # and follow a few redirects if necessary.
     def self.up?(url_or_domain_name)
@@ -36,16 +37,42 @@ module RSpec
     end
 
 
+    def self.try_ssl_connection(domain_name_or_url)
+      # Normalize the input: remove 'http(s)://' if it's there
+      if %r|^https?://(.+)$| === domain_name_or_url
+        domain_name_or_url = $1
+      end
+      connection.head("https://#{domain_name_or_url}")
+    end
+
+
     # RSpec Custom Matchers ###########################################
     # See https://www.relishapp.com/rspec/rspec-expectations/v/2-3/docs/custom-matchers/define-matcher
 
     # Test whether https is correctly implemented
     RSpec::Matchers.define :have_a_valid_cert do
+      error_message = nil
+
       match do |domain_name_or_url|
-        RSpec::WebserviceMatchers.has_valid_ssl_cert?(domain_name_or_url)
+        begin
+          RSpec::WebserviceMatchers.try_ssl_connection(domain_name_or_url)
+          true
+        rescue Exception => e
+          error_message = e.message
+          false
+        end
+      end
+
+      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|
       match do |url_or_domain_name|
@@ -76,36 +103,47 @@ module RSpec
     # 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
+      error_msg = 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']
-
-        actual_status  = response.status
-        if new_url =~ /^(https?)/
-          actual_protocol = $1
+        begin
+          response = RSpec::WebserviceMatchers.connection.head("http://#{domain_name}")
+          new_url  = response.headers['location']
+          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)
+        rescue Faraday::Error::ConnectionFailed => e
+          error_msg = "Connection failed"
+          false
         end
-        actual_valid_cert = RSpec::WebserviceMatchers.has_valid_ssl_cert?(new_url)
-        
-        (actual_status == 301) &&
-          (actual_protocol == 'https') &&
-          (actual_valid_cert == true)
       end
 
+
+      # Create a compound error message listing all of the
+      # relevant actual values received.
       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}"
+        if !error_msg.nil?
+          error_msg
+        else
+          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('; ').capitalize
         end
-        if ! actual_valid_cert
-          mesgs << "There's no valid SSL certificate"
-        end
-        mesgs.join('; ')
       end
+
     end
 
 

data/lib/rspec/webservice_matchers/version.rb

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

data/spec/rspec/webservice_matchers/ssl_spec.rb

@@ -1,3 +1,4 @@
+require 'spec_helper'
 require 'rspec/webservice_matchers'
 
 # VCR may be the tool to use for this. Can it handle https? Would that work?
@@ -15,6 +16,18 @@ describe 'have_a_valid_cert matcher' do
       expect('www.psu.edu').to have_a_valid_cert    
     }.to fail
   end
+
+  it 'provides a relevant error message' do
+    expect {
+      expect('www.psu.edu').to have_a_valid_cert    
+    }.to fail_matching(/no route to host/i)
+  end
+
+  it "provides a relevant error message when the domain name doesn't exist" do
+    expect {
+      expect('sdfgkljhsdfghjkhsdfgj.edu').to have_a_valid_cert    
+    }.to fail_matching(/not known/i)
+  end
 end
 
 
@@ -29,4 +42,10 @@ describe 'enforce_https_everywhere' do
       expect('www.psu.edu').to enforce_https_everywhere
     }.to fail_matching(/200/)
   end
+
+  it "provides a relevant error message when the domain name doesn't exist" do
+    expect {
+      expect('asdhfjkalsdhfjklasdfhjkasdhfl.com').to enforce_https_everywhere
+    }.to fail_matching(/connection failed/i)
+  end
 end

metadata

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