rspec-json_expectations 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8d3da7374ac61ca45bda7f28a31cd3343e11576e
-  data.tar.gz: 0ff730addd56dc7fc87021b5c358c8b399645c8b
+  metadata.gz: 3da6a45ac2d2224520ac476bc2129bd36f7c1e22
+  data.tar.gz: ac809ece983d1a0473d770bc7d9c7f5cf20d5275
 SHA512:
-  metadata.gz: 9a7aad7424c140606260fbc15bb5e67e61e99e724c2cc0eeb87b8fe6d9f52abf332b4b3ffd7f6d17862d92fd059ed2406583b2e7ab7e9b6faa79aeb002f4c7c7
-  data.tar.gz: 22c5a1adf525eec9cf4d6e77aeaede263a34db007b47d4212cabb9607e8f06a56caf723cd7631659b88d1dce2a16a1297918702aaa26b72c4468efa91f6d9dea
+  metadata.gz: f57addf1c6dda782c53e361b480d4bec2bb93b56e92e385256c76d5c356f5ecfb0551639e197b72a34fb630fc5a4754efaf1defcd30421fbe76c03edd8115bb2
+  data.tar.gz: c2555e105a6e9c01d80b5acf776017a86e409b8d79e28ec925efdae20bf708735fb67b4055582d92ffaba10b34313d9547d532eb0ea5db93f313cc840459eed9

data/README.md

@@ -94,6 +94,8 @@ rspec ./spec/user_api_spec.rb:17 # User API has basic info about user
 rspec ./spec/user_api_spec.rb:25 # User API has some additional info about user
 ```
 
+For other features look into documentation: https://www.relishapp.com/waterlink/rspec-json-expectations/docs/json-expectations
+
 ## Contributing
 
 1. Fork it ( https://github.com/waterlink/rspec-json_expectations/fork )

data/features/rspec/json_expectations/simple_hash_match.feature

@@ -0,0 +1,115 @@
+Feature: include_json matcher with hash
+
+  As a developer I want to be able to test not only JSON responses
+  But I want to test my hashes to be correct and see nice error output on failures
+
+  Background:
+    Given a file "spec/spec_helper.rb" with:
+          """ruby
+          require "rspec/json_expectations"
+          """
+      And a local "SIMPLE_HASH" with:
+          """ruby
+          {
+            id: 25,
+            email: "john.smith@example.com",
+            name: "John"
+          }
+          """
+      And a local "BIG_HASH" with:
+          """ruby
+          {
+            id: 25,
+            email: "john.smith@example.com",
+            password_hash: "super_md5_hash_that_is_unbreakable",
+            name: "John",
+            profile_id: 39,
+            role: "admin"
+          }
+          """
+
+  Scenario: Expecting json string to include simple json
+    Given a file "spec/simple_example_spec.rb" with:
+          """ruby
+          require "spec_helper"
+
+          RSpec.describe "A json response" do
+            subject { %{SIMPLE_HASH} }
+
+            it "has basic info about user" do
+              expect(subject).to include_json(
+                id: 25,
+                email: "john.smith@example.com",
+                name: "John"
+              )
+            end
+          end
+          """
+     When I run "rspec spec/simple_example_spec.rb"
+     Then I see:
+          """
+          1 example, 0 failures
+          """
+
+  Scenario: Expecting wrong json string to include simple json
+    Given a file "spec/simple_with_fail_spec.rb" with:
+          """ruby
+          require "spec_helper"
+
+          RSpec.describe "A json response" do
+            subject { %{SIMPLE_HASH} }
+
+            it "has basic info about user" do
+              expect(subject).to include_json(
+                id: 37,
+                email: "john.smith@example.com",
+                name: "Smith"
+              )
+            end
+          end
+          """
+     When I run "rspec spec/simple_with_fail_spec.rb"
+     Then I see:
+          """
+          1 example, 1 failure
+          """
+      And I see:
+          """
+                             expected: 37
+                                  got: 25
+          """
+      And I see:
+          """
+                             expected: "Smith"
+                                  got: "John"
+          """
+      And I see:
+          """ruby
+          # ./spec/simple_with_fail_spec.rb
+          """
+
+  Scenario: Expecting json response with excessive fields to include 'smaller' json
+    Given a file "spec/excessive_fields_spec.rb" with:
+          """ruby
+          require "spec_helper"
+
+          RSpec.describe "A json response" do
+            subject { %{BIG_HASH} }
+
+            it "has basic info about user" do
+              expect(subject).to include_json(
+                id: 25,
+                name: "John",
+                profile_id: 39,
+                role: "admin"
+              )
+            end
+          end
+          """
+     When I run "rspec spec/excessive_fields_spec.rb"
+     Then I see:
+          """
+          1 example, 0 failures
+          """
+
+

data/lib/rspec/json_expectations/json_traverser.rb

@@ -84,7 +84,7 @@ module RSpec
 
         def has_key?(actual, key)
           if actual.is_a?(Hash)
-            actual.has_key?(key.to_s)
+            actual.has_key?(key) || actual.has_key?(key.to_s)
           elsif actual.is_a?(Array)
             actual.count > key
           else
@@ -94,7 +94,7 @@ module RSpec
 
         def fetch(actual, key, default=nil)
           if actual.is_a?(Hash)
-            actual[key.to_s]
+            actual.has_key?(key) ? actual[key] : actual[key.to_s]
           elsif actual.is_a?(Array)
             actual[key]
           else

data/lib/rspec/json_expectations/matchers.rb

@@ -41,10 +41,13 @@ RSpec::Matchers.define :include_json do |expected|
         "Expected value must be a json for include_json matcher"
     end
 
+    representation = actual
+    representation = JSON.parse(actual) if String === actual
+
     RSpec::JsonExpectations::JsonTraverser.traverse(
       @include_json_errors = { _negate: negate },
       expected,
-      JSON.parse(actual),
+      representation,
       negate
     )
   end

data/lib/rspec/json_expectations/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rspec-json_expectations
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Alexey Fedorov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-05 00:00:00.000000000 Z
+date: 2014-10-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -61,6 +61,7 @@ files:
 - features/rspec/json_expectations/negation_matching.feature
 - features/rspec/json_expectations/nested_json_support.feature
 - features/rspec/json_expectations/regular_expressions_support.feature
+- features/rspec/json_expectations/simple_hash_match.feature
 - features/step_definitions/steps.rb
 - features/support/env.rb
 - gemfiles/rspec-2
@@ -103,6 +104,7 @@ test_files:
 - features/rspec/json_expectations/negation_matching.feature
 - features/rspec/json_expectations/nested_json_support.feature
 - features/rspec/json_expectations/regular_expressions_support.feature
+- features/rspec/json_expectations/simple_hash_match.feature
 - features/step_definitions/steps.rb
 - features/support/env.rb
 has_rdoc: