airborne 0.1.14 → 0.1.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a50567a090e2037a39b2af95854ab7703f48ffc7
-  data.tar.gz: d97fc4c6b00fe0023f708aaa3c6736ddede8d194
+  metadata.gz: 6ce172c348689ccc6d7d3df32523db62d7671a1e
+  data.tar.gz: ec99365c4dcc0920dcd02197f47e2bb6dd985999
 SHA512:
-  metadata.gz: 3620746a2478dbdcaf299f0c4d051457dee52b1c37b29518115a78c8c762ec632a692cf9f1835e06168fa6cfa2143f89a6233f9aefcc990dfa9aced93450fb86
-  data.tar.gz: b35942edfba2fa967486c96f1eb0b64b027c6fd4b5b854e0b8a114ba05d4f983cdeb2a215537dafdd5d627fcdfab5a74afe595b17fea8d0b25f63b367df5e298
+  metadata.gz: 90c1a8944f16fb51139cf02d0e3bf29e30217ce9e6bf8d25116fc9cc221e1812426bef30d55cbf475ef476375f8b9393ea86c801cd81a0a588ea046d79cf4e36
+  data.tar.gz: d141eaa4f1917c759e0c1e7ea7665fe07085f4c375737ae2d3286e570d2a59c2647482f3a52004c775617635f859fd0ae88d0e097e4692ca555565dd4e2cfe06

data/airborne.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name        = 'airborne'
-  s.version     = '0.1.14'
-  s.date        = '2015-03-02'
+  s.version     = '0.1.15'
+  s.date        = '2015-03-03'
   s.summary = "RSpec driven API testing framework"
   s.authors     = ["Alex Friedman", "Seth Pollack"]
   s.email       = ['a.friedman07@gmail.com', 'teampollack@gmail.com']
@@ -9,7 +9,7 @@ Gem::Specification.new do |s|
   s.files = `git ls-files`.split("\n")
   s.license     = 'MIT'
   s.add_runtime_dependency 'rspec', '~> 3.1', '>= 3.1.0'
-  s.add_runtime_dependency 'rest-client', '~> 1.7', '>= 1.7.3'
+  s.add_runtime_dependency 'rest-client', '~> 1.7', '>= 1.7.3' #version 1.7.3 fixes security vulnerability https://github.com/brooklynDev/airborne/issues/41
   s.add_runtime_dependency 'rack-test', '~> 0.6', '>= 0.6.2'
   s.add_runtime_dependency 'activesupport', '>= 3.0.0', '>= 3.0.0'
   s.add_development_dependency 'webmock', '~> 0'

data/lib/airborne/request_expectations.rb

@@ -1,5 +1,6 @@
 require 'rspec'
 require 'date'
+require 'rack/utils'
 
 module Airborne
   class ExpectationError < StandardError; end
@@ -32,7 +33,7 @@ module Airborne
     end
 
     def expect_status(code)
-      expect(response.code).to eq(code)
+      expect(response.code).to eq(resolve_status(code, response.code))
     end
 
     def expect_header(key, content)
@@ -224,5 +225,20 @@ module Airborne
       [String, Regexp, Float, Fixnum, Bignum, TrueClass, FalseClass, NilClass].include?(expectations.class)
     end
 
+    # Resolve a supplied status to the appropriate class for the returned
+    # status being tested. This helps reduce brittleness due to '200' != 200
+    # when for the purposes of testing a response it is the same thing.
+    #
+    # @param candidate
+    # @param authority
+    # @return [String]
+    def resolve_status(candidate, authority)
+      candidate = Rack::Utils::SYMBOL_TO_STATUS_CODE[candidate] if candidate.kind_of?(Symbol)
+      case authority
+      when String then candidate.to_s
+      when Fixnum then candidate.to_i
+      else candidate
+      end
+    end
   end
 end

data/spec/airborne/expectations/expect_status_spec.rb

@@ -12,4 +12,12 @@ describe 'expect_status' do
     get '/simple_get'
     expect{expect_status(123)}.to raise_error
   end
+
+  it 'should translate symbol codes to whatever is appropriate for the request' do
+    mock_get('simple_get')
+    get '/simple_get'
+    expect_status(:ok)
+    expect_status(200)
+    expect_status('200')
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: airborne
 version: !ruby/object:Gem::Version
-  version: 0.1.14
+  version: 0.1.15
 platform: ruby
 authors:
 - Alex Friedman
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-02 00:00:00.000000000 Z
+date: 2015-03-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec