minitest-ok 0.2.0 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 0393c06bdcd679080b979ab6d402b16363b9ac52
-  data.tar.gz: 6c0f9dbd1af465ca6601b8be8cadad2809e8393f
+SHA256:
+  metadata.gz: 24fede07b5dfd3ba6329ea3f9eec222be7bbd7448cec333211193f249d182acf
+  data.tar.gz: d6fce3aa578e6ca8abbb828216c52c2316f9b2259693930ccd1af93bbe93e701
 SHA512:
-  metadata.gz: 08609c6a464436a7ab37ff3045bdcf18dd7d1b9360c728609251ef1e0e7ab3f76983de8a2569cca55f68dbd62a768dddbc8d785fbbf40031253d263e70acb918
-  data.tar.gz: e869d5d3fcb907eb6ae6aae167f1f1313f25220009e5c8e7880f3e36cb4629897c10e440002f7fbc23baaeb307e670bbb2f88ca03d9c4e2fb3181c40c0615ae5
+  metadata.gz: 1654cdcdc41ab3a0e8c5947e7566ca2906ef23604c823791d053c669071ff62a03b5c9c6016d88908a0d41035bc783f53b62a2c83f6a8ae57b247c1f50e3936b
+  data.tar.gz: 36b1f25a7fad593a38978931d3dd76e96c1e5279f1262dc508a0f087496ab09ecca848a45769d7585a22731262b55bb98b39224daa269e9c763f5812fe71496a

data/README.md

@@ -85,8 +85,8 @@ describe 'Minitest::Ok' do
     ok {123}.truthy?               # similar to assert 123
     ok {0}.truthy?                 # similar to assert 0
     ok {""}.truthy?                # similar to assert ""
-    ok {false}.falthy?             # similar to refute false
-    ok {nil}.falthy?               # similar to refute nil
+    ok {false}.falsy?              # similar to refute false
+    ok {nil}.falsy?                # similar to refute nil
 
     ## predicates
     ok {""}.empty?                 # same as assert_empty? ""
@@ -138,6 +138,28 @@ $License: MIT License $
 
 ## History
 
+### 2021-08-02: Release 0.3.3
+
+* [bugfix] rename 'ok {}.falthy?' to 'ok {}.falsy?'.
+
+
+### 2021-01-17: Release 0.3.2
+
+* [bugfix] fix to work on Ruby 3.
+
+
+### 2018-11-13: Release 0.3.1
+
+* [bugfix] add change history to README.
+* [bugfix] update copyright year.
+
+
+### 2018-11-12: Release 0.3.0
+
+* [bugfix] `ok {}` shows filename and lineno correctly error happened.
+* [change] `ok {} == nil` calls `assert_nil()` instead of `assert_equal()`.
+* [bugfix] update test script to run successfully on recent ruby.
+
 
 ### 2016-09-07: Release 0.2.0
 

data/Rakefile

@@ -39,18 +39,21 @@ desc "edit files (for release preparation)"
 task :edit do
   rel = ENV['rel']  or
     raise "ERROR: 'rel' environment variable expected."
+  copyright = "copyright(c) 2015-2018 kuwata-lab.com all rights reserved"
   filenames = Dir[*%w[lib/**/*.rb test/**/*_test.rb test/test_helper.rb *.gemspec]]
   filenames.each do |fname|
     File.open(fname, 'r+', encoding: 'utf-8') do |f|
       content = f.read()
-      x = content.gsub!(/\$Release:.*?\$/, "$Release: #{rel} $")
-      if x.nil?
+      x = content
+      x = x.gsub(/\$Release:.*?\$/, "$Release: #{rel} $")
+      x = x.gsub(/\$Copyright:.*?\$/, "$Copyright: #{copyright} $")
+      if x == content
         puts "[_] #{fname}"
       else
         puts "[C] #{fname}"
         f.rewind()
         f.truncate(0)
-        f.write(content)
+        f.write(x)
       end
     end
   end

data/lib/minitest/ok.rb

@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 
 ###
-### $Release: 0.2.0 $
-### $Copyright: copyright(c) 2015 kuwata-lab.com all rights reserved $
+### $Release: 0.3.3 $
+### $Copyright: copyright(c) 2015-2018 kuwata-lab.com all rights reserved $
 ### $License: MIT License $
 ###
 
@@ -34,7 +34,7 @@ module Minitest
     ##   ok {1..9}.include?(5)       # same as assert_includes 5, 1..9
     ##   ok {1..9}.NOT.include?(0)   # same as refute_includes 0, 1..9
     ##   ok {""}.truthy?             # same as assert true, !!""
-    ##   ok {nil}.falthy?            # same as assert false, !!""
+    ##   ok {nil}.falsy?             # same as assert false, !!""
     ##
     ##   ex = ok { proc { 1 / 0 } }.raise?(ZeroDivisionError, "divided by 0")
     ##   p ex      #=> #<ZeroDivisionError: divided by 0>
@@ -59,7 +59,7 @@ module Minitest
 
   module Ok
 
-    VERSION = '$Release: 0.2.0 $'.split()[1]
+    VERSION = '$Release: 0.3.3 $'.split()[1]
 
 
     class Msg < Proc    # :nodoc:
@@ -75,12 +75,16 @@ module Minitest
         @context = context
         @not     = false
         @tested  = tested = [false]
-        ObjectSpace.define_finalizer(self, proc {
+        ObjectSpace.define_finalizer(self, self.class._finalizer_callback(tested, location))
+      end
+
+      def self._finalizer_callback(tested, location)  # :nodoc:
+        return proc do
           unless tested[0]
             loc = location.to_s.split(/:in /).first
             $stderr.puts "** WARNING: ok() called but no assertion invoked (#{loc})"
           end
-        })
+        end
       end
 
       def _mark_as_tested   # :nodoc:
@@ -111,9 +115,17 @@ module Minitest
       ##
       def ==(expected)
         _mark_as_tested()
-        @context.assert_equal expected, @actual  unless @not
-        @context.refute_equal expected, @actual  if     @not
+        if nil == expected
+          @context.assert_nil @actual  unless @not
+          @context.refute_nil @actual  if     @not
+        else
+          @context.assert_equal expected, @actual  unless @not
+          @context.refute_equal expected, @actual  if     @not
+        end
         self
+      rescue Minitest::Assertion => ex
+        ex.backtrace.delete_if {|bt| bt.start_with?(__FILE__) }
+        raise
       end
 
       ##
@@ -127,6 +139,9 @@ module Minitest
         @context.refute_equal expected, @actual  unless @not
         @context.assert_equal expected, @actual  if     @not
         self
+      rescue Minitest::Assertion => ex
+        ex.backtrace.delete_if {|bt| bt.start_with?(__FILE__) }
+        raise
       end
 
       ##
@@ -141,6 +156,9 @@ module Minitest
         @context.assert_operator @actual, :'>', expected  unless @not
         @context.refute_operator @actual, :'>', expected  if     @not
         self
+      rescue Minitest::Assertion => ex
+        ex.backtrace.delete_if {|bt| bt.start_with?(__FILE__) }
+        raise
       end
 
       ##
@@ -155,6 +173,9 @@ module Minitest
         @context.assert_operator @actual, :'>=', expected  unless @not
         @context.refute_operator @actual, :'>=', expected  if     @not
         self
+      rescue Minitest::Assertion => ex
+        ex.backtrace.delete_if {|bt| bt.start_with?(__FILE__) }
+        raise
       end
 
       ##
@@ -169,6 +190,9 @@ module Minitest
         @context.assert_operator @actual, :'<', expected  unless @not
         @context.refute_operator @actual, :'<', expected  if     @not
         self
+      rescue Minitest::Assertion => ex
+        ex.backtrace.delete_if {|bt| bt.start_with?(__FILE__) }
+        raise
       end
 
       ##
@@ -183,6 +207,9 @@ module Minitest
         @context.assert_operator @actual, :'<=', expected  unless @not
         @context.refute_operator @actual, :'<=', expected  if     @not
         self
+      rescue Minitest::Assertion => ex
+        ex.backtrace.delete_if {|bt| bt.start_with?(__FILE__) }
+        raise
       end
 
       ##
@@ -196,6 +223,9 @@ module Minitest
         @context.assert_operator @actual, :'===', expected  unless @not
         @context.refute_operator @actual, :'===', expected  if     @not
         self
+      rescue Minitest::Assertion => ex
+        ex.backtrace.delete_if {|bt| bt.start_with?(__FILE__) }
+        raise
       end
 
       ##
@@ -209,6 +239,9 @@ module Minitest
         @context.assert_match expected, @actual  unless @not
         @context.refute_match expected, @actual  if     @not
         self
+      rescue Minitest::Assertion => ex
+        ex.backtrace.delete_if {|bt| bt.start_with?(__FILE__) }
+        raise
       end
 
       ##
@@ -222,6 +255,9 @@ module Minitest
         @context.refute_match expected, @actual  unless @not
         @context.assert_match expected, @actual  if     @not
         self
+      rescue Minitest::Assertion => ex
+        ex.backtrace.delete_if {|bt| bt.start_with?(__FILE__) }
+        raise
       end
 
       ##
@@ -236,6 +272,9 @@ module Minitest
         @context.assert_kind_of expected, @actual  unless @not
         @context.refute_kind_of expected, @actual  if     @not
         self
+      rescue Minitest::Assertion => ex
+        ex.backtrace.delete_if {|bt| bt.start_with?(__FILE__) }
+        raise
       end
 
       ##
@@ -258,6 +297,9 @@ module Minitest
         @context.assert_instance_of expected, @actual  unless @not
         @context.refute_instance_of expected, @actual  if     @not
         self
+      rescue Minitest::Assertion => ex
+        ex.backtrace.delete_if {|bt| bt.start_with?(__FILE__) }
+        raise
       end
 
       ##
@@ -273,6 +315,9 @@ module Minitest
         @context.assert_same expected, @actual  unless @not
         @context.refute_same expected, @actual  if     @not
         self
+      rescue Minitest::Assertion => ex
+        ex.backtrace.delete_if {|bt| bt.start_with?(__FILE__) }
+        raise
       end
 
       ##
@@ -288,6 +333,9 @@ module Minitest
         @context.assert_empty @actual  unless @not
         @context.refute_empty @actual  if     @not
         self
+      rescue Minitest::Assertion => ex
+        ex.backtrace.delete_if {|bt| bt.start_with?(__FILE__) }
+        raise
       end
 
       ##
@@ -301,6 +349,9 @@ module Minitest
         @context.assert_in_delta(expected, @actual, delta)  unless @not
         @context.refute_in_delta(expected, @actual, delta)  if     @not
         self
+      rescue Minitest::Assertion => ex
+        ex.backtrace.delete_if {|bt| bt.start_with?(__FILE__) }
+        raise
       end
 
       ##
@@ -314,6 +365,9 @@ module Minitest
         @context.assert_in_epsilon(expected, @actual, epsilon)  unless @not
         @context.refute_in_epsilon(expected, @actual, epsilon)  if     @not
         self
+      rescue Minitest::Assertion => ex
+        ex.backtrace.delete_if {|bt| bt.start_with?(__FILE__) }
+        raise
       end
 
       ##
@@ -348,6 +402,9 @@ module Minitest
           end
         end
         return ex   # not self!
+      rescue Minitest::Assertion => ex
+        ex.backtrace.delete_if {|bt| bt.start_with?(__FILE__) }
+        raise
       end
 
       ##
@@ -362,6 +419,9 @@ module Minitest
           raise "NOT.throw? is unsupported because refute_throws() is not defined in Minitest."
         @context.assert_throws(sym) { @actual.call }
         self
+      rescue Minitest::Assertion => ex
+        ex.backtrace.delete_if {|bt| bt.start_with?(__FILE__) }
+        raise
       end
 
       ##
@@ -375,6 +435,9 @@ module Minitest
         @context.assert_respond_to @actual, expected  unless @not
         @context.refute_respond_to @actual, expected  if     @not
         self
+      rescue Minitest::Assertion => ex
+        ex.backtrace.delete_if {|bt| bt.start_with?(__FILE__) }
+        raise
       end
 
       ##
@@ -389,6 +452,9 @@ module Minitest
         @context.assert_includes @actual, expected  unless @not
         @context.refute_includes @actual, expected  if     @not
         self
+      rescue Minitest::Assertion => ex
+        ex.backtrace.delete_if {|bt| bt.start_with?(__FILE__) }
+        raise
       end
 
       ##
@@ -403,6 +469,9 @@ module Minitest
         @context.assert_includes expected, @actual  unless @not
         @context.refute_includes expected, @actual  if     @not
         self
+      rescue Minitest::Assertion => ex
+        ex.backtrace.delete_if {|bt| bt.start_with?(__FILE__) }
+        raise
       end
 
       ##
@@ -417,6 +486,9 @@ module Minitest
           raise "use ok().silent? instead of ok().NOT.output?."
         @context.assert_output(stdout, stderr, &@actual)
         self
+      rescue Minitest::Assertion => ex
+        ex.backtrace.delete_if {|bt| bt.start_with?(__FILE__) }
+        raise
       end
 
       ##
@@ -431,6 +503,9 @@ module Minitest
           raise "use ok().output? instead of ok().NOT.silent?."
         @context.assert_silent(&@actual)
         self
+      rescue Minitest::Assertion => ex
+        ex.backtrace.delete_if {|bt| bt.start_with?(__FILE__) }
+        raise
       end
 
       ## for predicates
@@ -446,6 +521,9 @@ module Minitest
         @context.assert_predicate @actual, :frozen?  unless @not
         @context.refute_predicate @actual, :frozen?  if     @not
         self
+      rescue Minitest::Assertion => ex
+        ex.backtrace.delete_if {|bt| bt.start_with?(__FILE__) }
+        raise
       end
 
       ##
@@ -459,6 +537,9 @@ module Minitest
         @context.assert_predicate @actual, :tainted?  unless @not
         @context.refute_predicate @actual, :tainted?  if     @not
         self
+      rescue Minitest::Assertion => ex
+        ex.backtrace.delete_if {|bt| bt.start_with?(__FILE__) }
+        raise
       end
 
       ##
@@ -478,6 +559,9 @@ module Minitest
           @context.refute result, "Expected #{@actual.inspect} not to have instance variable #{varname}, but has it."
         end
         self
+      rescue Minitest::Assertion => ex
+        ex.backtrace.delete_if {|bt| bt.start_with?(__FILE__) }
+        raise
       end
 
       ##
@@ -512,6 +596,9 @@ module Minitest
           end
         end
         self
+      rescue Minitest::Assertion => ex
+        ex.backtrace.delete_if {|bt| bt.start_with?(__FILE__) }
+        raise
       end
 
       ## other helpers
@@ -534,19 +621,22 @@ module Minitest
           @context.refute @actual, Msg.new { "Expected (!! #{@actual.inspect}) == false, but not." }
         end
         self
+      rescue Minitest::Assertion => ex
+        ex.backtrace.delete_if {|bt| bt.start_with?(__FILE__) }
+        raise
       end
 
       ##
       ## Tests whether actual is false or nil.
       ##
-      ##   ok {nil}.falthy?                  # Pass
-      ##   ok {false}.falthy?                # Pass
-      ##   ok {true}.falthy?                 # Fail
-      ##   ok {0}.falthy?                    # Fail
-      ##   ok {""}.falthy?                   # Fail
-      ##   ok {[]}.falthy?                   # Fail
+      ##   ok {nil}.falsy?                  # Pass
+      ##   ok {false}.falsy?                # Pass
+      ##   ok {true}.falsy?                 # Fail
+      ##   ok {0}.falsy?                    # Fail
+      ##   ok {""}.falsy?                   # Fail
+      ##   ok {[]}.falsy?                   # Fail
       ##
-      def falthy?
+      def falsy?
         _mark_as_tested()
         unless @not
           @context.refute @actual, Msg.new { "Expected (!! #{@actual.inspect}) == false, but not." }
@@ -554,7 +644,11 @@ module Minitest
           @context.assert @actual, Msg.new { "Expected (!! #{@actual.inspect}) == true, but not." }
         end
         self
+      rescue Minitest::Assertion => ex
+        ex.backtrace.delete_if {|bt| bt.start_with?(__FILE__) }
+        raise
       end
+      alias falthy? falsy?
 
       ##
       ## Tests attribute value.
@@ -574,6 +668,9 @@ module Minitest
         @context.assert_equal expected, actual, Msg.new { pr.call('==') }  unless @not
         @context.refute_equal expected, actual, Msg.new { pr.call('!=') }  if     @not
         self
+      rescue Minitest::Assertion => ex
+        ex.backtrace.delete_if {|bt| bt.start_with?(__FILE__) }
+        raise
       end
 
       ##
@@ -589,6 +686,9 @@ module Minitest
           attr(name, expected)
         end
         self
+      rescue Minitest::Assertion => ex
+        ex.backtrace.delete_if {|bt| bt.start_with?(__FILE__) }
+        raise
       end
 
       ##
@@ -608,6 +708,9 @@ module Minitest
         @context.assert_equal expected, actual, Msg.new { pr.call('==') }  unless @not
         @context.refute_equal expected, actual, Msg.new { pr.call('!=') }  if     @not
         self
+      rescue Minitest::Assertion => ex
+        ex.backtrace.delete_if {|bt| bt.start_with?(__FILE__) }
+        raise
       end
 
       ##
@@ -622,6 +725,9 @@ module Minitest
           item(key, expected)
         end
         self
+      rescue Minitest::Assertion => ex
+        ex.backtrace.delete_if {|bt| bt.start_with?(__FILE__) }
+        raise
       end
 
       ##
@@ -640,6 +746,9 @@ module Minitest
         else
           @context.refute File.exist?(fpath), "File '#{fpath}' exists unexpectedly."
         end
+      rescue Minitest::Assertion => ex
+        ex.backtrace.delete_if {|bt| bt.start_with?(__FILE__) }
+        raise
       end
 
       ##
@@ -658,6 +767,9 @@ module Minitest
         else
           @context.refute File.exist?(fpath),     "Directory '#{fpath}' exists unexpectedly."
         end
+      rescue Minitest::Assertion => ex
+        ex.backtrace.delete_if {|bt| bt.start_with?(__FILE__) }
+        raise
       end
 
       ##
@@ -673,6 +785,9 @@ module Minitest
         @context.assert ! File.exist?(fpath), "'#{fpath}' exists unexpectedly." unless @not
         @context.refute ! File.exist?(fpath), "'#{fpath}' doesn't exist."       if     @not
         self
+      rescue Minitest::Assertion => ex
+        ex.backtrace.delete_if {|bt| bt.start_with?(__FILE__) }
+        raise
       end
 
     end

data/test/minitest/ok_test.rb

@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 
 ###
-### $Release: 0.2.0 $
-### $Copyright: copyright(c) 2015 kuwata-lab.com all rights reserved $
+### $Release: 0.3.3 $
+### $Copyright: copyright(c) 2015-2018 kuwata-lab.com all rights reserved $
 ### $License: MIT License $
 ###
 
@@ -16,7 +16,8 @@ describe Minitest::Ok::AssertionObject do
     begin
       yield
     rescue Exception => ex
-      assert false, "Nothing should not be raised, but #{ex.class} raised.\n[Message] #{ex}"
+      _called = caller(1).grep(/ok_test\.rb/).map {|x| "  - #{x}" }.join("\n")
+      assert false, "Nothing should not be raised, but #{ex.class} raised.\n#{_called}\n[Message] #{ex}"
     end
   end
 
@@ -26,7 +27,8 @@ describe Minitest::Ok::AssertionObject do
     rescue Minitest::Assertion => ex
       return ex
     else
-      assert false, "Assertion should be raised, but nothing raised."
+      _called = caller(1).grep(/ok_test\.rb/).map {|x| "  - #{x}" }.join("\n")
+      assert false, "Assertion should be raised, but nothing raised.\n#{_called}"
     end
   end
 
@@ -170,6 +172,8 @@ describe Minitest::Ok::AssertionObject do
       should_not_raise  { ok {/\d+/ }.NOT === 'abc' }
       ex = should_raise { ok {String}.NOT === '123' }
       msg = 'Expected String to not be === "123".'
+      #msg = ('Expected String to not be === # encoding: UTF-8'+"\n"+
+      #       '"123".')
       assert_equal msg, ex.message
     end
 
@@ -182,6 +186,8 @@ describe Minitest::Ok::AssertionObject do
       should_not_raise  { ok {"hom"} =~ /\w+/ }
       ex = should_raise { ok {"hom"} =~ /\d+/ }
       msg = 'Expected /\d+/ to match "hom".'
+      #msg = ('Expected /\d+/ to match # encoding: UTF-8'+"\n"+
+      #       '"hom".')
       assert_equal msg, ex.message
     end
 
@@ -189,6 +195,8 @@ describe Minitest::Ok::AssertionObject do
       should_not_raise  { ok {"hom"}.NOT =~ /\d+/ }
       ex = should_raise { ok {"hom"}.NOT =~ /\w+/ }
       msg = 'Expected /\w+/ to not match "hom".'
+      #msg = ('Expected /\w+/ to not match # encoding: UTF-8'+"\n"+
+      #       '"hom".')
       assert_equal msg, ex.message
     end
 
@@ -201,6 +209,8 @@ describe Minitest::Ok::AssertionObject do
       should_not_raise  { ok {"hom"} !~ /\d+/ }
       ex = should_raise { ok {"hom"} !~ /\w+/ }
       msg = 'Expected /\w+/ to not match "hom".'
+      #msg = ('Expected /\w+/ to not match # encoding: UTF-8'+"\n"+
+      #       '"hom".')
       assert_equal msg, ex.message
     end
 
@@ -208,6 +218,8 @@ describe Minitest::Ok::AssertionObject do
       should_not_raise  { ok {"hom"}.NOT !~ /\w+/ }
       ex = should_raise { ok {"hom"}.NOT !~ /\d+/ }
       msg = 'Expected /\d+/ to match "hom".'
+      #msg = ('Expected /\d+/ to match # encoding: UTF-8'+"\n"+
+      #       '"hom".')
       assert_equal msg, ex.message
     end
 
@@ -220,6 +232,8 @@ describe Minitest::Ok::AssertionObject do
       should_not_raise  { ok {"hom"}.is_a?(String) }
       ex = should_raise { ok {"hom"}.is_a?(Array)  }
       msg = 'Expected "hom" to be a kind of Array, not String.'
+      #msg = ('Expected # encoding: UTF-8'+"\n"+
+      #       '"hom" to be a kind of Array, not String.')
       assert_equal msg, ex.message
     end
 
@@ -227,6 +241,8 @@ describe Minitest::Ok::AssertionObject do
       should_not_raise  { ok {"hom"}.NOT.is_a?(Array) }
       ex = should_raise { ok {"hom"}.NOT.is_a?(String) }
       msg = 'Expected "hom" to not be a kind of String.'
+      #msg = ('Expected # encoding: UTF-8'+"\n"+
+      #       '"hom" to not be a kind of String.')
       assert_equal msg, ex.message
     end
 
@@ -239,6 +255,8 @@ describe Minitest::Ok::AssertionObject do
       should_not_raise  { ok {"hom"}.kind_of?(String) }
       ex = should_raise { ok {"hom"}.kind_of?(Array)  }
       msg = 'Expected "hom" to be a kind of Array, not String.'
+      #msg = ('Expected # encoding: UTF-8'+"\n"+
+      #       '"hom" to be a kind of Array, not String.')
       assert_equal msg, ex.message
     end
 
@@ -246,6 +264,8 @@ describe Minitest::Ok::AssertionObject do
       should_not_raise  { ok {"hom"}.NOT.kind_of?(Array) }
       ex = should_raise { ok {"hom"}.NOT.kind_of?(String) }
       msg = 'Expected "hom" to not be a kind of String.'
+      #msg = ('Expected # encoding: UTF-8'+"\n"+
+      #       '"hom" to not be a kind of String.')
       assert_equal msg, ex.message
     end
 
@@ -255,16 +275,16 @@ describe Minitest::Ok::AssertionObject do
   describe '#instance_of?' do
 
     it "calls assert_instance_of()." do
-      should_not_raise  { ok {123}.instance_of?(Fixnum)  }
-      ex = should_raise { ok {123}.instance_of?(Integer) }
-      msg = 'Expected 123 to be an instance of Integer, not Fixnum.'
+      should_not_raise  { ok {1.23}.instance_of?(Float)  }
+      ex = should_raise { ok {1.23}.instance_of?(Integer) }
+      msg = 'Expected 1.23 to be an instance of Integer, not Float.'
       assert_equal msg, ex.message
     end
 
     it "calls refute_instance_of() after NOT() called." do
-      should_not_raise  { ok {123}.NOT.instance_of?(Integer) }
-      ex = should_raise { ok {123}.NOT.instance_of?(Fixnum)  }
-      msg = 'Expected 123 to not be an instance of Fixnum.'
+      should_not_raise  { ok {1.23}.NOT.instance_of?(Integer) }
+      ex = should_raise { ok {1.23}.NOT.instance_of?(Float)  }
+      msg = 'Expected 1.23 to not be an instance of Float.'
       assert_equal msg, ex.message
     end
 
@@ -371,14 +391,29 @@ describe Minitest::Ok::AssertionObject 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\""
+      #expected = "Expected: \"foobar\"\n  Actual: \"divided by 0\""
+      expected = [
+        '--- expected',
+        '+++ actual',
+       #'@@ -1,2 +1,2 @@',
+       #'-# encoding: UTF-8',
+        '@@ -1 +1,3 @@',
+        '-"foobar"',
+        '+# encoding: ASCII-8BIT',
+        '+#    valid: true',
+        '+"divided by 0"',
+        '',
+      ].join("\n")
       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\"."
+      #expected = "Expected /by 99/ to match \"divided by 0\"."
+      expected = ('Expected /by 99/ to match # encoding: ASCII-8BIT'+"\n"+
+                  '#    valid: true'+"\n"+
+                  '"divided by 0".')
       assert_equal expected, ex.message
     end
 
@@ -413,14 +448,14 @@ describe Minitest::Ok::AssertionObject do
     it "calls assert_respond_to()." do
       should_not_raise  { ok {[1]}.respond_to?(:each) }
       ex = should_raise { ok {123}.respond_to?(:each) }
-      msg = "Expected 123 (Fixnum) to respond to #each."
+      msg = "Expected 123 (#{1.class}) to respond to #each."
       assert_equal msg, ex.message
     end
 
     it "calls refute_respond_to() after NOT() called." do
       should_not_raise  { ok {[1]}.respond_to?(:each) }
       ex = should_raise { ok {123}.respond_to?(:each) }
-      msg = "Expected 123 (Fixnum) to respond to #each."
+      msg = "Expected 123 (#{1.class}) to respond to #each."
       assert_equal msg, ex.message
     end
 
@@ -470,10 +505,22 @@ describe Minitest::Ok::AssertionObject do
     it "calls assert_output()." do
       should_not_raise  { ok {proc {puts 123}}.output?("123\n", "") }
       ex = should_raise { ok {proc {puts 123}}.output?("", "123\n") }
+      #msg = [
+      #  'In stderr.',
+      #  '--- expected',
+      #  '+++ actual',
+      #  '@@ -1,2 +1 @@',
+      #  '-"123',
+      #  '-"',
+      #  '+""',
+      #  '',
+      #].join("\n")
       msg = [
         'In stderr.',
         '--- expected',
         '+++ actual',
+       #'@@ -1,3 +1 @@',
+       #'-# encoding: UTF-8',
         '@@ -1,2 +1 @@',
         '-"123',
         '-"',
@@ -499,10 +546,22 @@ describe Minitest::Ok::AssertionObject do
     it "calls assert_silent()." do
       should_not_raise  { ok {proc {nil}}.silent? }
       ex = should_raise { ok {proc {puts 123}}.silent? }
+      #msg = [
+      #  'In stdout.',
+      #  '--- expected',
+      #  '+++ actual',
+      #  '@@ -1 +1,2 @@',
+      #  '-""',
+      #  '+"123',
+      #  '+"',
+      #  '',
+      #].join("\n")
       msg = [
         'In stdout.',
         '--- expected',
         '+++ actual',
+       #'@@ -1,2 +1,2 @@',
+       #'-# encoding: UTF-8',
         '@@ -1 +1,2 @@',
         '-""',
         '+"123',
@@ -529,6 +588,8 @@ describe Minitest::Ok::AssertionObject do
       should_not_raise  { ok {"".freeze}.frozen? }
       ex = should_raise { ok {"".dup() }.frozen? }
       msg = 'Expected "" to be frozen?.'
+      #msg = ('Expected # encoding: UTF-8'+"\n"+
+      #       '"" to be frozen?.')
       assert_equal msg, ex.message
     end
 
@@ -536,6 +597,8 @@ describe Minitest::Ok::AssertionObject do
       should_not_raise  { ok {"".dup() }.NOT.frozen? }
       ex = should_raise { ok {"".freeze}.NOT.frozen? }
       msg = 'Expected "" to not be frozen?.'
+      #msg = ('Expected # encoding: UTF-8'+"\n"+
+      #       '"" to not be frozen?.')
       assert_equal msg, ex.message
     end
 
@@ -545,16 +608,16 @@ describe Minitest::Ok::AssertionObject do
   describe '#tainted?' do
 
     it "calls assert_predicate()." do
-      should_not_raise  { ok {"".taint}.tainted? }
-      ex = should_raise { ok {"".dup()}.tainted? }
-      msg = 'Expected "" to be tainted?.'
+      should_not_raise  { ok {[ ]}.empty? }
+      ex = should_raise { ok {[1]}.empty? }
+      msg = "Expected [1] to be empty."
       assert_equal msg, ex.message
     end
 
     it "calls refute_predicate() after NOT() called." do
-      should_not_raise  { ok {"".dup()}.NOT.tainted? }
-      ex = should_raise { ok {"".taint}.NOT.tainted? }
-      msg = 'Expected "" to not be tainted?.'
+      should_not_raise  { ok {[1]}.NOT.empty? }
+      ex = should_raise { ok {[ ]}.NOT.empty? }
+      msg = "Expected [] to not be empty."
       assert_equal msg, ex.message
     end
 
@@ -596,7 +659,7 @@ describe Minitest::Ok::AssertionObject do
         (x = ok {nil}).append('bar')
       end
       x._mark_as_tested()
-      msg = /^undefined method `append' for \#<Mini[tT]est::Ok::AssertionObject:\w+>$/
+      msg = /^undefined method `append' for \#<Mini[tT]est::Ok::AssertionObject:\w+/
       assert_match msg, ex.message
       #
       ex = assert_raises(NoMethodError) do
@@ -673,18 +736,18 @@ describe Minitest::Ok::AssertionObject do
   end
 
 
-  describe '#falthy?' do
+  describe '#falsy?' do
 
     it "calles refute()." do
-      should_not_raise  { ok {nil}.falthy? }
-      ex = should_raise { ok {123}.falthy? }
+      should_not_raise  { ok {nil}.falsy? }
+      ex = should_raise { ok {123}.falsy? }
       msg = 'Expected (!! 123) == false, but not.'
       assert_equal msg, ex.message
     end
 
     it "calles assert() after NOT() called." do
-      should_not_raise  { ok {123}.NOT.falthy? }
-      ex = should_raise { ok {nil}.NOT.falthy? }
+      should_not_raise  { ok {123}.NOT.falsy? }
+      ex = should_raise { ok {nil}.NOT.falsy? }
       msg = 'Expected (!! nil) == true, but not.'
       assert_equal msg, ex.message
     end
@@ -694,7 +757,7 @@ describe Minitest::Ok::AssertionObject do
 
   describe '#attr' do
 
-    class User
+    class User1
       def initialize(name, age)
         @name, @age = name, age
       end
@@ -702,24 +765,24 @@ describe Minitest::Ok::AssertionObject do
     end
 
     it "calles assert_equal()." do
-      user = User.new('Haruhi', 16)
+      user = User1.new('Haruhi', 16)
       should_not_raise  { ok {user}.attr(:name, 'Haruhi').attr(:age, 16) }
       ex = should_raise { ok {user}.attr(:name, 'Haruhi').attr(:age, 12) }
       msg = ("Expected <object>.age == <exected>, but failed.\n" +
-             " (object: #<User:0xXXXXXX @name=\"Haruhi\", @age=16>).\n" +
+             " (object: #<User1:0xXXXXXX @name=\"Haruhi\", @age=16>).\n" +
              "Expected: 12\n" +
              "  Actual: 16")
-      assert_equal msg, ex.message.gsub(/<User:0x\w+/, '<User:0xXXXXXX')
+      assert_equal msg, ex.message.gsub(/<User1:0x\w+/, '<User1:0xXXXXXX')
     end
 
     it "calles refute_equal() after NOT() called." do
-      user = User.new('Haruhi', 16)
+      user = User1.new('Haruhi', 16)
       should_not_raise  { ok {user}.NOT.attr(:name, 'Suzumiya').attr(:age, 12) }
       ex = should_raise { ok {user}.NOT.attr(:name, 'Suzumiya').attr(:age, 16) }
       msg = ("Expected <object>.age != <exected>, but failed.\n" +
-             " (object: #<User:0xXXXXXX @name=\"Haruhi\", @age=16>).\n" +
+             " (object: #<User1:0xXXXXXX @name=\"Haruhi\", @age=16>).\n" +
              "Expected 16 to not be equal to 16.")
-      assert_equal msg, ex.message.gsub(/<User:0x\w+/, '<User:0xXXXXXX')
+      assert_equal msg, ex.message.gsub(/<User1:0x\w+/, '<User1:0xXXXXXX')
     end
 
   end
@@ -727,7 +790,7 @@ describe Minitest::Ok::AssertionObject do
 
   describe '#attrs' do
 
-    class User
+    class User2
       def initialize(name, age)
         @name, @age = name, age
       end
@@ -735,24 +798,24 @@ describe Minitest::Ok::AssertionObject do
     end
 
     it "calles assert_equal()." do
-      user = User.new('Haruhi', 16)
+      user = User2.new('Haruhi', 16)
       should_not_raise  { ok {user}.attrs(name: 'Haruhi', age: 16) }
       ex = should_raise { ok {user}.attrs(name: 'Haruhi', age: 12) }
       msg = ("Expected <object>.age == <exected>, but failed.\n" +
-             " (object: #<User:0xXXXXXX @name=\"Haruhi\", @age=16>).\n" +
+             " (object: #<User2:0xXXXXXX @name=\"Haruhi\", @age=16>).\n" +
              "Expected: 12\n" +
              "  Actual: 16")
-      assert_equal msg, ex.message.gsub(/<User:0x\w+/, '<User:0xXXXXXX')
+      assert_equal msg, ex.message.gsub(/<User2:0x\w+/, '<User2:0xXXXXXX')
     end
 
     it "calles refute_equal() after NOT() called." do
-      user = User.new('Haruhi', 16)
+      user = User2.new('Haruhi', 16)
       should_not_raise  { ok {user}.NOT.attrs(name: 'Suzumiya', age: 12) }
       ex = should_raise { ok {user}.NOT.attrs(name: 'Suzumiya', age: 16) }
       msg = ("Expected <object>.age != <exected>, but failed.\n" +
-             " (object: #<User:0xXXXXXX @name=\"Haruhi\", @age=16>).\n" +
+             " (object: #<User2:0xXXXXXX @name=\"Haruhi\", @age=16>).\n" +
              "Expected 16 to not be equal to 16.")
-      assert_equal msg, ex.message.gsub(/<User:0x\w+/, '<User:0xXXXXXX')
+      assert_equal msg, ex.message.gsub(/<User2:0x\w+/, '<User2:0xXXXXXX')
     end
 
   end

data/test/test_helper.rb

@@ -1,8 +1,8 @@
 # -*- coding: utf-8 -*-
 
 ###
-### $Release: 0.2.0 $
-### $Copyright: copyright(c) 2015 kuwata-lab.com all rights reserved $
+### $Release: 0.3.3 $
+### $Copyright: copyright(c) 2015-2018 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.2.0
+  version: 0.3.3
 platform: ruby
 authors:
 - makoto kuwata
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-06 00:00:00.000000000 Z
+date: 2021-08-01 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:
-- README.md
 - MIT-LICENSE
+- README.md
 - Rakefile
 - lib/minitest/ok.rb
-- test/test_helper.rb
 - test/minitest/ok_test.rb
+- test/test_helper.rb
 homepage: https://github.com/kwatch/minitest-ok
 licenses:
 - MIT-License
@@ -54,18 +54,17 @@ 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.0.14.1
+rubygems_version: 3.1.2
 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: []