minitest-ok 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0954d6aa6e1f266702561e5d1bc754e240939d62
-  data.tar.gz: 6356034dae10336b4b53a39b70e9fb2d35a42029
+  metadata.gz: 0393c06bdcd679080b979ab6d402b16363b9ac52
+  data.tar.gz: 6c0f9dbd1af465ca6601b8be8cadad2809e8393f
 SHA512:
-  metadata.gz: c5b547b6b93ec8261f4eb38a4e00aed087bcc721f594312b685eef0a7780a7eb0fda544c891ed6a2c297d7f58890aed7ecd7284dd4c3acf9948c2eb0888e9e28
-  data.tar.gz: 95dcfac0362e4040c9512c24878b36a83038d2201080297950c05982715163605655b2b3b526abb05a57a9451bd836f1d48fa3f22975c75f387b977174df4b24
+  metadata.gz: 08609c6a464436a7ab37ff3045bdcf18dd7d1b9360c728609251ef1e0e7ab3f76983de8a2569cca55f68dbd62a768dddbc8d785fbbf40031253d263e70acb918
+  data.tar.gz: e869d5d3fcb907eb6ae6aae167f1f1313f25220009e5c8e7880f3e36cb4629897c10e440002f7fbc23baaeb307e670bbb2f88ca03d9c4e2fb3181c40c0615ae5

data/README.md

@@ -138,6 +138,12 @@ $License: MIT License $
 
 ## History
 
+
+### 2016-09-07: Release 0.2.0
+
+* [bugfix] `ok{}.raise?()` now takes error message as well as error class.
+
+
 ### 2015-11-22: Release 0.1.0
 
 * First release

data/lib/minitest/ok.rb

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 ###
-### $Release: 0.1.0 $
+### $Release: 0.2.0 $
 ### $Copyright: copyright(c) 2015 kuwata-lab.com all rights reserved $
 ### $License: MIT License $
 ###
@@ -59,7 +59,12 @@ module Minitest
 
   module Ok
 
-    VERSION = '$Release: 0.1.0 $'.split()[1]
+    VERSION = '$Release: 0.2.0 $'.split()[1]
+
+
+    class Msg < Proc    # :nodoc:
+      alias to_s call
+    end
 
 
     class AssertionObject
@@ -83,6 +88,10 @@ module Minitest
         self
       end
 
+      def _msg(&block)
+        Msg.new(block)
+      end
+
       ##
       ## Make logical condition reversed.
       ##
@@ -322,6 +331,13 @@ module Minitest
         ex = nil
         unless @not
           ex = @context.assert_raises(exception_class) { @actual.call }
+          unless message.nil?
+            if message.is_a?(Regexp)
+              @context.assert_match message, ex.message
+            else
+              @context.assert_equal message, ex.message
+            end
+          end
         else
           begin
             @actual.call
@@ -483,8 +499,7 @@ module Minitest
             @context.__send__("assert_#{symbol.to_s[0..-2]}", @actual, *args, &block)
           rescue NoMethodError
             result = @actual.__send__(symbol, *args, &block)
-            msg = result ? nil : "Expected #{@actual.inspect}.#{symbol}(#{args.inspect[1..-2]}) but failed."
-            @context.assert result, msg
+            @context.assert result, Msg.new { "Expected #{@actual.inspect}.#{symbol}(#{args.inspect[1..-2]}) but failed." }
           end
         else
           ## Try refute_xxxx() at first.
@@ -493,8 +508,7 @@ module Minitest
             @context.__send__("refute_#{symbol.to_s[0..-2]}", @actual, *args, &block)
           rescue NoMethodError
             result = @actual.__send__(symbol, *args, &block)
-            msg = ! result ? nil : "Expected #{@actual.inspect}.#{symbol}(#{args.inspect[1..-2]}) to fail but succeeded."
-            @context.refute result, msg
+            @context.refute result, Msg.new { "Expected #{@actual.inspect}.#{symbol}(#{args.inspect[1..-2]}) to fail but succeeded." }
           end
         end
         self
@@ -515,11 +529,9 @@ module Minitest
       def truthy?
         _mark_as_tested()
         unless @not
-          msg = @actual ? nil : "Expected (!! #{@actual.inspect}) == true, but not."
-          @context.assert @actual, msg
+          @context.assert @actual, Msg.new { "Expected (!! #{@actual.inspect}) == true, but not." }
         else
-          msg = ! @actual ? nil : "Expected (!! #{@actual.inspect}) == false, but not."
-          @context.refute @actual, msg
+          @context.refute @actual, Msg.new { "Expected (!! #{@actual.inspect}) == false, but not." }
         end
         self
       end
@@ -537,11 +549,9 @@ module Minitest
       def falthy?
         _mark_as_tested()
         unless @not
-          msg = ! @actual ? nil : "Expected (!! #{@actual.inspect}) == false, but not."
-          @context.refute @actual, msg
+          @context.refute @actual, Msg.new { "Expected (!! #{@actual.inspect}) == false, but not." }
         else
-          msg = @actual ? nil : "Expected (!! #{@actual.inspect}) == true, but not."
-          @context.assert @actual, msg
+          @context.assert @actual, Msg.new { "Expected (!! #{@actual.inspect}) == true, but not." }
         end
         self
       end
@@ -561,9 +571,8 @@ module Minitest
           "Expected <object>.#{name} #{op} <exected>, but failed.\n" +
           " (object: #{object.inspect})"
         }
-        result = expected == actual
-        @context.assert_equal expected, actual, (result ? nil : pr.call('=='))  unless @not
-        @context.refute_equal expected, actual, (result ? pr.call('!=') : nil)  if     @not
+        @context.assert_equal expected, actual, Msg.new { pr.call('==') }  unless @not
+        @context.refute_equal expected, actual, Msg.new { pr.call('!=') }  if     @not
         self
       end
 
@@ -596,9 +605,8 @@ module Minitest
           "Expected <object>[#{key.inspect}] #{op} <exected>, but failed.\n" +
           " (object: #{object.inspect})"
         }
-        result = expected == actual
-        @context.assert_equal expected, actual, (result ? nil : pr.call('=='))  unless @not
-        @context.refute_equal expected, actual, (result ? pr.call('!=') : nil)  if     @not
+        @context.assert_equal expected, actual, Msg.new { pr.call('==') }  unless @not
+        @context.refute_equal expected, actual, Msg.new { pr.call('!=') }  if     @not
         self
       end
 

data/test/minitest/ok_test.rb

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 ###
-### $Release: 0.1.0 $
+### $Release: 0.2.0 $
 ### $Copyright: copyright(c) 2015 kuwata-lab.com all rights reserved $
 ### $License: MIT License $
 ###
@@ -368,9 +368,18 @@ describe Minitest::Ok::AssertionObject do
       end
     end
 
-    it "can take error message in addition to exception class." do
+    it "can take error message string in addition to exception class." do
       should_not_raise  { ok {proc{1/0}}.raise?(ZeroDivisionError, "divided by 0") }
+      ex = should_raise { ok {proc{1/0}}.raise?(ZeroDivisionError, "foobar") }
+      expected = "Expected: \"foobar\"\n  Actual: \"divided by 0\""
+      assert_equal expected, ex.message
+    end
+
+    it "can take error message regexp instead of string." do
       should_not_raise  { ok {proc{1/0}}.raise?(ZeroDivisionError, /by [0]/) }
+      ex = should_raise { ok {proc{1/0}}.raise?(ZeroDivisionError, /by 99/) }
+      expected = "Expected /by 99/ to match \"divided by 0\"."
+      assert_equal expected, ex.message
     end
 
   end

data/test/test_helper.rb

@@ -1,7 +1,7 @@
 # -*- coding: utf-8 -*-
 
 ###
-### $Release: 0.1.0 $
+### $Release: 0.2.0 $
 ### $Copyright: copyright(c) 2015 kuwata-lab.com all rights reserved $
 ### $License: MIT License $
 ###

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: minitest-ok
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - makoto kuwata
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-22 00:00:00.000000000 Z
+date: 2016-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: |
@@ -38,12 +38,12 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- MIT-LICENSE
 - README.md
+- MIT-LICENSE
 - Rakefile
 - lib/minitest/ok.rb
-- test/minitest/ok_test.rb
 - test/test_helper.rb
+- test/minitest/ok_test.rb
 homepage: https://github.com/kwatch/minitest-ok
 licenses:
 - MIT-License
@@ -54,18 +54,18 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '1.9'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.0.14.1
 signing_key: 
 specification_version: 4
-summary: "'ok {1+1} == 2' instead of 'assert_equal 2, 1+1'"
+summary: '''ok {1+1} == 2'' instead of ''assert_equal 2, 1+1'''
 test_files: []