rspec-webservice_matchers 1.4.0 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2b1695496042a67e3abc9091838f8c18a0a5ba55
-  data.tar.gz: ee02bda5eb989137c8cfec9f782d2f45344c8b7d
+  metadata.gz: bc5dff69f7d8e076b45349e851cffed6c3154dae
+  data.tar.gz: 234b5ec72bbb82e23535f5650ea7ea7bffd9bae1
 SHA512:
-  metadata.gz: 9f8acb1ade62b454163648f8e7d59562d64953f748af61576a0b797d2922d2fc74131481caeb8578ab22cab78bd25da96463bf557c89e6ec2eeee09354ea1cbf
-  data.tar.gz: 9d5ad3154d0db6175977d39b4181eb637cacaf1a64f7591b0665d03c75fab8fff043cdf09e10a38b9f6801b332fc7cbc3950590f85133c3aa20411aba10eae5f
+  metadata.gz: 0e62ebf6d183a2aa82bb4f595342e55b4b54a4de1b6afbd4c11f4d54485510858ae7c9071e8272849665d2dae88eb9cce2216c1c622b74d2009eacbabeffc2af
+  data.tar.gz: 3079c979f64cb292ede888caed703afeef2c936740efa068b2762791204951afbf6063d1cda781ff198a9ea93c6fa2faed26d9930d86dc2e0af6096a1ffa21f4

data/.travis.yml

@@ -2,3 +2,4 @@ language: ruby
 rvm:
   - "2.0.0"
   - "2.1.0"
+  - "2.1.1"

data/lib/rspec/webservice_matchers.rb

@@ -82,16 +82,27 @@ module RSpec
       end
     end
 
+
     # Pass when a URL returns the expected status code
     # Codes are defined in http://www.rfc-editor.org/rfc/rfc2616.txt
     RSpec::Matchers.define :be_status do |expected|
+      actual_code = nil
+      
       match do |url_or_domain_name|
         url      = RSpec::WebserviceMatchers.make_url(url_or_domain_name)
         response = RSpec::WebserviceMatchers.connection.head(url)
-        response.status == expected.to_i
+        actual   = response.status
+        expected = expected.to_i
+        actual_code = actual
+        actual == expected
+      end
+
+      failure_message_for_should do
+        "Received status #{actual_code}"
       end
     end
 
+
     # Pass when the response code is 200, following redirects
     # if necessary.
     RSpec::Matchers.define :be_up do

data/lib/rspec/webservice_matchers/version.rb

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

data/spec/rspec/webservice_matchers/protcol_spec.rb

@@ -1,20 +1,10 @@
-require 'webmock/rspec'
+require 'spec_helper'
 require 'rspec/webservice_matchers'
 
-#
-# TODO: set up mocks or VCR for the rest of these.
-# SEE:  http://www.slideshare.net/kjbuckley/testing-http-calls-with-webmock-and-vcr
-#
 
-WebMock.stub_request :any, 'http://www.website.com/a/page.txt'
-WebMock.stub_request :any, 'http://www.website.com/'
-
-WebMock.allow_net_connect!
-
-
-describe 'status_code' do
+describe 'be_status' do
   it 'can check 200 for successful resource requests' do
-    'http://www.website.com/a/page.txt'.should be_status 200
+    'http://a-page.com/a/page.txt'.should be_status 200
   end
 
   it 'handles domain names as well as URLs' do
@@ -25,24 +15,32 @@ describe 'status_code' do
     'www.website.com'.should be_status '200'
   end
 
-  it 'can check 503 for the Service Unavailable status' do
-    'http://www.weblaws.org/texas/laws/tex._spec._dist._local_laws_code_section_1011.202_tax_to_pay_general_obligation_bonds'.should be_status 503
+  it 'can check for the 503 - Service Unavailable status' do
+    'http://outoforder.com/'.should be_status 503
+  end
+
+  it 'can check for 404' do
+    expect('http://notfound.com/no.txt').to be_status 404
+  end
+
+  it 'gives the actual code received in case of failure' do
+    expect {
+      expect('http://notfound.com/no.txt').to be_status 200
+    }.to fail_matching(/404/)
   end
 end
 
 
 describe 'be_up' do
-  let(:rfc_url) {'http://www.rfc-editor.org/rfc/rfc2616.txt'}
-
   it 'follows redirects when necessary' do
-    'weblaws.org'.should be_up
+    'perm-redirector.com'.should be_up
   end
 
   it 'can also handle a simple 200' do
-    rfc_url.should be_up
+    'http://www.website.com/'.should be_up
   end
 
   it 'is available via a public API' do
-    RSpec::WebserviceMatchers.up?(rfc_url).should be true
+    RSpec::WebserviceMatchers.up?('http://www.website.com/').should be true
   end
 end

data/spec/spec_helper.rb

@@ -0,0 +1,33 @@
+require 'webmock/rspec'
+
+RSpec.configure do |config|
+  config.before(:each) do
+
+    WebMock.stub_request :any, 'http://a-page.com/a/page.txt'
+    WebMock.stub_request :any, 'www.website.com'
+    WebMock.stub_request(:any, /notfound.com/).to_return(status: 404)
+    WebMock.stub_request(:any, 'outoforder.com').to_return(status: 503)
+
+    WebMock.stub_request(:any, 'perm-redirector.com')
+      .to_return(status: 301, headers: {Location: 'http://www.website.com/'})
+
+    WebMock.allow_net_connect!
+  end
+end
+
+
+module RSpec
+  module Matchers
+    def fail
+      raise_error(RSpec::Expectations::ExpectationNotMetError)
+    end
+
+    def fail_with(message)
+      raise_error(RSpec::Expectations::ExpectationNotMetError, message)
+    end
+
+    def fail_matching(regex)
+      raise_error(RSpec::Expectations::ExpectationNotMetError, regex)
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rspec-webservice_matchers
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.4.1
 platform: ruby
 authors:
 - Robb Shecter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-13 00:00:00.000000000 Z
+date: 2014-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -127,6 +127,7 @@ files:
 - spec/rspec/webservice_matchers/protcol_spec.rb
 - spec/rspec/webservice_matchers/redirect_spec.rb
 - spec/rspec/webservice_matchers/ssl_spec.rb
+- spec/spec_helper.rb
 homepage: https://github.com/dogweather/rspec-webservice_matchers
 licenses:
 - MIT
@@ -155,3 +156,4 @@ test_files:
 - spec/rspec/webservice_matchers/protcol_spec.rb
 - spec/rspec/webservice_matchers/redirect_spec.rb
 - spec/rspec/webservice_matchers/ssl_spec.rb
+- spec/spec_helper.rb