rspec-webservice_matchers 1.4.1 → 1.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bc5dff69f7d8e076b45349e851cffed6c3154dae
-  data.tar.gz: 234b5ec72bbb82e23535f5650ea7ea7bffd9bae1
+  metadata.gz: 5d0db24cd17e0dc1da5656291cf823dc6edd8823
+  data.tar.gz: 88cb9edbd5986e4ad036cec34445a8c4a150a9b0
 SHA512:
-  metadata.gz: 0e62ebf6d183a2aa82bb4f595342e55b4b54a4de1b6afbd4c11f4d54485510858ae7c9071e8272849665d2dae88eb9cce2216c1c622b74d2009eacbabeffc2af
-  data.tar.gz: 3079c979f64cb292ede888caed703afeef2c936740efa068b2762791204951afbf6063d1cda781ff198a9ea93c6fa2faed26d9930d86dc2e0af6096a1ffa21f4
+  metadata.gz: 687ea5c0d7d5bc1197c327ade4d7f5fc0daa7d586950ace47b0326dda17c63cd95e1e40e076ae4fa8fdf83a4b60ec3e071b9b325e0f6781dfb989a04c7c0b739
+  data.tar.gz: 920efc3653699436d52518840eb4a83597463c54194a803265b9f84ffd1502567763a81fa552b9169f713194bbe0acc8d0b165530f4d25311ddb1b81fdaef384

data/lib/rspec/webservice_matchers.rb

@@ -106,8 +106,18 @@ module RSpec
     # Pass when the response code is 200, following redirects
     # if necessary.
     RSpec::Matchers.define :be_up do
+      actual_status = nil
+
       match do |url_or_domain_name|
-        RSpec::WebserviceMatchers.up?(url_or_domain_name)
+        url  = RSpec::WebserviceMatchers.make_url(url_or_domain_name)
+        conn = RSpec::WebserviceMatchers.connection(follow: true)
+        response = conn.head(url)
+        actual_status = response.status
+        actual_status == 200
+      end
+
+      failure_message_for_should do
+        "Received status #{actual_status}"
       end
     end
 

data/lib/rspec/webservice_matchers/version.rb

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

data/spec/rspec/webservice_matchers/protcol_spec.rb

@@ -34,6 +34,7 @@ end
 describe 'be_up' do
   it 'follows redirects when necessary' do
     'perm-redirector.com'.should be_up
+    'temp-redirector.org'.should be_up
   end
 
   it 'can also handle a simple 200' do
@@ -43,4 +44,10 @@ describe 'be_up' do
   it 'is available via a public API' do
     RSpec::WebserviceMatchers.up?('http://www.website.com/').should be true
   end
+
+  it 'gives relevant error output' do
+    expect {
+      expect('http://notfound.com/no.txt').to be_up
+    }.to fail_matching(/404/)
+  end
 end

data/spec/rspec/webservice_matchers/redirect_spec.rb

@@ -1,32 +1,32 @@
+require 'spec_helper'
 require 'rspec/webservice_matchers'
 
-#
-# 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/'
+    expect('http://perm-redirector.com').to redirect_permanently_to('http://www.website.com/')
   end
 
   it 'handles domain names gracefully' do
-    expect('weblaws.org').to redirect_permanently_to('www.weblaws.org/')
+    expect('perm-redirector.com').to redirect_permanently_to('www.website.com/')
   end
 
   it 'handles missing final slash' do
-    expect('weblaws.org').to redirect_permanently_to('www.weblaws.org')
+    expect('perm-redirector.com').to redirect_permanently_to('www.website.com')
   end 
 end
 
 
 describe 'redirect_temporarily_to' do
   it 'passes when it gets a 302' do
-    'http://www.oregonlaws.org/cms/about_us'.should redirect_temporarily_to 'http://www.weblaws.org/cms/about_us'
+    'http://temp-redirector.org'.should redirect_temporarily_to 'http://a-page.com/a/page.txt'
   end
 
-  # TODO: Set up the mock server and test these
-  it 'handles domain names gracefully'
-  it 'passes when it gets a 307'
+  it 'handles domain names gracefully' do
+    'temp-redirector.org'.should redirect_temporarily_to 'a-page.com/a/page.txt'
+  end 
+
+  it 'passes when it gets a 307' do
+    'temp-307-redirector.net'.should redirect_temporarily_to 'a-page.com/a/page.txt'
+  end
 end

data/spec/spec_helper.rb

@@ -11,6 +11,12 @@ RSpec.configure do |config|
     WebMock.stub_request(:any, 'perm-redirector.com')
       .to_return(status: 301, headers: {Location: 'http://www.website.com/'})
 
+    WebMock.stub_request(:any, 'temp-redirector.org')
+      .to_return(status: 302, headers: {Location: 'http://a-page.com/a/page.txt'})
+
+    WebMock.stub_request(:any, 'temp-307-redirector.net')
+      .to_return(status: 307, headers: {Location: 'http://a-page.com/a/page.txt'})
+
     WebMock.allow_net_connect!
   end
 end

metadata

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