akamai_rspec 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 38c12fef545212e77f64ed648c186bfd23d69edc
-  data.tar.gz: 34a2be235eb450581d70bd5a24dcd6cc625e0941
+  metadata.gz: 07fe4b6c45db380b71ff544f77ae226a4cc74809
+  data.tar.gz: b1f5f15809c6003669937c1466db669c6b9a4c27
 SHA512:
-  metadata.gz: 9095d501406f200e279d215860fa08b3c470e717cd42055e3add2876b7035619f83b40ebe2e72041e3776fcca056387e14757c33e7a5f3bfee0eba9c2dfc2a66
-  data.tar.gz: 945d08c9fccc3c7446fae578d49ee8198cf48d8d0ab3fbf2420df7ed908ff833adb7c93e5bd4c5cfe005ec5d771a20e1ef8c174cb31fb8819c6e8bd136c60c7d
+  metadata.gz: a1c3e9b1f6bfa2ad4aa0c1b72f0775c1dae149e20dac1ac07b306b2763b2b240285b1e1af7eb470a9f740e2d7be16bf5de8617f2170f44d34b00131d511dabf2
+  data.tar.gz: 8116ec3976984834df9d42218aa284960cd2aed54b1379f6b47dfba0524acb28b348fbb3dc2a17298073e69caa6fd9d54395347c57212bf3c86123db7f32ee66

data/lib/akamai_rspec/helpers/chainable_redirect.rb

@@ -15,8 +15,8 @@ module AkamaiRSpec
         return secure, url
       end
 
-      def redirect(url, expected_location, expected_response_code)
-        response = AkamaiRSpec::Request.get(url)
+      def redirect(url, expected_location, expected_response_code, headers)
+        response = AkamaiRSpec::Request.get(url, headers)
         fail "Response was #{response.inspect}, expected code #{expected_response_code}" unless response.code == expected_response_code
         unless expected_location === response.headers[:location]
           fail "redirect location was #{response.headers[:location]} (expected #{expected_location})"

data/lib/akamai_rspec/matchers/non_akamai.rb

@@ -32,8 +32,15 @@ module AkamaiRSpec
         url = "https://#{url}" unless URI(url).scheme
         begin
           # Avoid AkamaiRspec::Request as it turns off SSL checking
-          @response = RestClient::Request.execute(method: :get, url: url, verify_ssl: OpenSSL::SSL::VERIFY_PEER)
+          @response = RestClient::Request.execute(
+            method: :get,
+            url: url,
+            max_redirects: 0,
+            verify_ssl: OpenSSL::SSL::VERIFY_PEER
+          )
           return true
+        rescue RestClient::MaxRedirectsReached
+          return true # Securely sent a redirect
         rescue => e
           @error = e
           return false

data/lib/akamai_rspec/matchers/redirects.rb

@@ -4,49 +4,59 @@ require 'akamai_rspec/helpers/chainable_redirect'
 
 module AkamaiRSpec
   module Matchers
-    define :be_permanently_redirected_to do |expected_location|
+    define :be_permanently_redirected_to do |expected_location, headers: {}|
       include AkamaiRSpec::Helpers::ChainableRedirect
       match do |url|
-        redirect(url, expected_location, 301)
+        redirect(url, expected_location, 301, headers)
       end
     end
 
-    define :be_temporarily_redirected_to do |expected_location|
+    define :be_temporarily_redirected_to do |expected_location, headers: {}|
       include AkamaiRSpec::Helpers::ChainableRedirect
       match do |url|
-        redirect(url, expected_location, 302)
+        redirect(url, expected_location, 302, headers)
       end
     end
 
-    define :redirect_http_to_https do |with: 301|
+    define :redirect_http_to_https do |with: 301, headers: {}|
       include AkamaiRSpec::Helpers::ChainableRedirect
       match do |url|
         secure, url = with_and_without_tls(url)
-        redirect(url, secure, with)
+        redirect(url, secure, with, headers)
       end
     end
 
-    define :redirect_https_to_http do |with: 301|
+    define :redirect_https_to_http do |with: 301, headers: {}|
       include AkamaiRSpec::Helpers::ChainableRedirect
       match do |url|
         secure, url = with_and_without_tls(url)
-        redirect(secure, url, with)
+        redirect(secure, url, with, headers)
       end
     end
 
-    define :redirect_to_add_trailing_slash do |with: 301|
+    define :redirect_to_remove_trailing_slash do |with: 301, headers: {}|
       include AkamaiRSpec::Helpers::ChainableRedirect
       match do |url|
         without_trailing_slash = url.gsub(/\/+$/, '')
         with_trailing_slash = without_trailing_slash + "/"
-        redirect(without_trailing_slash, with_trailing_slash, with)
+        redirect(with_trailing_slash, without_trailing_slash, with, headers)
+      end
+    end
+
+    define :redirect_to_add_trailing_slash do |with: 301, headers: {}|
+      include AkamaiRSpec::Helpers::ChainableRedirect
+      match do |url|
+        without_trailing_slash = url.gsub(/\/+$/, '')
+        with_trailing_slash = without_trailing_slash + "/"
+        redirect(without_trailing_slash, with_trailing_slash, with, headers)
       end
     end
 
     define :be_temporarily_redirected_with_trailing_slash do
       include AkamaiRSpec::Helpers::ChainableRedirect
       match do |url|
-        redirect(url, url + '/', 302)
+        puts "be_temporarily_redirected_with_trailing_slash is deprecated and will be removed in 2.0; use redirect_to_add_trailing_slash(with: 302)"
+        redirect(url, url + '/', 302, {})
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: akamai_rspec
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Bianca Gibson
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-02 00:00:00.000000000 Z
+date: 2016-11-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client