lib/reactor/testing/matchers.rb in reactor-0.5.2 vs lib/reactor/testing/matchers.rb in reactor-0.5.3

@@ -1,33 +1,42 @@
 RSpec::Matchers.define :publish_event do |name, data = {}|
-
   match do |block|
     defaults = {:actor => anything}
     Reactor::Event.should_receive(:publish).with(name, hash_including(defaults.merge(data)))
-    block.call
+
+    begin
+      block.call
+      RSpec::Mocks::verify
+      true
+    rescue RSpec::Mocks::MockExpectationError => e
+      false
+    end
   end
 end
 
 RSpec::Matchers.define :publish_events do |*events|
-
   match do |block|
-    defaults = {:actor => anything, at: anything, target: anything}
-
     Reactor::Event.should_receive(:publish).exactly(events.count).times.with do |event, data|
       match = events.select { |e| (e.is_a?(Hash) ? e.keys.first : e) == event }.first
       match.should be_present
 
       expected = match.is_a?(Hash) ? match.values.first : {match => {}}
       expected.each do |key, value|
         value.should == expected[key]
       end
     end
-    block.call
+
+    begin
+      block.call
+      RSpec::Mocks::verify
+      true
+    rescue RSpec::Mocks::MockExpectationError => e
+      false
+    end
   end
 end
 
 RSpec::Matchers.define :subscribe_to do |name, data = {}, &expectations|
-
   match do
     expectations.call if expectations.present?
     Reactor::Event.publish(name, data)
   end
 end
\ No newline at end of file