minitest-matchers 1.0.0 → 1.0.2

data/History.txt

@@ -1,3 +1,15 @@
+=== 1.0.2 / 2011-09-04
+
+* 1 minor enhancement
+
+  * Fix typo
+
+=== 1.0.1 / 2011-09-04
+
+* 1 minor enhancement
+
+  * Match first, then set failure message.
+
 === 1.0.0 / 2011-08-30
 
 * 1 major enhancement

data/lib/minitest/matchers.rb

@@ -1,20 +1,22 @@
 require "minitest/spec"
 
 module MiniTest::Matchers
-  VERSION = "1.0.0"
+  VERSION = "1.0.2"
 
   def must &block
     matcher = yield
     check_matcher matcher
 
-    failure_message = if matcher.respond_to? :failure_message
-                        matcher.failure_message
-                      else
-                        "expected to " + matcher.description
-                      end
-
     it "must #{matcher.description}" do
-      assert matcher.matches?(subject), failure_message
+      result = matcher.matches? subject
+
+      failure_message = if matcher.respond_to? :failure_message
+                          matcher.failure_message
+                        else
+                          "expected to " + matcher.description
+                        end
+
+      assert result, failure_message
     end
 
     matcher
@@ -24,18 +26,20 @@ module MiniTest::Matchers
     matcher = yield
     check_matcher matcher
 
-    failure_message = if matcher.respond_to? :negative_failure_message
-                        matcher.negative_failure_message
-                      else
-                        "expected not to " + matcher.description
-                      end
-
     it "wont #{matcher.description}" do
-      if matcher.respond_to? :does_not_match
-        assert matcher.does_not_match?(subject), failure_message
-      else
-        refute matcher.matches?(subject), failure_message
-      end
+      result = if matcher.respond_to? :does_not_match?
+                 result = matcher.does_not_match?(subject)
+               else
+                 result = !matcher.matches?(subject)
+               end
+
+      failure_message = if matcher.respond_to? :negative_failure_message
+                          matcher.negative_failure_message
+                        else
+                          "expected not to " + matcher.description
+                        end
+
+      assert result, failure_message
     end
 
     matcher

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: minitest-matchers
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -14,7 +14,7 @@ date: 2011-09-04 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &2152311960 !ruby/object:Gem::Requirement
+  requirement: &2152131540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,10 @@ dependencies:
         version: '1.6'
   type: :development
   prerelease: false
-  version_requirements: *2152311960
+  version_requirements: *2152131540
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &2152303800 !ruby/object:Gem::Requirement
+  requirement: &2152130120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,7 +33,7 @@ dependencies:
         version: '2.12'
   type: :development
   prerelease: false
-  version_requirements: *2152303800
+  version_requirements: *2152130120
 description: ! 'minitest-matchers adds support for RSpec/Shoulda-style matchers to
 
   MiniTest::Spec.