rspec_jsonapi_serializer 1.3.0 → 1.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a01005a800b62bc1790bef3c0b41d7f39528016cbc3f44255100d60c06f6e3f7
-  data.tar.gz: 6870f0d87b139a4e50bedabc2af25faae9a9aa10918ee20cf7a31947b57ecb3e
+  metadata.gz: 7bef199f60191871be0b7528072eded0d5ecd55e2fb49a2a83680fc4d2a98f2a
+  data.tar.gz: 00a01603973af7929de6623549c79971dc16f333f3e10e96ffcc5e6e8f406caf
 SHA512:
-  metadata.gz: b3de4e1e8b9253c30fd625113d0633e70a175546c071c413164af646fceb3785bcd1bb0c310e47f0b91162f48d0a7c989807cc32e13754b4376d89ecdebb195d
-  data.tar.gz: b65538587e22e77df17ef8acaca5694ca9212b7827e9e8ec35dcf4583b860f6ca287396b92bdb01a88aa623f7fabe520c76ff95036c8efb22351f8453e74c771
+  metadata.gz: 57a10c5dfa8ca0bb4b572fc72c7a6a38bb652d7c8fd05375544571b304b067a6c46a51f5fdafd449385c2b089fcab4e338982e4b79db19b055f69182a248b084
+  data.tar.gz: 77ef7f71d310619a54e1bbcc8714af9cdb9c4d9e3a2599f5624b283a5d78d708c943e3392333b32cb7fcd1792bcf8578ef1bfb9b703a0c07b29419c01c4f0460

data/lib/rspec_jsonapi_serializer/matchers/association_matcher.rb

@@ -40,28 +40,51 @@ module RSpecJSONAPISerializer
         self
       end
 
-      def main_failure_message
-        [expected_message, actual_message].compact.join(", ")
+      def description
+        description = "#{association_message} #{expected}"
+
+        [description, submatchers.map(&:description)].flatten.join(' ')
+      end
+
+      def failure_message
+        "Expected #{expectation}"
+      end
+
+      def failure_message_when_negated
+        "Did not expect #{expectation}"
       end
 
       private
 
       attr_reader :relationship_matcher, :relationship_type
 
-      def expected_message
-        "expected #{serializer_name} to #{association_message} #{expected}"
+      def expectation
+        expectation = "#{serializer_name} to #{association_message} #{expected}"
+
+        submatchers_expectations = failing_submatchers.map do |submatcher|
+          "(#{submatcher.expectation})"
+        end.compact.join(", ")
+
+        [expectation, submatchers_expectations].reject(&:nil?).reject(&:empty?).join(" ")
       end
 
       def relationship_matches?
-        actual.present? && actual.relationship_type == relationship_type
+        actual.present? && actual_relationship_type == relationship_type &&
+        actual_rendered?
       end
 
-      def actual_message
-        actual ? "got :#{actual.relationship_type} instead" : nil
+      def association_message
+        relationship_matcher.to_s.split("_").join(" ")
       end
 
-      def association_message
-        relationship_matcher.to_s.split('_')
+      def actual_rendered?
+        relationships = serializable_hash.dig(:data, :relationships)
+
+        relationships.key?(expected) || relationships.key?(expected.to_s)
+      end
+
+      def actual_relationship_type
+        actual.relationship_type
       end
 
       def actual

data/lib/rspec_jsonapi_serializer/matchers/association_matchers/id_method_name_matcher.rb

@@ -9,7 +9,7 @@ module RSpecJSONAPISerializer
         def initialize(value, relationship_target)
           super(value)
 
-          @relationship_target  = relationship_target
+          @relationship_target = relationship_target
         end
 
         def matches?(serializer_instance)
@@ -18,18 +18,18 @@ module RSpecJSONAPISerializer
           actual == expected
         end
 
-        def main_failure_message
-          [expected_message, actual_message].compact.join(", ")
+        def description
+          "with id method name #{expected}"
+        end
+
+        def expectation
+          [ "with id method name #{expected}", actual_message ].compact.join(", ")
         end
 
         private
 
         attr_reader :relationship_target
 
-        def expected_message
-          "expected #{serializer_name} to use #{expected} as id_method_name for #{relationship_target}"
-        end
-
         def actual_message
           actual ? "got #{actual} instead" : nil
         end

data/lib/rspec_jsonapi_serializer/matchers/association_matchers/object_method_name_matcher.rb

@@ -18,18 +18,18 @@ module RSpecJSONAPISerializer
           actual == expected
         end
 
-        def main_failure_message
-          [expected_message, actual_message].compact.join(", ")
+        def description
+          "with object method name #{expected}"
+        end
+
+        def expectation
+          [ "with object method name #{expected}", actual_message ].compact.join(", ")
         end
 
         private
 
         attr_reader :relationship_target
 
-        def expected_message
-          "expected #{serializer_name} to use #{expected} as object_method_name for #{relationship_target}"
-        end
-
         def actual_message
           actual ? "got #{actual} instead" : nil
         end

data/lib/rspec_jsonapi_serializer/matchers/association_matchers/serializer_matcher.rb

@@ -18,18 +18,18 @@ module RSpecJSONAPISerializer
           actual == expected
         end
 
-        def main_failure_message
-          [expected_message, actual_message].compact.join(", ")
+        def description
+          "with serializer #{expected}"
+        end
+
+        def expectation
+          [ "with serializer #{expected}", actual_message ].compact.join(", ")
         end
 
         private
 
         attr_reader :relationship_target
 
-        def expected_message
-          "expected #{serializer_name} to use #{expected} as serializer for #{relationship_target}"
-        end
-
         def actual_message
           actual ? "got #{actual} instead" : nil
         end

data/lib/rspec_jsonapi_serializer/matchers/base.rb

@@ -13,27 +13,17 @@ module RSpecJSONAPISerializer
       end
 
       def failure_message
-        ([main_failure_message] + submatcher_failure_messages).compact.join("\n")
+        raise NotImplementedError
       end
 
       def failure_message_when_negated
-        ([main_failure_message_when_negated] + submatcher_failure_messages_when_negated)
-          .compact
-          .join("\n")
+        raise NotImplementedError
       end
 
       protected
 
       attr_reader :expected, :serializer_instance, :submatchers
 
-      def main_failure_message
-        raise NotImplementedError
-      end
-
-      def main_failure_message_when_negated
-        raise NotImplementedError
-      end
-
       def add_submatcher(submatcher)
         submatchers << submatcher
       end
@@ -50,16 +40,6 @@ module RSpecJSONAPISerializer
         serializer_instance.class.name
       end
 
-      private
-
-      def submatcher_failure_messages
-        failing_submatchers.map(&:failure_message)
-      end
-
-      def submatcher_failure_messages_when_negated
-        failing_submatchers.map(&:failure_message_when_negated)
-      end
-
       def failing_submatchers
         @failing_submatchers ||= submatchers.select do |submatcher|
           !submatcher.matches?(serializer_instance)

data/lib/rspec_jsonapi_serializer/matchers/belong_to_matcher.rb

@@ -25,8 +25,16 @@ module RSpecJSONAPISerializer
         association_matcher.serializer(value)
       end
 
-      def main_failure_message
-        association_matcher.main_failure_message
+      def description
+        association_matcher.description
+      end
+
+      def failure_message
+        association_matcher.failure_message
+      end
+
+      def failure_message_when_negated
+        association_matcher.failure_message_when_negated
       end
 
       private

data/lib/rspec_jsonapi_serializer/matchers/have_attribute_matcher.rb

@@ -19,17 +19,35 @@ module RSpecJSONAPISerializer
       end
 
       def as_nil
-        add_submatcher HaveAttributeMatchers::AsMatcher.new(expected, nil)
+        as(nil)
+      end
 
-        self
+      def description
+        description = "have attribute #{expected}"
+
+        [description, submatchers.map(&:description)].flatten.join(' ')
+      end
+
+      def failure_message
+        "Expected #{expectation}."
       end
 
-      def main_failure_message
-        "expected #{serializer_name} to have attribute #{expected}." unless has_attribute?
+      def failure_message_when_negated
+        "Did not expect #{expectation}."
       end
 
       private
 
+      def expectation
+        expectation = "#{serializer_name} to have attribute #{expected}"
+
+        submatchers_expectations = failing_submatchers.map do |submatcher|
+          "(#{submatcher.expectation})"
+        end.compact.join(", ")
+
+        [expectation, submatchers_expectations].reject(&:nil?).reject(&:empty?).join(" ")
+      end
+
       def attributes
         @attributes ||= serializer_instance.class.try(:attributes_to_serialize) || {}
       end

data/lib/rspec_jsonapi_serializer/matchers/have_attribute_matchers/as_matcher.rb

@@ -18,20 +18,30 @@ module RSpecJSONAPISerializer
           actual == expected
         end
 
-        def failure_message
-          [expected_message, actual_message].compact.join(", ")
+        def description
+          "as #{expected_to_string}"
+        end
+
+        def expectation
+          [ "as #{expected_to_string}", actual_message ].compact.join(", ")
         end
 
         private
 
         attr_reader :attribute
 
-        def expected_message
-          "expected #{serializer_instance.class.name} to serialize #{attribute} as #{expected}"
+        def expected_to_string
+          value_to_string(expected)
         end
 
         def actual_message
-          "got #{actual.nil? ? 'nil' : actual} instead" if attributes.has_key?(attribute)
+          "got #{value_to_string(actual)} instead" if attributes.has_key?(attribute)
+        end
+
+        def value_to_string(value)
+          return 'nil' if value.nil?
+
+          value.to_s
         end
 
         def actual

data/lib/rspec_jsonapi_serializer/matchers/have_id_matcher.rb

@@ -11,7 +11,7 @@ module RSpecJSONAPISerializer
         actual == expected
       end
 
-      def main_failure_message
+      def failure_message
         "expected that #{serializer_name} to have id :#{expected}, got :#{actual} instead"
       end
 

data/lib/rspec_jsonapi_serializer/matchers/have_link_matcher.rb

@@ -19,17 +19,35 @@ module RSpecJSONAPISerializer
       end
 
       def as_nil
-        add_submatcher HaveLinkMatchers::AsMatcher.new(expected, nil)
+        as(nil)
+      end
 
-        self
+      def description
+        description = "have link #{expected}"
+
+        [description, submatchers.map(&:description)].flatten.join(' ')
+      end
+
+      def failure_message
+        "Expected #{expectation}."
       end
 
-      def main_failure_message
-        "expected #{serializer_name} to have link #{expected}." unless has_link?
+      def failure_message_when_negated
+        "Did not expect #{expectation}."
       end
 
       private
 
+      def expectation
+        expectation = "#{serializer_name} to have link #{expected}"
+
+        submatchers_expectations = failing_submatchers.map do |submatcher|
+          "(#{submatcher.expectation})"
+        end.compact.join(", ")
+
+        [expectation, submatchers_expectations].reject(&:nil?).reject(&:empty?).join(" ")
+      end
+
       def has_link?
         links.has_key?(expected)
       end

data/lib/rspec_jsonapi_serializer/matchers/have_link_matchers/as_matcher.rb

@@ -18,20 +18,30 @@ module RSpecJSONAPISerializer
           actual == expected
         end
 
-        def failure_message
-          [expected_message, actual_message].compact.join(", ")
+        def description
+          "as #{expected_to_string}"
+        end
+
+        def expectation
+          [ "as #{expected_to_string}", actual_message ].compact.join(", ")
         end
 
         private
 
         attr_reader :link
 
-        def expected_message
-          "expected #{serializer_instance.class.name} to serialize link #{link} as #{expected}"
+        def expected_to_string
+          value_to_string(expected)
         end
 
         def actual_message
-          "got #{actual.nil? ? 'nil' : actual} instead" if links.has_key?(link)
+          "got #{value_to_string(actual)} instead" if links.has_key?(link)
+        end
+
+        def value_to_string(value)
+          return 'nil' if value.nil?
+
+          value.to_s
         end
 
         def actual

data/lib/rspec_jsonapi_serializer/matchers/have_many_matcher.rb

@@ -25,8 +25,16 @@ module RSpecJSONAPISerializer
         association_matcher.serializer(value)
       end
 
-      def main_failure_message
-        association_matcher.main_failure_message
+      def description
+        association_matcher.description
+      end
+
+      def failure_message
+        association_matcher.failure_message
+      end
+
+      def failure_message_when_negated
+        association_matcher.failure_message_when_negated
       end
 
       private

data/lib/rspec_jsonapi_serializer/matchers/have_meta_matcher.rb

@@ -19,17 +19,35 @@ module RSpecJSONAPISerializer
       end
 
       def as_nil
-        add_submatcher HaveMetaMatchers::AsMatcher.new(expected, nil)
+        as(nil)
+      end
 
-        self
+      def description
+        description = "serialize meta #{expected}"
+
+        [description, submatchers.map(&:description)].flatten.join(' ')
+      end
+
+      def failure_message
+        "Expected #{expectation}."
       end
 
-      def main_failure_message
-        "expected #{serializer_name} to serialize meta #{expected}." unless has_meta?
+      def failure_message_when_negated
+        "Did not expect #{expectation}."
       end
 
       private
 
+      def expectation
+        expectation = "#{serializer_name} to serialize meta #{expected}"
+
+        submatchers_expectations = failing_submatchers.map do |submatcher|
+          "(#{submatcher.expectation})"
+        end.compact.join(", ")
+
+        [expectation, submatchers_expectations].reject(&:nil?).reject(&:empty?).join(" ")
+      end
+
       def metas
         @metas ||= serializable_hash.dig(:data, :meta) || {}
       end

data/lib/rspec_jsonapi_serializer/matchers/have_meta_matchers/as_matcher.rb

@@ -18,22 +18,33 @@ module RSpecJSONAPISerializer
           actual == expected
         end
 
-        def failure_message
-          [expected_message, actual_message].compact.join(", ")
+        def description
+          "as #{expected_to_string}"
+        end
+
+        def expectation
+          [ "as #{expected_to_string}", actual_message ].compact.join(", ")
         end
 
         private
 
         attr_reader :meta
 
-        def expected_message
-          "expected #{serializer_instance.class.name} to serialize meta #{meta} as #{expected}"
+        def expected_to_string
+          value_to_string(expected)
         end
 
         def actual_message
           "got #{actual.nil? ? 'nil' : actual} instead" if metas.has_key?(meta)
         end
 
+        def value_to_string(value)
+          return 'nil' if value.nil?
+
+          value.to_s
+        end
+
+
         def actual
           metas[meta]
         end

data/lib/rspec_jsonapi_serializer/matchers/have_one_matcher.rb

@@ -25,8 +25,16 @@ module RSpecJSONAPISerializer
         association_matcher.serializer(value)
       end
 
-      def main_failure_message
-        association_matcher.main_failure_message
+      def description
+        association_matcher.description
+      end
+
+      def failure_message
+        association_matcher.failure_message
+      end
+
+      def failure_message_when_negated
+        association_matcher.failure_message_when_negated
       end
 
       private

data/lib/rspec_jsonapi_serializer/matchers/have_type_matcher.rb

@@ -11,7 +11,7 @@ module RSpecJSONAPISerializer
         actual == expected
       end
 
-      def main_failure_message
+      def failure_message
         "expected that #{serializer_name} to have type :#{expected}, got :#{actual} instead"
       end
 

data/lib/rspec_jsonapi_serializer/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RSpecJSONAPISerializer
-  VERSION = "1.3.0"
+  VERSION = "1.3.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rspec_jsonapi_serializer
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.2
 platform: ruby
 authors:
 - Mateus Cruz
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-05-20 00:00:00.000000000 Z
+date: 2023-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jsonapi-serializer