rspec_jsonapi_serializer 1.0.1 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c575d046628ade51e83238d8bc7179eea00ee9bc1cedde252fda0c8b98fa2269
-  data.tar.gz: 30d857690790f7cc807ac6e432e1103ef646e140f085a7c5c09c8b6d3b75b1c6
+  metadata.gz: 3efc377379395cabd985abbac53a9fc4b69cf1a0b26204f7a19bd22a18576ed3
+  data.tar.gz: 14556e3d0b0952b9e27d0ebad8e78ab70814a4a7e4d7d52e8b837a8d9b3af92b
 SHA512:
-  metadata.gz: f1303aa1426102b7f26ebc5d4abc0fbfb0a9f712e9b231e05e5a43e6e70900d3f8a1e22731db6d00f701bcbf7c024117a7c2f22fed4530403e069682f2826556
-  data.tar.gz: 52b6d4c3dd1e2214e4275105195c028b35dfbb4b599754c23b6d65fe9c6b6cfb86e6ecc2a2bca35b5319d4b507b1c909171513dd0e5c427ea100cfb27429d261
+  metadata.gz: 9971fa215577e3fa032e97ebbcaaec958aad471d110d342b3e903bdaf93bad22038f3248fece252a2626b46e44e201d3398b107f69a52114055291eb166fd14c
+  data.tar.gz: af72fbe0cdd36375b492c1c03d84eee3a83d513e448680f06bc63c0ead0a51c6270ff6c63e17912144f4f0519b207a646bdd681210f20608975510e8aae159d1

data/lib/rspec_jsonapi_serializer/matchers/association_matcher.rb

@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
 require "rspec_jsonapi_serializer/matchers/base"
+require "rspec_jsonapi_serializer/matchers/association_matchers/serializer_matcher"
+require "rspec_jsonapi_serializer/metadata/relationships"
 
 module RSpecJSONAPISerializer
   module Matchers
@@ -15,8 +17,13 @@ module RSpecJSONAPISerializer
       def matches?(serializer_instance)
         @serializer_instance = serializer_instance
 
-        relationships.select { |_, r| r.relationship_type == relationship_type }
-                     .has_key?(expected)
+        relationship_matches? && submatchers_match?
+      end
+
+      def serializer(value)
+        add_submatcher AssociationMatchers::SerializerMatcher.new(value, expected)
+
+        self
       end
 
       def description
@@ -26,19 +33,33 @@ module RSpecJSONAPISerializer
       end
 
       def failure_message
-        [expected_message, actual_message].compact.join(", ")
+        "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
       end
 
       def actual_message
-        actual ? "got :#{actual} instead" : nil
+        actual ? "got :#{actual.relationship_type} instead" : nil
       end
 
       def association_message
@@ -46,11 +67,15 @@ module RSpecJSONAPISerializer
       end
 
       def actual
-        relationships.key(expected) || relationship.key(expected.to_s)
+        metadata.relationship(expected)
       end
 
       def relationships
-        @relationships ||= serializer_instance.class&.relationships_to_serialize || {}
+        metadata.relationships
+      end
+
+      def metadata
+        Metadata::Relationships.new(serializer_instance)
       end
     end
   end

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

@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+
+require "rspec_jsonapi_serializer/metadata/relationships"
+
+module RSpecJSONAPISerializer
+  module Matchers
+    module AssociationMatchers
+      class SerializerMatcher < Base
+        def initialize(value, relationship_target)
+          super(value)
+
+          @relationship_target  = relationship_target
+        end
+
+        def matches?(serializer_instance)
+          @serializer_instance = serializer_instance
+
+          actual == expected
+        end
+
+        def description
+          "with serializer #{expected}"
+        end
+
+        def expectation
+          [ "with serializer #{expected}", actual_message ].compact.join(", ")
+        end
+
+        private
+
+        attr_reader :relationship_target
+
+        def actual_message
+          actual ? "got #{actual} instead" : nil
+        end
+
+        def actual
+          metadata.relationship(relationship_target).serializer
+        end
+
+        def metadata
+          Metadata::Relationships.new(serializer_instance)
+        end
+      end
+    end
+  end
+end

data/lib/rspec_jsonapi_serializer/matchers/belong_to_matcher.rb

@@ -13,6 +13,10 @@ module RSpecJSONAPISerializer
         association_matcher.matches?(serializer_instance)
       end
 
+      def serializer(value)
+        association_matcher.serializer(value)
+      end
+
       def description
         association_matcher.description
       end

data/lib/rspec_jsonapi_serializer/matchers/have_many_matcher.rb

@@ -13,6 +13,10 @@ module RSpecJSONAPISerializer
         association_matcher.matches?(serializer_instance)
       end
 
+      def serializer(value)
+        association_matcher.serializer(value)
+      end
+
       def description
         association_matcher.description
       end

data/lib/rspec_jsonapi_serializer/matchers/have_one_matcher.rb

@@ -13,6 +13,10 @@ module RSpecJSONAPISerializer
         association_matcher.matches?(serializer_instance)
       end
 
+      def serializer(value)
+        association_matcher.serializer(value)
+      end
+
       def description
         association_matcher.description
       end

data/lib/rspec_jsonapi_serializer/matchers.rb

@@ -13,6 +13,8 @@ module RSpecJSONAPISerializer
   module Matchers
     # This allows us to assert attributes on a serializer, e.g.:
     # expect(serializer).to belong_to(:team)
+    # If you have a custom serializer, you can assert its value with the `serializer` submatcher
+    # expect(serializer).to belong_to(:team).serializer(TeamSerializer)
     def belong_to(expected)
       BelongToMatcher.new(expected)
     end
@@ -45,6 +47,8 @@ module RSpecJSONAPISerializer
 
     # This allows us to assert attributes on a serializer, e.g.:
     # expect(serializer).to have_many(:teams)
+    # If you have a custom serializer, you can assert its value with the `serializer` submatcher
+    # expect(serializer).to have_many(:teams).serializer(TeamSerializer)
     def have_many(expected)
       HaveManyMatcher.new(expected)
     end
@@ -61,6 +65,8 @@ module RSpecJSONAPISerializer
 
     # This allows us to assert attributes on a serializer, e.g.:
     # expect(serializer).to have_one(:team)
+    # If you have a custom serializer, you can assert its value with the `serializer` submatcher
+    # expect(serializer).to have_one(:team).serializer(TeamSerializer)
     def have_one(expected)
       HaveOneMatcher.new(expected)
     end

data/lib/rspec_jsonapi_serializer/metadata/relationships.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+
+require "rspec_jsonapi_serializer/metadata/relationships"
+
+module RSpecJSONAPISerializer
+  module Metadata
+    class Relationships
+      def initialize(serializer)
+        @serializer = serializer
+      end
+
+      def relationship(key)
+        relationships.values.find { |relationship| relationship.key.to_s == key.to_s }
+      end
+
+      def relationships
+        serializer.class&.relationships_to_serialize || {}
+      end
+
+      private
+
+      attr_reader :serializer
+    end
+  end
+end

data/lib/rspec_jsonapi_serializer/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rspec_jsonapi_serializer
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.1
 platform: ruby
 authors:
 - Mateus Cruz
@@ -34,6 +34,7 @@ files:
 - lib/rspec_jsonapi_serializer.rb
 - lib/rspec_jsonapi_serializer/matchers.rb
 - lib/rspec_jsonapi_serializer/matchers/association_matcher.rb
+- lib/rspec_jsonapi_serializer/matchers/association_matchers/serializer_matcher.rb
 - lib/rspec_jsonapi_serializer/matchers/base.rb
 - lib/rspec_jsonapi_serializer/matchers/belong_to_matcher.rb
 - lib/rspec_jsonapi_serializer/matchers/have_attribute_matcher.rb
@@ -46,6 +47,7 @@ files:
 - lib/rspec_jsonapi_serializer/matchers/have_meta_matchers/as_matcher.rb
 - lib/rspec_jsonapi_serializer/matchers/have_one_matcher.rb
 - lib/rspec_jsonapi_serializer/matchers/have_type_matcher.rb
+- lib/rspec_jsonapi_serializer/metadata/relationships.rb
 - lib/rspec_jsonapi_serializer/version.rb
 homepage: https://github.com/teamintricately/rspec_jsonapi_serializer
 licenses: