rails_event_store-rspec 0.28.2 → 0.29.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: da2ea22ecb4e2fd67359689edfec525411b504691ed52adf970aecdb1550579c
-  data.tar.gz: c3275f36166f4a19e029e4cb7a6a3dc98b56c0ccc90ddc946504b1e995d3d181
+  metadata.gz: 70db937a2e115aceb3d4c01978447620202dc5a41b64b5c24672869e09844c77
+  data.tar.gz: 6c6b02698b8c45e31317b18a35369f96667c3562097394846f79c0ea58b2a7dd
 SHA512:
-  metadata.gz: 1bae53eacf893ab72b80fe0db8c18c68fdb3bb9f7f45604bdccacc32f94c21c2986cc1bfea17459073250fdf5f579037ce4c2c4fc914289278bf85e3145720ee
-  data.tar.gz: f3934e5cebf28cfc72e73b79c5822737686f175b3641944826e53b707afe05f70d5f86e0b0a419ee45775bce755e9809cd9d9218990a637220193f14ad7b1807
+  metadata.gz: 0b8244bd6ba6e6fb550f9ee846271dfeb92822d053e63f51b6c118677d38d26569e47987e6be5b027637ce38927794fb4ff7a1309269064e903f343f3927ef5b
+  data.tar.gz: 75bcc8649432de809b2980fe6f2f4373a36881ae853ba7a6fb80d5fa53848fa0ffa9e80bdd5d9144913b6ccc9eeae83b913f6bca837cab67994fe6d25c6d1ef6

data/Makefile

@@ -2,6 +2,7 @@ GEM_VERSION = $(shell cat ../RES_VERSION)
 GEM_NAME    = rails_event_store-rspec
 REQUIRE     = rails_event_store/rspec
 IGNORE      = RailsEventStore::RSpec::Matchers\#differ \
+              RailsEventStore::RSpec::Matchers\#formatter \
               RailsEventStore::RSpec::Matchers\#have_published \
               RailsEventStore::RSpec::Matchers\#have_applied \
               RailsEventStore::RSpec::Matchers\#be_an_event

data/lib/rails_event_store/rspec/be_event.rb

@@ -114,14 +114,15 @@ module RailsEventStore
 
       include ::RSpec::Matchers::Composable
 
-      def initialize(expected, differ:)
-        @differ   = differ
-        @expected = expected
+      def initialize(expected, differ:, formatter:)
+        @differ    = differ
+        @formatter = formatter
+        @expected  = expected
       end
 
       def matches?(actual)
         @actual = actual
-        [matches_kind, matches_data, matches_metadata].all?
+        matches_kind && matches_data && matches_metadata
       end
 
       def with_data(expected_data)
@@ -135,7 +136,7 @@ module RailsEventStore
       end
 
       def failure_message
-        FailureMessage.new(expected, actual.class, expected_data, actual.data, expected_metadata, actual.metadata, differ: differ).to_s
+        FailureMessage.new(expected, actual.class, expected_data, actual.try(:data), expected_metadata, actual.try(:metadata), differ: differ).to_s
       end
 
       def failure_message_when_negated
@@ -150,6 +151,10 @@ expected: not a kind of #{expected}
         self
       end
 
+      def description
+        "be event #{formatter.(expected)}"
+      end
+
       private
 
       def matches_kind
@@ -164,7 +169,7 @@ expected: not a kind of #{expected}
         DataMatcher.new(expected_metadata, strict: strict?).matches?(actual.metadata.to_h)
       end
 
-      attr_reader :expected_metadata, :expected_data, :actual, :expected, :differ
+      attr_reader :expected_metadata, :expected_data, :actual, :expected, :differ, :formatter
 
       def strict?
         @strict

data/lib/rails_event_store/rspec/have_applied.rb

@@ -1,10 +1,11 @@
 module RailsEventStore
   module RSpec
     class HaveApplied
-      def initialize(mandatory_expected, *optional_expected, differ:)
-        @expected = [mandatory_expected, *optional_expected]
-        @matcher  = ::RSpec::Matchers::BuiltIn::Include.new(*expected)
-        @differ   = differ
+      def initialize(mandatory_expected, *optional_expected, differ:, formatter:)
+        @expected  = [mandatory_expected, *optional_expected]
+        @matcher   = ::RSpec::Matchers::BuiltIn::Include.new(*expected)
+        @differ    = differ
+        @formatter = formatter
       end
 
       def matches?(aggregate_root)
@@ -27,7 +28,17 @@ module RailsEventStore
       end
 
       def failure_message
-        differ.diff_as_string(expected.to_s, events.to_s)
+        "expected #{expected} to be applied, diff:" +
+          differ.diff_as_string(expected.to_s, events.to_s)
+      end
+
+      def failure_message_when_negated
+        "expected #{expected} not to be applied, diff:" +
+            differ.diff_as_string(expected.inspect, events.inspect)
+      end
+
+      def description
+        "have applied [%s]" % expected.map { |e| formatter.(e) }.join(', ')
       end
 
       private
@@ -41,7 +52,7 @@ module RailsEventStore
         end
       end
 
-      attr_reader :differ, :expected, :events, :count, :matcher
+      attr_reader :formatter, :differ, :expected, :events, :count, :matcher
     end
   end
 end

data/lib/rails_event_store/rspec/have_published.rb

@@ -1,10 +1,11 @@
 module RailsEventStore
   module RSpec
     class HavePublished
-      def initialize(mandatory_expected, *optional_expected, differ:)
-        @expected = [mandatory_expected, *optional_expected]
-        @matcher  = ::RSpec::Matchers::BuiltIn::Include.new(*expected)
-        @differ   = differ
+      def initialize(mandatory_expected, *optional_expected, differ:, formatter:)
+        @expected  = [mandatory_expected, *optional_expected]
+        @matcher   = ::RSpec::Matchers::BuiltIn::Include.new(*expected)
+        @differ    = differ
+        @formatter = formatter
       end
 
       def matches?(event_store)
@@ -33,7 +34,19 @@ module RailsEventStore
       end
 
       def failure_message
-        differ.diff_as_string(expected.to_s, events.to_s)
+        "expected #{expected} to be published, diff:" +
+            differ.diff_as_string(expected.to_s, events.to_s)
+      end
+
+      def failure_message_when_negated
+        "expected #{expected} not to be published, diff:" +
+            differ.diff_as_string(expected.to_s, events.to_s)
+      end
+
+      def description
+        "have published [%s]" % expected
+          .map { |e| formatter.(e) }
+          .join(', ')
       end
 
       private
@@ -47,7 +60,7 @@ module RailsEventStore
         end
       end
 
-      attr_reader :differ, :stream_name, :expected, :count, :events
+      attr_reader :formatter, :differ, :stream_name, :expected, :count, :events
     end
   end
 end

data/lib/rails_event_store/rspec/matchers.rb

@@ -2,22 +2,26 @@ module RailsEventStore
   module RSpec
     module Matchers
       def be_an_event(expected)
-        BeEvent.new(expected, differ: differ)
+        BeEvent.new(expected, differ: differ, formatter: formatter)
       end
       alias :be_event :be_an_event
       alias :an_event :be_an_event
       alias :event    :be_an_event
 
       def have_published(*expected)
-        HavePublished.new(*expected, differ: differ)
+        HavePublished.new(*expected, differ: differ, formatter: formatter)
       end
 
       def have_applied(*expected)
-        HaveApplied.new(*expected, differ: differ)
+        HaveApplied.new(*expected, differ: differ, formatter: formatter)
       end
 
       private
 
+      def formatter
+        ::RSpec::Support::ObjectFormatter.method(:format)
+      end
+
       def differ
         ::RSpec::Support::Differ.new(color: ::RSpec::Matchers.configuration.color?)
       end

data/lib/rails_event_store/rspec/version.rb

@@ -1,5 +1,5 @@
 module RailsEventStore
   module RSpec
-    VERSION = "0.28.2"
+    VERSION = "0.29.0"
   end
 end

data/rails_event_store-rspec.gemspec

@@ -31,7 +31,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'rspec', '~> 3.6'
   spec.add_development_dependency 'mutant-rspec', '~> 0.8.14'
   spec.add_development_dependency 'rails', '~> 5.1'
-  spec.add_development_dependency 'rails_event_store', '= 0.28.2'
+  spec.add_development_dependency 'rails_event_store', '= 0.29.0'
 
   spec.add_runtime_dependency 'rspec', '~> 3.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails_event_store-rspec
 version: !ruby/object:Gem::Version
-  version: 0.28.2
+  version: 0.29.0
 platform: ruby
 authors:
 - Arkency
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.2
+        version: 0.29.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.28.2
+        version: 0.29.0
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement