rspec-webservice_matchers 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3aca3e244bcc6fba59a64f758e107b9999b4a42a
-  data.tar.gz: c6168cb912525614671e2538edc946c0be787447
+  metadata.gz: 89064b80f84f72a5fd43886b4ef08bddfdd25eab
+  data.tar.gz: d0da9d277e5023d76d52fd5ca524492434266b10
 SHA512:
-  metadata.gz: 3d56795b8f888bf11c74e2cbc79904b0bad918e5ea99d23f8f178d86dfe3d517bf52110dfe4e0681bea82ebd496ddc8f178eb7560956911baa25753d5ae0eeb9
-  data.tar.gz: 813f7c6dbf6bd14837135163517b2233ee559dcf1516064e92f47da139f565978107620d09705ae4600735d6ee22bddb1194d5ac7cf9c4088ffedd6af558d49f
+  metadata.gz: 338608ed8145220d05925acf13eb5bad0aba255f5452154af1c01f91e188142dd857a45e02caa2dbcf9f7bea05b50e4d190e70fc2635ce75dcc949f883ee0c0f
+  data.tar.gz: 0bc6ca8f292510bc568e5e1bf4735d76fe426bc104eec4454f919c6e261dc9f72bce935f4bc6ab5a89754b764822404b9cb92c47f558951d787d6867bbd0c8f9

data/lib/rspec/webservice_matchers.rb

@@ -14,8 +14,8 @@ module RSpec
 
       # Test by seeing if Curl retrieves without complaining
       begin
-        conn = Faraday.new(:url => "https://#{domain_name_or_url}")
-        response = conn.head
+        conn = Faraday.new
+        response = conn.head("https://#{domain_name_or_url}")
         return true
       rescue
         # Not serving SSL, expired, or incorrect domain name in certificate
@@ -37,18 +37,17 @@ module RSpec
     # Pass successfully if we get a 301 to the place we intend.
     RSpec::Matchers.define :redirect_permanently_to do |expected|
       match do |url|
-        conn = Faraday.new(:url => url)
-        response = conn.head
-        response.status == 301 && response.headers['Location'] == expected
+        response = Faraday.new.head(url)
+        # binding.pry
+        response.status == 301 && response.headers['location'] == expected
       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|
-        conn = Faraday.new(:url => url)
-        response = conn.head
-        [302, 307].include?(response.status) && response.headers['Location'] == expected
+        response = Faraday.new.head(url)
+        [302, 307].include?(response.status) && response.headers['location'] == expected
       end
     end    
 
@@ -58,9 +57,8 @@ module RSpec
     # 3. which is correctly configured
     RSpec::Matchers.define :enforce_https_everywhere do
       match do |domain_name|
-        conn     = Faraday.new(:url => "http://#{domain_name}")
-        response = conn.head
-        new_url  = response.headers['Location']
+        response = Faraday.new.head("http://#{domain_name}")
+        new_url  = response.headers['location']
         (response.status == 301) && (/https/ === new_url) && (RSpec::WebserviceMatchers.has_valid_ssl_cert?(new_url))
       end
     end   
@@ -70,8 +68,7 @@ module RSpec
     RSpec::Matchers.define :be_status do |expected|
       match do |url_or_domain_name|
         url      = RSpec::WebserviceMatchers.make_url(url_or_domain_name)
-        conn     = Faraday.new(:url => url)
-        response = conn.head
+        response = Faraday.new.head(url)
         response.status == expected
       end
     end
@@ -81,11 +78,11 @@ module RSpec
     RSpec::Matchers.define :be_up do
       match do |url_or_domain_name|        
         url  = RSpec::WebserviceMatchers.make_url(url_or_domain_name)
-        conn = Faraday.new(url) do |c|
+        conn = Faraday.new do |c|
           c.use FaradayMiddleware::FollowRedirects, limit: 5
           c.adapter :net_http
         end
-        response = conn.head
+        response = conn.head(url)
         response.status == 200
       end
     end

data/lib/rspec/webservice_matchers/version.rb

@@ -1,5 +1,5 @@
 module RSpec
   module WebserviceMatchers
-    VERSION = "1.1.1"
+    VERSION = "1.1.2"
   end
 end

data/spec/rspec/webservice_matchers/redirect_spec.rb

@@ -1,11 +1,13 @@
 require 'rspec/webservice_matchers'
 
 #
-# TODO: Set up a server for these. (Or a mock?)
+# TODO: Set up a server for these. (Or a mock?) 
+#       Faraday supports testing: we can use that now.
 #
 describe 'redirect_permanently_to' do
   it 'passes when receiving a 301 to the given URL' do
     expect('http://weblaws.org').to redirect_permanently_to('http://www.weblaws.org/')
+    expect('http://www.getquisitive.com/press-kit/').to redirect_permanently_to 'http://getquisitive.com/press-kit/'
   end
 end
 

metadata

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