rspec-json_expectations 2.1.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ad526ab43a8b702954d8248d6b1edeb62b10b559
-  data.tar.gz: 01aac3eeb128b3033ef51d03f7f1dde810f3824e
+  metadata.gz: 5d28854e379cee30a9d153b39e16f4d5e265699a
+  data.tar.gz: 6a27333ceba6c6662d71b9aebf8ab9e21254a8ca
 SHA512:
-  metadata.gz: 44aec293d47aa8e184a6ec335531c4bc92e3c31dfae6d404bd5b8e956032540f8ad2b3c8191e0eebad6eddd3576118f2f2b8700fcb535a8ce472f265b6b4ab65
-  data.tar.gz: 988b3ed14b8c35cc1fc9c58655ca3045765caac68a151bee15c73c0a85c3cf355252ef1f7ddf39a633de1fb5a581df5b26525bb324ae97d5ff5eea95b148c328
+  metadata.gz: cf7a7056e0adaebae13d1d8e6d1f958bafd0976294b3dbfed2c33c11d9f8fb4dd8b458d43d1170bcf2255c9a33b54a7792aa1579acc4aef48257692abb7a058a
+  data.tar.gz: 107150eb64c10d9313b2eacddf102fef5c0206b57eac067f64914da312977a10b9a0138eb3c8aa4261ef8449364b166fbea3ee8426ee3bfcdc09f3ea1545f119

data/.travis.yml

@@ -5,11 +5,12 @@ rvm:
   - 2.1
   - 2.2
   - 2.3
+  - 2.4
 
 gemfile:
   - gemfiles/rspec-3
 
 before_install:
-  - gem install bundler
+  - gem install bundler -v "~> 1.0"
 
 script: bundle exec cucumber

data/README.md

@@ -2,7 +2,7 @@
 
 [![Build Status](https://travis-ci.org/waterlink/rspec-json_expectations.svg?branch=master)](https://travis-ci.org/waterlink/rspec-json_expectations)
 
-Set of matchers and helpers to allow you test your APIs responses like a pro.
+Set of matchers and helpers for RSpec 3 to allow you test your JSON API responses like a pro.
 
 ## Installation
 
@@ -43,7 +43,7 @@ RSpec.describe "User API" do
       name: "John"
     )
   end
-  
+
   it "has some additional info about user" do
     expect(subject).to include_json(
       premium: "gold",
@@ -62,27 +62,27 @@ Failures:
 
   1) User API has basic info about user
      Failure/Error: expect(subject).to include_json(
-       
+
                  json atom at path "id" is not equal to expected value:
-       
+
                    expected: 25
                         got: 37
-                 
+
                  json atom at path "name" is not equal to expected value:
-       
+
                    expected: "John"
                         got: "Smith J."
-                 
+
      # ./spec/user_api_spec.rb:18:in `block (2 levels) in <top (required)>'
 
   2) User API has some additional info about user
      Failure/Error: expect(subject).to include_json(
-       
+
                  json atom at path "premium" is not equal to expected value:
-       
+
                    expected: "gold"
                         got: "silver"
-                 
+
      # ./spec/user_api_spec.rb:26:in `block (2 levels) in <top (required)>'
 
 Finished in 0.00102 seconds (files took 0.0853 seconds to load)

data/bin/build

@@ -1,3 +1,3 @@
 #!/bin/bash
 
-bin/with-rspec-2 install && bin/with-rspec-3 install && bin/with-rspec-2 exec cucumber && bin/with-rspec-3 exec cucumber && echo "SUCCESS" || echo "FAILED"
+bin/with-rspec-3 install && bin/with-rspec-3 exec cucumber && echo "SUCCESS" || echo "FAILED"

data/features/rspec/json_expectations/rspec_matchers_support.feature

@@ -44,7 +44,7 @@ Feature: RSpec matcher support for include_json matcher
           1 example, 0 failures
           """
 
-  Scenario: Expecting jsong string to include simple json using an rspec alias matcher
+  Scenario: Expecting json string to include simple json using an rspec alias matcher
     Given a file "spec/matcher_example_spec.rb" with:
            """ruby
            require "spec_helper"

data/lib/rspec/json_expectations.rb

@@ -1,4 +1,5 @@
 require "rspec/core"
+require "rspec/expectations"
 require "rspec/json_expectations/matcher_factory"
 require "rspec/json_expectations/version"
 require "rspec/json_expectations/json_traverser"

data/lib/rspec/json_expectations/matcher_factory.rb

@@ -9,39 +9,20 @@ module RSpec
         RSpec::Matchers.define(@matcher_name) do |expected|
           yield
 
-          # RSpec 2 vs 3
-          if respond_to?(:failure_message)
-            match do |actual|
-              traverse(expected, actual, false)
-            end
-
-            match_when_negated do |actual|
-              traverse(expected, actual, true)
-            end
-
-            failure_message do |actual|
-              RSpec::JsonExpectations::FailurePresenter.render(@include_json_errors)
-            end
-
-            failure_message_when_negated do |actual|
-              RSpec::JsonExpectations::FailurePresenter.render(@include_json_errors)
-            end
-          else
-            match_for_should do |actual|
-              traverse(expected, actual, false)
-            end
+          match do |actual|
+            traverse(expected, actual, false)
+          end
 
-            match_for_should_not do |actual|
-              traverse(expected, actual, true)
-            end
+          match_when_negated do |actual|
+            traverse(expected, actual, true)
+          end
 
-            failure_message_for_should do |actual|
-              RSpec::JsonExpectations::FailurePresenter.render(@include_json_errors)
-            end
+          failure_message do |actual|
+            RSpec::JsonExpectations::FailurePresenter.render(@include_json_errors)
+          end
 
-            failure_message_for_should_not do |actual|
-              RSpec::JsonExpectations::FailurePresenter.render(@include_json_errors)
-            end
+          failure_message_when_negated do |actual|
+            RSpec::JsonExpectations::FailurePresenter.render(@include_json_errors)
           end
         end
       end

data/lib/rspec/json_expectations/matchers.rb

@@ -1,3 +1,5 @@
+require "forwardable"
+
 RSpec::JsonExpectations::MatcherFactory.new(:include_json).define_matcher do
   def traverse(expected, actual, negate=false)
     unless expected.is_a?(Hash) ||

data/lib/rspec/json_expectations/version.rb

@@ -1,5 +1,5 @@
 module RSpec
   module JsonExpectations
-    VERSION = "2.1.0"
+    VERSION = "2.2.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rspec-json_expectations
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.0
 platform: ruby
 authors:
 - Oleksii Fedorov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-07 00:00:00.000000000 Z
+date: 2019-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -96,7 +96,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.6.10
 signing_key: 
 specification_version: 4
 summary: Set of matchers and helpers to allow you test your APIs responses like a