media_types 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dfc032dcb8a8e98536dac1ca449bd8138c3594c2
-  data.tar.gz: 489d7e95f4819ac96379221d30b5202fbdacaa37
+  metadata.gz: 289075ecf2d6af18c0c90f5e16a1dbd99e2192aa
+  data.tar.gz: c3834ae46284989bbdd47c007af6e6ad4d59fc3f
 SHA512:
-  metadata.gz: 24c6f02bdb57bfd3e86a434b13ad6d42f3701bb496234a2c411a23cc503a124a34adaca30ee2e01420b9e8078e3a63ab1b3a0db482998d5230079d0c971ae559
-  data.tar.gz: 694cdc7622903947e80acc5056ce31d187b76e11566be259d1f3e515dcbb5309d305ecc77c25dc56dd548585e1c86dffd5d2fe8be52c26834acc5346ea1b5855
+  metadata.gz: ea836cc120dfd87c39d96f59119fe27fe1b101a24b331edd919d4662d717b621ce94fa77c7aaec7a8b4b2f8a415f6e46bf3febea232eee1a11eb6f4d06b757be
+  data.tar.gz: adb3dafa03155c97f88391d68c28d583b121696ba6730a16b8f08d6744b893686d91263c3079349a715f0a92e9213f1fe7e0f44105a3bc326bb8f7b39be932eb

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 0.2.4
+
+- Change messages for `assert_media_types_registered` to be more informative and consistent.
+
 # 0.2.3
 
 - Fix an issue with `Hash#compact` which was introduce in 2.4+. Now works with Ruby 2.3.

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    media_types (0.2.3)
+    media_types (0.2.4)
 
 GEM
   remote: https://rubygems.org/

data/lib/media_types/minitest/assert_media_types_registered.rb

@@ -105,6 +105,8 @@ module MediaTypes
       mock = Minitest::Mock.new
       uncalled = expected_types_hash.dup
 
+      failed = []
+
       uncalled.length.times do
         mock.expect(:call, nil) do |registerable|
           type = registerable.to_s
@@ -112,20 +114,24 @@ module MediaTypes
           synonyms = registerable.synonyms
 
           options = uncalled.delete(type)
-          options && options == [symbol, synonyms] || raise(
-            MockExpectationError,
-            format(
-              'Called with [type: %<type>s, symbol: %<symbol>s, synonyms: %<synonyms>s]' + "\n"\
-              'Resolved options: [%<resolved>s]' + "\n"\
-              'Uncalled options: [%<uncalled>s]',
-              type: type,
-              symbol: symbol,
-              synonyms: synonyms,
-              resolved: options,
-              uncalled: uncalled
+          return true if options && options == [symbol, synonyms] && pass
+
+          failed <<
+            MockExpectationError.new(
+              format(
+                'Call failed to match expectations:' + "\n"\
+                '+++ actual [type: %<type>s, symbol: %<symbol>s, synonyms: %<synonyms>s]' + "\n"\
+                '--- expected [type: %<type>s, symbol: %<resolved_symbol>s, synonyms: %<resolved_synonyms>s]',
+                type: type,
+                symbol: symbol,
+                synonyms: synonyms,
+                resolved_symbol: options&.first,
+                resolved_synonyms: options&.last
+              )
             )
-          )
         end
+
+        false
       end
 
       MediaTypes.stub(:register, mock) do
@@ -136,7 +142,24 @@ module MediaTypes
         end
       end
 
-      assert_mock mock
+      messages = failed.map(&:message)
+      uncalled.each do |type, options|
+        messages << format(
+          'Call did not occur:' + "\n"\
+          '--- expected: [type: %<type>s, symbol: %<resolved_symbol>s, synonyms: %<resolved_synonyms>s]',
+          type: type,
+          resolved_symbol: options&.first,
+          resolved_synonyms: options&.last
+        )
+      end
+
+      if messages.length.positive?
+        flunk messages.join(",\n")
+      else
+        pass
+      end
+
+      assert mock
     end
     # rubocop:enable Metrics/AbcSize, Metrics/MethodLength
   end

data/lib/media_types/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module MediaTypes
-  VERSION = '0.2.3'
+  VERSION = '0.2.4'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: media_types
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Derk-Jan Karrenbeld