assert 2.4.0 → 2.5.0

data/test/unit/assertions/assert_equal_tests.rb

@@ -9,11 +9,12 @@ module Assert::Assertions
     desc "`assert_equal`"
     setup do
       desc = @desc = "assert equal fail desc"
-      args = @args = [ '1', '2', desc ]
+      a = @a = [ '1', '2', desc ]
       @test = Factory.test do
-        assert_equal(1, 1)   # pass
-        assert_equal(*args)  # fail
+        assert_equal(1, 1) # pass
+        assert_equal(*a)   # fail
       end
+      @c = @test.config
       @test.run
     end
     subject{ @test }
@@ -25,7 +26,8 @@ module Assert::Assertions
     end
 
     should "have a fail message with custom and generic explanations" do
-      exp = "#{@args[2]}\nExpected #{Assert::U.show(@args[0])}, not #{Assert::U.show(@args[1])}."
+      exp = "#{@a[2]}\nExpected #{Assert::U.show(@a[1], @c)}"\
+            " to be equal to #{Assert::U.show(@a[0], @c)}."
       assert_equal exp, subject.fail_results.first.message
     end
 
@@ -35,11 +37,12 @@ module Assert::Assertions
     desc "`assert_not_equal`"
     setup do
       desc = @desc = "assert not equal fail desc"
-      args = @args = [ '1', '1', desc ]
+      a = @a = [ '1', '1', desc ]
       @test = Factory.test do
-        assert_not_equal(*args)  # fail
-        assert_not_equal(1, 2)   # pass
+        assert_not_equal(*a)   # fail
+        assert_not_equal(1, 2) # pass
       end
+      @c = @test.config
       @test.run
     end
     subject{ @test }
@@ -51,8 +54,8 @@ module Assert::Assertions
     end
 
     should "have a fail message with custom and generic explanations" do
-      exp = "#{@args[2]}\n"\
-            "#{Assert::U.show(@args[1])} not expected to equal #{Assert::U.show(@args[0])}."
+      exp = "#{@a[2]}\nExpected #{Assert::U.show(@a[1], @c)}"\
+            " to not be equal to #{Assert::U.show(@a[0], @c)}."
       assert_equal exp, subject.fail_results.first.message
     end
 
@@ -64,18 +67,12 @@ module Assert::Assertions
       @exp_obj = "I'm a\nstring"
       @act_obj = "I am a \nstring"
 
-      @exp_obj_show = Assert::U.show_for_diff(@exp_obj)
-      @act_obj_show = Assert::U.show_for_diff(@act_obj)
+      @c = Factory.modes_off_config
+      @c.use_diff_proc(Assert::U.default_use_diff_proc)
+      @c.run_diff_proc(Assert::U.syscmd_diff_proc)
 
-      @orig_use_diff_proc = Assert.config.use_diff_proc
-      @orig_run_diff_proc = Assert.config.run_diff_proc
-
-      Assert.config.use_diff_proc(Assert::U.default_use_diff_proc)
-      Assert.config.run_diff_proc(Assert::U.syscmd_diff_proc)
-    end
-    teardown do
-      Assert.config.use_diff_proc(@orig_use_diff_proc)
-      Assert.config.run_diff_proc(@orig_run_diff_proc)
+      @exp_obj_show = Assert::U.show_for_diff(@exp_obj, @c)
+      @act_obj_show = Assert::U.show_for_diff(@act_obj, @c)
     end
 
   end
@@ -84,7 +81,7 @@ module Assert::Assertions
     desc "`assert_equal`"
     setup do
       exp_obj, act_obj = @exp_obj, @act_obj
-      @test = Factory.test do
+      @test = Factory.test(@c) do
         assert_equal(exp_obj, act_obj)
       end
       @test.run
@@ -103,7 +100,7 @@ module Assert::Assertions
     desc "`assert_not_equal`"
     setup do
       exp_obj, act_obj = @exp_obj, @act_obj
-      @test = Factory.test do
+      @test = Factory.test(@c) do
         assert_not_equal(exp_obj, exp_obj)
       end
       @test.run

data/test/unit/assertions/assert_file_exists_tests.rb

@@ -6,7 +6,7 @@ require 'assert/utils'
 module Assert::Assertions
 
   class AssertFileExistsTests < Assert::Context
-    desc "the assert_file_exists helper"
+    desc "`assert_file_exists`"
     setup do
       desc = @desc = "assert file exists empty fail desc"
       args = @args = [ '/a/path/to/some/file/that/no/exists', desc ]
@@ -14,6 +14,7 @@ module Assert::Assertions
         assert_file_exists(__FILE__) # pass
         assert_file_exists(*args)    # fail
       end
+      @c = @test.config
       @test.run
     end
     subject{ @test }
@@ -25,14 +26,14 @@ module Assert::Assertions
     end
 
     should "have a fail message with custom and generic explanations" do
-      exp = "#{@args[1]}\nExpected #{Assert::U.show(@args[0])} to exist."
+      exp = "#{@args[1]}\nExpected #{Assert::U.show(@args[0], @c)} to exist."
       assert_equal exp, subject.fail_results.first.message
     end
 
   end
 
   class AssertNotFileExistsTests < Assert::Context
-    desc "the assert_not_file_exists helper"
+    desc "`assert_not_file_exists`"
     setup do
       desc = @desc = "assert not file exists empty fail desc"
       args = @args = [ __FILE__, desc ]
@@ -40,6 +41,7 @@ module Assert::Assertions
         assert_not_file_exists('/a/path/to/some/file/that/no/exists') # pass
         assert_not_file_exists(*args) # fail
       end
+      @c = @test.config
       @test.run
     end
     subject{ @test }
@@ -51,7 +53,7 @@ module Assert::Assertions
     end
 
     should "have a fail message with custom and generic explanations" do
-      exp = "#{@args[1]}\nExpected #{Assert::U.show(@args[0])} to not exist."
+      exp = "#{@args[1]}\nExpected #{Assert::U.show(@args[0], @c)} to not exist."
       assert_equal exp, subject.fail_results.first.message
     end
 

data/test/unit/assertions/assert_includes_tests.rb

@@ -6,7 +6,7 @@ require 'assert/utils'
 module Assert::Assertions
 
   class AssertIncludesTests < Assert::Context
-    desc "the assert_includes helper"
+    desc "`assert_includes`"
     setup do
       desc = @desc = "assert includes fail desc"
       args = @args = [ 2, [ 1 ], desc ]
@@ -14,6 +14,7 @@ module Assert::Assertions
         assert_includes(1, [ 1 ]) # pass
         assert_includes(*args)    # fail
       end
+      @c = @test.config
       @test.run
     end
     subject{ @test }
@@ -26,14 +27,15 @@ module Assert::Assertions
 
     should "have a fail message with custom and generic explanations" do
       exp = "#{@args[2]}\n"\
-            "Expected #{Assert::U.show(@args[1])} to include #{Assert::U.show(@args[0])}."
+            "Expected #{Assert::U.show(@args[1], @c)}"\
+            " to include #{Assert::U.show(@args[0], @c)}."
       assert_equal exp, subject.fail_results.first.message
     end
 
   end
 
   class AssertNotIncluded < Assert::Context
-    desc "the assert_not_included helper"
+    desc "`assert_not_included`"
     setup do
       desc = @desc = "assert not included fail desc"
       args = @args = [ 1, [ 1 ], desc ]
@@ -41,6 +43,7 @@ module Assert::Assertions
         assert_not_included(2, [ 1 ]) # pass
         assert_not_included(*args)    # fail
       end
+      @c = @test.config
       @test.run
     end
     subject{ @test }
@@ -53,7 +56,8 @@ module Assert::Assertions
 
     should "have a fail message with custom and generic explanations" do
       exp = "#{@args[2]}\n"\
-            "Expected #{Assert::U.show(@args[1])} to not include #{Assert::U.show(@args[0])}."
+            "Expected #{Assert::U.show(@args[1], @c)}"\
+            " to not include #{Assert::U.show(@args[0], @c)}."
       assert_equal exp, subject.fail_results.first.message
     end
 

data/test/unit/assertions/assert_instance_of_tests.rb

@@ -6,7 +6,7 @@ require 'assert/utils'
 module Assert::Assertions
 
   class AssertInstanceOfTests < Assert::Context
-    desc "the assert_instance_of helper"
+    desc "`assert_instance_of`"
     setup do
       desc = @desc = "assert instance of fail desc"
       args = @args = [ Array, "object", desc ]
@@ -14,6 +14,7 @@ module Assert::Assertions
         assert_instance_of(String, "object") # pass
         assert_instance_of(*args)            # fail
       end
+      @c = @test.config
       @test.run
     end
     subject{ @test }
@@ -25,15 +26,15 @@ module Assert::Assertions
     end
 
     should "have a fail message with custom and generic explanations" do
-      exp = "#{@args[2]}\nExpected #{Assert::U.show(@args[1])} (#{@args[1].class}) to"\
-            " be an instance of #{@args[0]}."
+      exp = "#{@args[2]}\nExpected #{Assert::U.show(@args[1], @c)} (#{@args[1].class})"\
+            " to be an instance of #{@args[0]}."
       assert_equal exp, subject.fail_results.first.message
     end
 
   end
 
   class AssertNotInstanceOfTests < Assert::Context
-    desc "the assert_not_instance_of helper"
+    desc "`assert_not_instance_of`"
     setup do
       desc = @desc = "assert not instance of fail desc"
       args = @args = [ String, "object", desc ]
@@ -41,6 +42,7 @@ module Assert::Assertions
         assert_not_instance_of(*args)           # fail
         assert_not_instance_of(Array, "object") # pass
       end
+      @c = @test.config
       @test.run
     end
     subject{ @test }
@@ -52,8 +54,8 @@ module Assert::Assertions
     end
 
     should "have a fail message with custom and generic explanations" do
-      exp = "#{@args[2]}\n#{Assert::U.show(@args[1])} (#{@args[1].class}) not expected to"\
-            " be an instance of #{@args[0]}."
+      exp = "#{@args[2]}\nExpected #{Assert::U.show(@args[1], @c)} (#{@args[1].class})"\
+            " to not be an instance of #{@args[0]}."
       assert_equal exp, subject.fail_results.first.message
     end
 

data/test/unit/assertions/assert_kind_of_tests.rb

@@ -6,7 +6,7 @@ require 'assert/utils'
 module Assert::Assertions
 
   class AssertKindOfTests < Assert::Context
-    desc "the assert_kind_of helper"
+    desc "`assert_kind_of`"
     setup do
       desc = @desc = "assert kind of fail desc"
       args = @args = [ Array, "object", desc ]
@@ -14,6 +14,7 @@ module Assert::Assertions
         assert_kind_of(String, "object") # pass
         assert_kind_of(*args)            # fail
       end
+      @c = @test.config
       @test.run
     end
     subject{ @test }
@@ -25,15 +26,15 @@ module Assert::Assertions
     end
 
     should "have a fail message with custom and generic explanations" do
-      exp = "#{@args[2]}\nExpected #{Assert::U.show(@args[1])} (#{@args[1].class}) to"\
-            " be a kind of #{@args[0]}."
+      exp = "#{@args[2]}\nExpected #{Assert::U.show(@args[1], @c)} (#{@args[1].class})"\
+            " to be a kind of #{@args[0]}."
       assert_equal exp, subject.fail_results.first.message
     end
 
   end
 
   class AssertNotKindOfTests < Assert::Context
-    desc "the assert_not_kind_of helper"
+    desc "`assert_not_kind_of`"
     setup do
       desc = @desc = "assert not kind of fail desc"
       args = @args = [ String, "object", desc ]
@@ -41,6 +42,7 @@ module Assert::Assertions
         assert_not_kind_of(*args)           # fail
         assert_not_kind_of(Array, "object") # pass
       end
+      @c = @test.config
       @test.run
     end
     subject{ @test }
@@ -52,7 +54,8 @@ module Assert::Assertions
     end
 
     should "have a fail message with custom and generic explanations" do
-      exp = "#{@args[2]}\n#{Assert::U.show(@args[1])} not expected to be a kind of #{@args[0]}."
+      exp = "#{@args[2]}\nExpected #{Assert::U.show(@args[1], @c)} (#{@args[1].class})"\
+            " to not be a kind of #{@args[0]}."
       assert_equal exp, subject.fail_results.first.message
     end
 

data/test/unit/assertions/assert_match_tests.rb

@@ -6,7 +6,7 @@ require 'assert/utils'
 module Assert::Assertions
 
   class AssertMatchTests < Assert::Context
-    desc "the assert_match helper"
+    desc "`assert_match`"
     setup do
       desc = @desc = "assert match fail desc"
       args = @args = [ "not", "a string", desc ]
@@ -14,6 +14,7 @@ module Assert::Assertions
         assert_match(/a/, "a string") # pass
         assert_match(*args)           # fail
       end
+      @c = @test.config
       @test.run
     end
     subject{ @test }
@@ -25,14 +26,15 @@ module Assert::Assertions
     end
 
     should "have a fail message with custom and generic explanations" do
-      exp = "#{@args[2]}\nExpected #{Assert::U.show(@args[1])} to match #{Assert::U.show(@args[0])}."
+      exp = "#{@args[2]}\nExpected #{Assert::U.show(@args[1], @c)}"\
+            " to match #{Assert::U.show(@args[0], @c)}."
       assert_equal exp, subject.fail_results.first.message
     end
 
   end
 
   class AssertNotMatchTests < Assert::Context
-    desc "the assert_not_match helper"
+    desc "`assert_not_match`"
     setup do
       desc = @desc = "assert not match fail desc"
       args = @args = [ /a/, "a string", desc ]
@@ -40,6 +42,7 @@ module Assert::Assertions
         assert_not_match(*args)             # fail
         assert_not_match("not", "a string") # pass
       end
+      @c = @test.config
       @test.run
     end
     subject{ @test }
@@ -51,7 +54,8 @@ module Assert::Assertions
     end
 
     should "have a fail message with custom and generic explanations" do
-      exp = "#{@args[2]}\n#{Assert::U.show(@args[1])} not expected to match #{Assert::U.show(@args[0])}."
+      exp = "#{@args[2]}\nExpected #{Assert::U.show(@args[1], @c)}"\
+            " to not match #{Assert::U.show(@args[0], @c)}."
       assert_equal exp, subject.fail_results.first.message
     end
 

data/test/unit/assertions/assert_nil_tests.rb

@@ -6,7 +6,7 @@ require 'assert/utils'
 module Assert::Assertions
 
   class AssertNilTests < Assert::Context
-    desc "the assert_nil helper"
+    desc "`assert_nil`"
     setup do
       desc = @desc = "assert nil empty fail desc"
       args = @args = [ 1, desc ]
@@ -14,6 +14,7 @@ module Assert::Assertions
         assert_nil(nil)   # pass
         assert_nil(*args) # fail
       end
+      @c = @test.config
       @test.run
     end
     subject{ @test }
@@ -25,14 +26,14 @@ module Assert::Assertions
     end
 
     should "have a fail message with custom and generic explanations" do
-      exp = "#{@args[1]}\nExpected nil, not #{Assert::U.show(@args[0])}."
+      exp = "#{@args[1]}\nExpected #{Assert::U.show(@args[0], @c)} to be nil."
       assert_equal exp, subject.fail_results.first.message
     end
 
   end
 
   class AssertNotNilTests < Assert::Context
-    desc "the assert_not_nil helper"
+    desc "`assert_not_nil`"
     setup do
       desc = @desc = "assert not nil empty fail desc"
       args = @args = [ nil, desc ]
@@ -40,6 +41,7 @@ module Assert::Assertions
         assert_not_nil(1)     # pass
         assert_not_nil(*args) # fail
       end
+      @c = @test.config
       @test.run
     end
     subject{ @test }
@@ -51,7 +53,7 @@ module Assert::Assertions
     end
 
     should "have a fail message with custom and generic explanations" do
-      exp = "#{@args[1]}\nExpected #{Assert::U.show(@args[0])} to not be nil."
+      exp = "#{@args[1]}\nExpected #{Assert::U.show(@args[0], @c)} to not be nil."
       assert_equal exp, subject.fail_results.first.message
     end
 

data/test/unit/assertions/assert_raises_tests.rb

@@ -4,7 +4,7 @@ require 'assert/assertions'
 module Assert::Assertions
 
   class AssertRaisesTests < Assert::Context
-    desc "the assert_raises helper"
+    desc "`assert_raises`"
     setup do
       d = @d = "assert raises fail desc"
       @test = Factory.test do
@@ -38,7 +38,7 @@ module Assert::Assertions
   end
 
   class AssertNothingRaisedTests < Assert::Context
-    desc "the assert_nothing_raised helper"
+    desc "`assert_nothing_raised`"
     setup do
       d = @d = "assert nothing raised fail desc"
       @test = Factory.test do

data/test/unit/assertions/assert_respond_to_tests.rb

@@ -6,7 +6,7 @@ require 'assert/utils'
 module Assert::Assertions
 
   class AssertRespondToTest < Assert::Context
-    desc "the assert_respond_to helper"
+    desc "`assert_respond_to`"
     setup do
       desc = @desc = "assert respond to fail desc"
       args = @args = [ :abs, "1", desc ]
@@ -14,6 +14,7 @@ module Assert::Assertions
         assert_respond_to(:abs, 1) # pass
         assert_respond_to(*args)   # fail
       end
+      @c = @test.config
       @test.run
     end
     subject{ @test }
@@ -26,7 +27,7 @@ module Assert::Assertions
 
     should "have a fail message with custom and generic explanations" do
       exp = "#{@args[2]}\n"\
-            "Expected #{Assert::U.show(@args[1])} (#{@args[1].class})"\
+            "Expected #{Assert::U.show(@args[1], @c)} (#{@args[1].class})"\
             " to respond to `#{@args[0]}`."
       assert_equal exp, subject.fail_results.first.message
     end
@@ -34,7 +35,7 @@ module Assert::Assertions
   end
 
   class AssertNotRespondToTests < Assert::Context
-    desc "the assert_not_respond_to helper"
+    desc "`assert_not_respond_to`"
     setup do
       desc = @desc = "assert not respond to fail desc"
       args = @args = [ :abs, 1, desc ]
@@ -42,6 +43,7 @@ module Assert::Assertions
         assert_not_respond_to(*args)     # fail
         assert_not_respond_to(:abs, "1") # pass
       end
+      @c = @test.config
       @test.run
     end
     subject{ @test }
@@ -54,8 +56,8 @@ module Assert::Assertions
 
     should "have a fail message with custom and generic explanations" do
       exp = "#{@args[2]}\n"\
-            "#{Assert::U.show(@args[1])} (#{@args[1].class})"\
-            " not expected to respond to `#{@args[0]}`."
+            "Expected #{Assert::U.show(@args[1], @c)} (#{@args[1].class})"\
+            " to not respond to `#{@args[0]}`."
       assert_equal exp, subject.fail_results.first.message
     end