minitest-matchers 1.1.3 → 1.2.0

data/README.txt

@@ -80,6 +80,18 @@ For use with Rails check out (ValidAttribute + Capybara):
       wont { have_valid(:title).when("", nil, "Bad") }
     end
 
+You can also register matcher so that it works similar to built-in
+assertions and expectations. Note subject must be the first argument in assertion.
+
+    MiniTest::Unit::TestCase.register_matcher HaveContent, :have_content
+    MiniTest::Unit::TestCase.register_matcher :have_selector, :have_selector
+
+    assert_have_content page, "Hello"
+    assert_Have_selector page, :xpath, "//table/tr"
+
+    page.must_have_content "Hello"
+    page.must_Have_selector :xpath, "//table/tr"
+
 == REQUIREMENTS:
 
 * minitest >= 2.7.0

data/lib/minitest/matchers.rb

@@ -1,7 +1,7 @@
 require "minitest/spec"
 
 module MiniTest::Matchers
-  VERSION = "1.1.3" # :nodoc:
+  VERSION = "1.2.0" # :nodoc:
 end
 
 module MiniTest
@@ -19,10 +19,10 @@ module MiniTest
       result = matcher.matches? subject
 
       msg = message(msg) do
-        if matcher.respond_to? :failure_message
-          matcher.failure_message
-        else
+        if matcher.respond_to? :failure_message_for_should
           matcher.failure_message_for_should
+        else
+          matcher.failure_message
         end
       end
 
@@ -40,10 +40,10 @@ module MiniTest
 
     def assert_wont matcher, subject, msg = nil
       msg = message(msg) do
-        if matcher.respond_to? :negative_failure_message
-          matcher.negative_failure_message
-        else
+        if matcher.respond_to? :failure_message_for_should_not
           matcher.failure_message_for_should_not
+        else
+          matcher.negative_failure_message
         end
       end
 
@@ -136,6 +136,71 @@ class MiniTest::Spec
   end
 end
 
+class MiniTest::Unit::TestCase
+  ##
+  # Defines assert_* assetion and must_* expectation for a matcher
+  #
+  # Example:
+  #
+  #   # Say you're implementing Capybara's HaveContent matcher
+  #
+  #   class HaveContent
+  #     # ...
+  #   end
+  #
+  #   MiniTest::Unit::TestCase.register_matcher HaveContent, :have_content
+  #
+  #   class MyTest < Test::Unit::TestCase
+  #     def test_index
+  #       visit "/"
+  #       assert_have_content page, "Hello"
+  #       assert_have_selector page, :xpath, "//table/tr"
+  #     end
+  #   end
+  #
+  #   describe "my test" do
+  #     test "index" do
+  #       visit "/"
+  #       page.must_have_content "Hello"
+  #       page.must_have_selector :xpath, "//table/tr"
+  #
+  #       # if you set `page` to be implicit subject, following works too:
+  #       must_have_content "Hello"
+  #     end
+  #   end
+  #
+
+  def self.register_matcher matcher, name, exp_name=name
+    define_method :"assert_#{name}" do |*args|
+      subject = args.shift
+
+      x = if Symbol === matcher
+            send matcher, *args
+          else
+            matcher.new(*args)
+          end
+
+      assert_must x, subject
+    end
+
+    Object.infect_an_assertion :"assert_#{name}", :"must_#{exp_name}", true
+
+    define_method :"refute_#{name}" do |*args|
+      subject = args.shift
+
+      x = if Symbol === matcher
+            send matcher, *args
+          else
+            matcher.new(*args)
+          end
+
+      assert_wont x, subject
+    end
+
+    Object.infect_an_assertion :"refute_#{name}", :"wont_#{exp_name}", true
+  end
+end
+
 class MiniTest::Spec # :nodoc:
   include MiniTest::Matchers
 end

data/test/test_minitest_matchers.rb

@@ -43,6 +43,38 @@ describe MiniTest::Unit::TestCase do
   end
 end
 
+describe MiniTest::Unit::TestCase, :register_matcher do
+  MiniTest::Unit::TestCase.register_matcher KindOfMatcher, :my_kind_of, :be_my_kind_of
+  MiniTest::Unit::TestCase.register_matcher :be_kind_of, :meth_kind_of, :meth_my_kind_of
+
+  it "needs to verify assert_<matcher>" do
+    assert_my_kind_of("", String).must_equal true
+    proc { assert_my_kind_of [], String }.must_raise MiniTest::Assertion
+  end
+
+  it "needs to verify must_<matcher>" do
+    "".must_be_my_kind_of(String).must_equal true
+    proc { [].must_be_my_kind_of String }.must_raise MiniTest::Assertion
+  end
+
+  it "needs to verify refute_<matcher>" do
+    refute_my_kind_of("", Array).must_equal false
+    proc { refute_my_kind_of [], Array }.must_raise MiniTest::Assertion
+  end
+
+  it "needs to verify wont<matcher>" do
+    "".wont_be_my_kind_of(Array).must_equal false
+    proc { [].wont_be_my_kind_of(Array) }.must_raise MiniTest::Assertion
+  end
+
+  it "accepts method as matcher" do
+    assert_meth_kind_of("", String).must_equal true
+    proc { assert_meth_kind_of [], String }.must_raise MiniTest::Assertion
+    refute_meth_kind_of("", Array).must_equal false
+    proc { refute_my_kind_of [], Array }.must_raise MiniTest::Assertion
+  end
+end
+
 describe MiniTest::Spec do
   it "needs to verify must" do
     [].must(be_kind_of(Array)).must_equal true

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: minitest-matchers
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-18 00:00:00.000000000 Z
+date: 2012-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &70162351654440 !ruby/object:Gem::Requirement
+  requirement: &70195242850820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,21 +22,21 @@ dependencies:
         version: 2.5.0
   type: :runtime
   prerelease: false
-  version_requirements: *70162351654440
+  version_requirements: *70195242850820
 - !ruby/object:Gem::Dependency
-  name: minitest
-  requirement: &70162351653860 !ruby/object:Gem::Requirement
+  name: rdoc
+  requirement: &70195242850000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.8'
+        version: '3.10'
   type: :development
   prerelease: false
-  version_requirements: *70162351653860
+  version_requirements: *70195242850000
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &70162351653300 !ruby/object:Gem::Requirement
+  requirement: &70195242849340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,7 +44,7 @@ dependencies:
         version: '2.12'
   type: :development
   prerelease: false
-  version_requirements: *70162351653300
+  version_requirements: *70195242849340
 description: ! 'minitest-matchers adds support for RSpec/Shoulda-style matchers to
 
   minitest/unit and minitest/spec.
@@ -101,7 +101,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: minitest-matchers
-rubygems_version: 1.8.10
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: minitest-matchers adds support for RSpec/Shoulda-style matchers to minitest/unit