rspec-xunit 0.6.0 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 299943c479de4ea203b6feeedf989a0521f68e70fb577753d477dbceb022e59b
-  data.tar.gz: df306b202b8bf9c61ff1ad3c1426425565bd3e5742fe7be0891f37bcc2737401
+  metadata.gz: '04009d5542971db2f091421378bd23230927d68f9e9460732f86e4346b6b4cb2'
+  data.tar.gz: d1bdc1445ef25609d1840169dd721cf3231c91f2f9a37635f016ec3d9f0e7af7
 SHA512:
-  metadata.gz: 25dbc4a0a9a5781deca309ab71bb8c1324c23aa3d1a04166efb520aebe8aadb1cd366db33cf5c31cd87eab0033159ebc11753211e72f9db12ac4e2d9664c9ab1
-  data.tar.gz: 242ee142fe42210f19d804ab55e946de5e924b19d529135fb7d492d8a159ac2dc3f8a23fb6635fc8459d14c94b7a6d8efe61c5576fc035f01293c7d9a86fa4e5
+  metadata.gz: 22ebc3763e0dd50d6740df2d8d3fdc3bef5f954ae66e7d65913985ceffdf6628645a67fb4754c5db33c6a34389a95d1c4e17415b9205de86c6231bb0f7388410
+  data.tar.gz: 36db704352be7b0c495e2c0692930c664578e148be19575cf90d8826ea307b4c2cfde9ba3695700181dbbc15f10e5f5a0bc8e319212ab76a70857dc4fef1ac10

data/lib/rspec/xunit/assertions.rb

@@ -13,39 +13,37 @@ module RSpec
         #
         # - `assert_eq` roughly `expect(action).to eq(expected)`
         # - `assert_not_eq` roughly `expect(action).to_not eq(expected)`
-        def assertion_match(matcher, suffix = matcher)
-          define_method "assert_#{suffix}" do |value, *args, &block|
-            expect(value).to send(matcher, *args, &block)
-          rescue Expectations::ExpectationNotMetError => e
-            raise e, e.message, adjust_for_better_failure_message(e.backtrace), cause: nil
-          end
-
-          define_method "assert_not_#{suffix}" do |value, *args, &block|
-            expect(value).to_not send(matcher, *args, &block)
-          rescue Expectations::ExpectationNotMetError => e
-            raise e, e.message, adjust_for_better_failure_message(e.backtrace), cause: nil
-          end
-        end
-
-        # Assertion match block converts RSpec block matchers into XUnit
-        # friendly assertions.
         #
-        # For example, `assertion_match_block :raises, :raise_error` will
-        # generate two methods:
+        # For block expectation, `assertion_match :raises, :raise_error, block: true`
+        # will generate two methods:
         #
         # - `assert_raises` roughly `expect { bloc }.to raise_error`
         # - `assert_not_raises` roughly `expect { bloc }.to_not raise_error`
-        def assertion_match_block(matcher, suffix = matcher)
-          define_method "assert_#{suffix}" do |*args, &block|
-            expect(&block).to send(matcher, *args)
-          rescue Expectations::ExpectationNotMetError => e
-            raise e, e.message, adjust_for_better_failure_message(e.backtrace), cause: nil
-          end
+        def assertion_match(matcher, suffix = matcher, block: false)
+          if block
+            define_method "assert_#{suffix}" do |*args, &block|
+              expect(&block).to send(matcher, *args)
+            rescue Expectations::ExpectationNotMetError => e
+              raise e, e.message, adjust_for_better_failure_message(e.backtrace), cause: nil
+            end
+
+            define_method "assert_not_#{suffix}" do |*args, &block|
+              expect(&block).to_not send(matcher, *args)
+            rescue Expectations::ExpectationNotMetError => e
+              raise e, e.message, adjust_for_better_failure_message(e.backtrace), cause: nil
+            end
+          else
+            define_method "assert_#{suffix}" do |value, *args, &blk|
+              expect(value).to send(matcher, *args, &blk)
+            rescue Expectations::ExpectationNotMetError => e
+              raise e, e.message, adjust_for_better_failure_message(e.backtrace), cause: nil
+            end
 
-          define_method "assert_not_#{suffix}" do |*args, &block|
-            expect(&block).to_not send(matcher, *args)
-          rescue Expectations::ExpectationNotMetError => e
-            raise e, e.message, adjust_for_better_failure_message(e.backtrace), cause: nil
+            define_method "assert_not_#{suffix}" do |value, *args, &blk|
+              expect(value).to_not send(matcher, *args, &blk)
+            rescue Expectations::ExpectationNotMetError => e
+              raise e, e.message, adjust_for_better_failure_message(e.backtrace), cause: nil
+            end
           end
         end
       end
@@ -60,8 +58,8 @@ module RSpec
       assertion_match :be_between, :between
       assertion_match :be_within, :within
 
-      assertion_match_block :raise_error, :raise
-      assertion_match_block :raise_error, :raises
+      assertion_match :raise_error, :raise, block: true
+      assertion_match :raise_error, :raises, block: true
 
       # Exceptions to the block matcher rule.
       assertion_match :satisfy
@@ -106,6 +104,7 @@ module RSpec
       private
 
       ASSERTION_REGEX = /^assert_(.*)$/.freeze
+      ASSERTION_NEGATIVE_REGEX = /^assert_not_(.*)$/.freeze
       ASSERTION_PREDICATE_REGEX = /^assert_(.*)\?$/.freeze
       ASSERTION_NEGATIVE_PREDICATE_REGEX = /^assert_not_(.*)\?$/.freeze
 
@@ -124,18 +123,24 @@ module RSpec
           expect(value).to Matchers::BuiltIn::BePredicate.new(matcher, *args, &block)
         end
 
+        return if ASSERTION_NEGATIVE_REGEX.match(method.to_s) do |match|
+          matcher = match[1]
+
+          RSpec::XUnit::Assertions.module_eval do
+            assertion_match matcher, block: block
+          end
+
+          send "assert_not_#{matcher}", *args, &block
+        end
+
         return if ASSERTION_REGEX.match(method.to_s) do |match|
           matcher = match[1]
 
           RSpec::XUnit::Assertions.module_eval do
-            if block.nil?
-              assertion_match matcher
-            else
-              assertion_match_block matcher
-            end
+            assertion_match matcher, block: block
           end
 
-          send "assert_#{match[1]}", *args, &block
+          send "assert_#{matcher}", *args, &block
         end
 
         super

data/lib/rspec/xunit/version.rb

@@ -2,6 +2,6 @@
 
 module RSpec
   module XUnit
-    VERSION = '0.6.0'
+    VERSION = '0.7.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rspec-xunit
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
 platform: ruby
 authors:
 - Genadi Samokovarov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-03-10 00:00:00.000000000 Z
+date: 2020-03-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-core