rspec-json_expectations 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3da6a45ac2d2224520ac476bc2129bd36f7c1e22
-  data.tar.gz: ac809ece983d1a0473d770bc7d9c7f5cf20d5275
+  metadata.gz: b7be8f6d84a11ad85c20dfdb8a792db48587ed6e
+  data.tar.gz: fce85bc76ad20f75eeb897eae740841e2ffd9fec
 SHA512:
-  metadata.gz: f57addf1c6dda782c53e361b480d4bec2bb93b56e92e385256c76d5c356f5ecfb0551639e197b72a34fb630fc5a4754efaf1defcd30421fbe76c03edd8115bb2
-  data.tar.gz: c2555e105a6e9c01d80b5acf776017a86e409b8d79e28ec925efdae20bf708735fb67b4055582d92ffaba10b34313d9547d532eb0ea5db93f313cc840459eed9
+  metadata.gz: e06b381b60dc36b9153f80bc8840c8d60d332cc4d03025155b2966408475719d9ebbdfea1b59207f662730a5bf36adb7df9f6a00ff82997df544900ad298cb42
+  data.tar.gz: 14f572322abeeb992f142360504a659984d351d1837f4e94b033546b2119a2a294e69976ad33952f38e196f6617f4769c8a5f7d02376dd4f041bbaa04e21b449

data/features/rspec/json_expectations/simple_hash_match.feature

@@ -8,6 +8,7 @@ Feature: include_json matcher with hash
           """ruby
           require "rspec/json_expectations"
           """
+
       And a local "SIMPLE_HASH" with:
           """ruby
           {
@@ -16,6 +17,7 @@ Feature: include_json matcher with hash
             name: "John"
           }
           """
+
       And a local "BIG_HASH" with:
           """ruby
           {
@@ -28,6 +30,16 @@ Feature: include_json matcher with hash
           }
           """
 
+      And a local "HASH_WITH_SIMPLE_TYPES" with:
+          """ruby
+          {
+            phone: nil,
+            name: "A guy without phone",
+            without_phone: true,
+            communicative: false
+          }
+          """
+
   Scenario: Expecting json string to include simple json
     Given a file "spec/simple_example_spec.rb" with:
           """ruby
@@ -112,4 +124,27 @@ Feature: include_json matcher with hash
           1 example, 0 failures
           """
 
+  Scenario: Expecting json response to contain null(s), booleans, etc
+    Given a file "spec/nil_values_spec.rb" with:
+          """ruby
+          require "spec_helper"
+
+          RSpec.describe "A json response" do
+            subject { %{HASH_WITH_SIMPLE_TYPES} }
+
+            it "has no phone" do
+              expect(subject).to include_json(
+                name: "A guy without phone",
+                phone: nil,
+                communicative: false,
+                without_phone: true
+              )
+            end
+          end
+          """
+     When I run "rspec spec/nil_values_spec.rb"
+     Then I see:
+          """
+          1 example, 0 failures
+          """
 

data/lib/rspec/json_expectations/json_traverser.rb

@@ -7,7 +7,8 @@ module RSpec
     # match. Errors are accumulated in errors hash for each
     # json atom paths.
     class JsonTraverser
-      SUPPORTED_VALUES = [Hash, String, Numeric, Regexp, Array]
+      HANDLED_BY_SIMPLE_VALUE_HANDLER = [String, Numeric, FalseClass, TrueClass, NilClass]
+      SUPPORTED_VALUES = [Hash, Regexp, Array] + HANDLED_BY_SIMPLE_VALUE_HANDLER
 
       class << self
         def traverse(errors, expected, actual, negate=false, prefix=[])
@@ -48,7 +49,7 @@ module RSpec
         end
 
         def handle_value(errors, expected, actual, negate=false, prefix=[])
-          return nil unless expected.is_a?(String) || expected.is_a?(Numeric)
+          return nil unless handled_by_simple_value?(expected)
 
           if conditionally_negate(actual == expected, negate)
             true
@@ -61,6 +62,10 @@ module RSpec
           end
         end
 
+        def handled_by_simple_value?(expected)
+          HANDLED_BY_SIMPLE_VALUE_HANDLER.any? { |type| type === expected }
+        end
+
         def handle_regex(errors, expected, actual, negate=false, prefix=[])
           return nil unless expected.is_a?(Regexp)
 

data/lib/rspec/json_expectations/version.rb

@@ -1,5 +1,5 @@
 module RSpec
   module JsonExpectations
-    VERSION = "1.1.0"
+    VERSION = "1.1.1"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rspec-json_expectations
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Alexey Fedorov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-13 00:00:00.000000000 Z
+date: 2015-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -107,4 +107,3 @@ test_files:
 - features/rspec/json_expectations/simple_hash_match.feature
 - features/step_definitions/steps.rb
 - features/support/env.rb
-has_rdoc: