rspec_jsonapi_serializer 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7ed8b7ea471eb94db672c660a12559e64b185bc7d9e47326f9623be38859d9b6
-  data.tar.gz: eacf5f0be70a08e50cb2b42f02788c14b089722cbee3d4d1e28a1efda1e8b7a2
+  metadata.gz: e24d0b3794bdc77750c98e578543eb472a655f79ea61190682623b2ce7f8e89f
+  data.tar.gz: 89cfb3714d48e15345fbad93540bdf58b02153f4001e88defc66fbc63758d672
 SHA512:
-  metadata.gz: '090a203b5643c3930787cf553d6ea1146fffc51964b4a2e94e01b318a31900b590ef3b61e50ec63cb9d1b4d6cc66c7040ca74e60719e3e37470bd7e525940936'
-  data.tar.gz: e7dc94dce570f0a299389743e42183dfe119c723f76573687577f10b5de2175d655ebdbeb2dbb5cc5583027dae58580e07590fe7940eca09035a1270ad924fc4
+  metadata.gz: 2693f3a69e99f02b54d6a283b377bc41f02ef74f82455d78d7c4b98965645f972939e2df2aeaea107f2546f9e0a69f2cc51e803cdaf3e6090f8b09491929ce09
+  data.tar.gz: 2f5f2c1c81eb3a56e974d807c6136f2908540bb4afc07e25a179c03af36e5b0b9f0e583b8a707804b7e1d1cf032b84161ff8ea6221c21bf989e1c088c8675797

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/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 main_failure_message
@@ -31,8 +38,12 @@ module RSpecJSONAPISerializer
         "expected #{serializer_name} to #{association_message} #{expected}"
       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
@@ -40,11 +51,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 main_failure_message
+          [expected_message, 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
+
+        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 main_failure_message
         association_matcher.main_failure_message
       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 main_failure_message
         association_matcher.main_failure_message
       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 main_failure_message
         association_matcher.main_failure_message
       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.0"
+  VERSION = "1.1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rspec_jsonapi_serializer
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Mateus Cruz
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-04-10 00:00:00.000000000 Z
+date: 2021-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jsonapi-serializer
@@ -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: