airborne 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7a65123aada9fd5ec28e73e1dd39a55b85b4c120
-  data.tar.gz: df26ba37c5fa926a1c748c4c6e7b441946da49c8
+  metadata.gz: c6dbdb4e4fb42256d136b4fc15bc52604ec7ec55
+  data.tar.gz: 5babb01a3f583438d337cd63a678d6ddfb522cae
 SHA512:
-  metadata.gz: ac97899e3eb391a2df1f4590b7a8102f7eb40d97fbe4c363ae53ee36e75e5e48ea970780e68e008f8e2af2dde2fa64181c4592128fc49d9845dc30a73125b36b
-  data.tar.gz: 166a72d89beb9dfaa523c5ca402f4b0ca8235f696b523773bf43c381cff4b368fda5eedcb9c9b8ce7888fede5117d5e5674ead901508ce855c87d17ee0b3b249
+  metadata.gz: b531a941356a2861b90aa2abbcc04ce2aa68191dabe6d748275fe4ddb424b350b7ea56dd6cb625d0b3bbe93258f3fea1e20318c3e6ab2769120b0e6699f498ff
+  data.tar.gz: f702beedc737affede6c4b51531b2ed097b2415afba2c3cc555b4bad43cd11d348dacf71fb7c70247c5eb6fcd0c0a2367a075eaa22a133aa78d855f1c8ad3d13

data/airborne.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name        = 'airborne'
-  s.version     = '0.2.0'
+  s.version     = '0.2.1'
   s.date        = Date.today.to_s
   s.summary = 'RSpec driven API testing framework'
   s.authors     = ['Alex Friedman', 'Seth Pollack']

data/lib/airborne/request_expectations.rb

@@ -85,7 +85,7 @@ module Airborne
       keys = expected.keys & actual.keys if match_none?
 
       keys.flatten.uniq.each do |prop|
-        expected_value  = extract_expected(expected, prop)
+        expected_value  = extract_expected_value(expected, prop)
         actual_value    = extract_actual(actual, prop)
 
         next expect_json_impl(expected_value, actual_value) if hash?(expected_value)
@@ -113,7 +113,7 @@ module Airborne
       keys = expected.keys & actual.keys if match_none?
 
       keys.flatten.uniq.each do |prop|
-        type  = extract_expected(expected, prop)
+        type  = extract_expected_type(expected, prop)
         value = extract_actual(actual, prop)
         value = convert_to_date(value) if type == :date
 
@@ -140,7 +140,16 @@ module Airborne
       end
     end
 
-    def extract_expected(expected, prop)
+    def extract_expected_value(expected, prop)
+      begin
+        raise unless expected.keys.include?(prop)
+        expected[prop]
+      rescue
+        raise ExpectationError, "Expectation is expected to contain property: #{prop}"
+      end
+    end
+
+    def extract_expected_type(expected, prop)
       begin
         type = expected[prop]
         type.nil? ? raise : type

data/spec/airborne/expectations/expect_json_options_spec.rb

@@ -0,0 +1,59 @@
+require 'spec_helper'
+
+describe 'expect_json options' do
+  describe 'match_expected', match_expected: true, match_actual: false do
+    it 'should require all expected properties' do
+      mock_get 'simple_get'
+      get '/simple_get'
+      expect{ expect_json(name: 'Alex', other: 'other') }.to raise_error(ExpectationNotMetError)
+    end
+
+    it 'should not require the actual properties' do
+      mock_get 'simple_get'
+      get '/simple_get'
+      expect_json(name: 'Alex')
+    end
+  end
+
+  describe 'match_actual', match_expected: false, match_actual: true do
+    it 'should require all actual properties' do
+      mock_get 'simple_get'
+      get '/simple_get'
+      expect{ expect_json(name: 'Alex') }.to raise_error(ExpectationError)
+    end
+
+    it 'should not require the expected properties' do
+      mock_get 'simple_get'
+      get '/simple_get'
+      expect_json(name: 'Alex', age: 32, address: nil, other: 'other')
+    end
+  end
+
+  describe 'match_both', match_expected: true, match_actual: true do
+    it 'should require all actual properties' do
+      mock_get 'simple_get'
+      get '/simple_get'
+      expect{ expect_json(name: 'Alex') }.to raise_error(ExpectationError)
+    end
+
+    it 'should require all expected properties' do
+      mock_get 'simple_get'
+      get '/simple_get'
+      expect{ expect_json(name: 'Alex', other: 'other') }.to raise_error(ExpectationNotMetError)
+    end
+  end
+
+  describe 'match_none', match_expected: false, match_actual: false do
+    it 'should not require the actual properties' do
+      mock_get 'simple_get'
+      get '/simple_get'
+      expect_json(name: 'Alex')
+    end
+
+    it 'should not require the expected properties' do
+      mock_get 'simple_get'
+      get '/simple_get'
+      expect_json(name: 'Alex', age: 32, address: nil, other: 'other')
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: airborne
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Alex Friedman
@@ -129,6 +129,7 @@ files:
 - spec/airborne/expectations/expect_json_keys_path_spec.rb
 - spec/airborne/expectations/expect_json_keys_spec.rb
 - spec/airborne/expectations/expect_json_lambda_spec.rb
+- spec/airborne/expectations/expect_json_options_spec.rb
 - spec/airborne/expectations/expect_json_path_spec.rb
 - spec/airborne/expectations/expect_json_regex_spec.rb
 - spec/airborne/expectations/expect_json_sizes_spec.rb