assert 2.17.0 → 2.18.4

data/test/unit/assertions/assert_includes_tests.rb

@@ -4,68 +4,65 @@ require "assert/assertions"
 require "assert/utils"
 
 module Assert::Assertions
-
   class AssertIncludesTests < Assert::Context
     include Assert::Test::TestHelpers
 
     desc "`assert_includes`"
-    setup do
-      desc = @desc = "assert includes fail desc"
-      args = @args = [2, [1], desc]
-      @test = Factory.test do
+    subject {
+      args = args1
+      Factory.test do
         assert_includes(1, [1]) # pass
-        assert_includes(*args)    # fail
+        assert_includes(*args)  # fail
       end
-      @c = @test.config
-      @test.run(&test_run_callback)
-    end
-    subject{ @test }
+    }
+
+    let(:desc1) { "assert includes fail desc" }
+    let(:args1) { [2, [1], desc1] }
+    let(:config1) { subject.config }
 
     should "produce results as expected" do
-      assert_equal 2, test_run_result_count
-      assert_equal 1, test_run_result_count(:pass)
-      assert_equal 1, test_run_result_count(:fail)
-    end
+      subject.run(&test_run_callback)
 
-    should "have a fail message with custom and generic explanations" do
-      exp = "#{@args[2]}\n"\
-            "Expected #{Assert::U.show(@args[1], @c)}"\
-            " to include #{Assert::U.show(@args[0], @c)}."
-      assert_equal exp, test_run_results(:fail).first.message
-    end
+      assert_that(test_run_result_count).equals(2)
+      assert_that(test_run_result_count(:pass)).equals(1)
+      assert_that(test_run_result_count(:fail)).equals(1)
 
+      exp =
+        "#{args1[2]}\n"\
+        "Expected #{Assert::U.show(args1[1], config1)}"\
+        " to include #{Assert::U.show(args1[0], config1)}."
+      assert_that(test_run_results(:fail).first.message).equals(exp)
+    end
   end
 
   class AssertNotIncludedTests < Assert::Context
     include Assert::Test::TestHelpers
 
     desc "`assert_not_included`"
-    setup do
-      desc = @desc = "assert not included fail desc"
-      args = @args = [1, [1], desc]
-      @test = Factory.test do
+    subject {
+      args = args1
+      Factory.test do
         assert_not_included(2, [1]) # pass
-        assert_not_included(*args)    # fail
+        assert_not_included(*args)  # fail
       end
-      @c = @test.config
-      @test.run(&test_run_callback)
-    end
-    subject{ @test }
+    }
+
+    let(:desc1) { "assert not included fail desc" }
+    let(:args1) { [1, [1], desc1] }
+    let(:config1) { subject.config }
 
     should "produce results as expected" do
-      assert_equal 2, test_run_result_count
-      assert_equal 1, test_run_result_count(:pass)
-      assert_equal 1, test_run_result_count(:fail)
-    end
+      subject.run(&test_run_callback)
 
-    should "have a fail message with custom and generic explanations" do
-      exp = "#{@args[2]}\n"\
-            "Expected #{Assert::U.show(@args[1], @c)}"\
-            " to not include #{Assert::U.show(@args[0], @c)}."
-      assert_equal exp, test_run_results(:fail).first.message
-    end
+      assert_that(test_run_result_count).equals(2)
+      assert_that(test_run_result_count(:pass)).equals(1)
+      assert_that(test_run_result_count(:fail)).equals(1)
 
+      exp =
+        "#{args1[2]}\n"\
+        "Expected #{Assert::U.show(args1[1], config1)}"\
+        " to not include #{Assert::U.show(args1[0], config1)}."
+      assert_that(test_run_results(:fail).first.message).equals(exp)
+    end
   end
-
 end
-

data/test/unit/assertions/assert_instance_of_tests.rb

@@ -4,66 +4,63 @@ require "assert/assertions"
 require "assert/utils"
 
 module Assert::Assertions
-
   class AssertInstanceOfTests < Assert::Context
     include Assert::Test::TestHelpers
 
     desc "`assert_instance_of`"
-    setup do
-      desc = @desc = "assert instance of fail desc"
-      args = @args = [Array, "object", desc]
-      @test = Factory.test do
+    subject {
+      args = args1
+      Factory.test do
         assert_instance_of(String, "object") # pass
         assert_instance_of(*args)            # fail
       end
-      @c = @test.config
-      @test.run(&test_run_callback)
-    end
-    subject{ @test }
+    }
+
+    let(:desc1) { "assert instance of fail desc" }
+    let(:args1) { [Array, "object", desc1] }
+    let(:config1) { subject.config }
 
     should "produce results as expected" do
-      assert_equal 2, test_run_result_count
-      assert_equal 1, test_run_result_count(:pass)
-      assert_equal 1, test_run_result_count(:fail)
-    end
+      subject.run(&test_run_callback)
 
-    should "have a fail message with custom and generic explanations" do
-      exp = "#{@args[2]}\nExpected #{Assert::U.show(@args[1], @c)} (#{@args[1].class})"\
-            " to be an instance of #{@args[0]}."
-      assert_equal exp, test_run_results(:fail).first.message
-    end
+      assert_that(test_run_result_count).equals(2)
+      assert_that(test_run_result_count(:pass)).equals(1)
+      assert_that(test_run_result_count(:fail)).equals(1)
 
+      exp =
+        "#{args1[2]}\nExpected #{Assert::U.show(args1[1], config1)} (#{args1[1].class})"\
+        " to be an instance of #{args1[0]}."
+      assert_that(test_run_results(:fail).first.message).equals(exp)
+    end
   end
 
   class AssertNotInstanceOfTests < Assert::Context
     include Assert::Test::TestHelpers
 
     desc "`assert_not_instance_of`"
-    setup do
-      desc = @desc = "assert not instance of fail desc"
-      args = @args = [String, "object", desc]
-      @test = Factory.test do
+    subject {
+      args = args1
+      Factory.test do
         assert_not_instance_of(*args)           # fail
         assert_not_instance_of(Array, "object") # pass
       end
-      @c = @test.config
-      @test.run(&test_run_callback)
-    end
-    subject{ @test }
+    }
+
+    let(:desc1) { "assert not instance of fail desc" }
+    let(:args1) { [String, "object", desc1] }
+    let(:config1) { subject.config }
 
     should "produce results as expected" do
-      assert_equal 2, test_run_result_count
-      assert_equal 1, test_run_result_count(:pass)
-      assert_equal 1, test_run_result_count(:fail)
-    end
+      subject.run(&test_run_callback)
 
-    should "have a fail message with custom and generic explanations" do
-      exp = "#{@args[2]}\nExpected #{Assert::U.show(@args[1], @c)} (#{@args[1].class})"\
-            " to not be an instance of #{@args[0]}."
-      assert_equal exp, test_run_results(:fail).first.message
-    end
+      assert_that(test_run_result_count).equals(2)
+      assert_that(test_run_result_count(:pass)).equals(1)
+      assert_that(test_run_result_count(:fail)).equals(1)
 
+      exp =
+        "#{args1[2]}\nExpected #{Assert::U.show(args1[1], config1)} (#{args1[1].class})"\
+        " to not be an instance of #{args1[0]}."
+      assert_that(test_run_results(:fail).first.message).equals(exp)
+    end
   end
-
 end
-

data/test/unit/assertions/assert_kind_of_tests.rb

@@ -4,66 +4,63 @@ require "assert/assertions"
 require "assert/utils"
 
 module Assert::Assertions
-
   class AssertKindOfTests < Assert::Context
     include Assert::Test::TestHelpers
 
     desc "`assert_kind_of`"
-    setup do
-      desc = @desc = "assert kind of fail desc"
-      args = @args = [Array, "object", desc]
-      @test = Factory.test do
+    subject {
+      args = args1
+      Factory.test do
         assert_kind_of(String, "object") # pass
         assert_kind_of(*args)            # fail
       end
-      @c = @test.config
-      @test.run(&test_run_callback)
-    end
-    subject{ @test }
+    }
+
+    let(:desc1) { "assert kind of fail desc" }
+    let(:args1) { [Array, "object", desc1] }
+    let(:config1) { subject.config }
 
     should "produce results as expected" do
-      assert_equal 2, test_run_result_count
-      assert_equal 1, test_run_result_count(:pass)
-      assert_equal 1, test_run_result_count(:fail)
-    end
+      subject.run(&test_run_callback)
 
-    should "have a fail message with custom and generic explanations" do
-      exp = "#{@args[2]}\nExpected #{Assert::U.show(@args[1], @c)} (#{@args[1].class})"\
-            " to be a kind of #{@args[0]}."
-      assert_equal exp, test_run_results(:fail).first.message
-    end
+      assert_that(test_run_result_count).equals(2)
+      assert_that(test_run_result_count(:pass)).equals(1)
+      assert_that(test_run_result_count(:fail)).equals(1)
 
+      exp =
+        "#{args1[2]}\nExpected #{Assert::U.show(args1[1], config1)} (#{args1[1].class})"\
+        " to be a kind of #{args1[0]}."
+      assert_that(test_run_results(:fail).first.message).equals(exp)
+    end
   end
 
   class AssertNotKindOfTests < Assert::Context
     include Assert::Test::TestHelpers
 
     desc "`assert_not_kind_of`"
-    setup do
-      desc = @desc = "assert not kind of fail desc"
-      args = @args = [String, "object", desc]
-      @test = Factory.test do
+    subject {
+      args = args1
+      Factory.test do
         assert_not_kind_of(*args)           # fail
         assert_not_kind_of(Array, "object") # pass
       end
-      @c = @test.config
-      @test.run(&test_run_callback)
-    end
-    subject{ @test }
+    }
+
+    let(:desc1) { "assert not kind of fail desc" }
+    let(:args1) { [String, "object", desc1] }
+    let(:config1) { subject.config }
 
     should "produce results as expected" do
-      assert_equal 2, test_run_result_count
-      assert_equal 1, test_run_result_count(:pass)
-      assert_equal 1, test_run_result_count(:fail)
-    end
+      subject.run(&test_run_callback)
 
-    should "have a fail message with custom and generic explanations" do
-      exp = "#{@args[2]}\nExpected #{Assert::U.show(@args[1], @c)} (#{@args[1].class})"\
-            " to not be a kind of #{@args[0]}."
-      assert_equal exp, test_run_results(:fail).first.message
-    end
+      assert_that(test_run_result_count).equals(2)
+      assert_that(test_run_result_count(:pass)).equals(1)
+      assert_that(test_run_result_count(:fail)).equals(1)
 
+      exp =
+        "#{args1[2]}\nExpected #{Assert::U.show(args1[1], config1)} (#{args1[1].class})"\
+        " to not be a kind of #{args1[0]}."
+      assert_that(test_run_results(:fail).first.message).equals(exp)
+    end
   end
-
 end
-

data/test/unit/assertions/assert_match_tests.rb

@@ -4,66 +4,63 @@ require "assert/assertions"
 require "assert/utils"
 
 module Assert::Assertions
-
   class AssertMatchTests < Assert::Context
     include Assert::Test::TestHelpers
 
     desc "`assert_match`"
-    setup do
-      desc = @desc = "assert match fail desc"
-      args = @args = ["not", "a string", desc]
-      @test = Factory.test do
+    subject {
+      args = args1
+      Factory.test do
         assert_match(/a/, "a string") # pass
         assert_match(*args)           # fail
       end
-      @c = @test.config
-      @test.run(&test_run_callback)
-    end
-    subject{ @test }
+    }
+
+    let(:desc1) { "assert match fail desc" }
+    let(:args1) { ["not", "a string", desc1] }
+    let(:config1) { subject.config }
 
     should "produce results as expected" do
-      assert_equal 2, test_run_result_count
-      assert_equal 1, test_run_result_count(:pass)
-      assert_equal 1, test_run_result_count(:fail)
-    end
+      subject.run(&test_run_callback)
 
-    should "have a fail message with custom and generic explanations" do
-      exp = "#{@args[2]}\nExpected #{Assert::U.show(@args[1], @c)}"\
-            " to match #{Assert::U.show(@args[0], @c)}."
-      assert_equal exp, test_run_results(:fail).first.message
-    end
+      assert_that(test_run_result_count).equals(2)
+      assert_that(test_run_result_count(:pass)).equals(1)
+      assert_that(test_run_result_count(:fail)).equals(1)
 
+      exp =
+        "#{args1[2]}\nExpected #{Assert::U.show(args1[1], config1)}"\
+        " to match #{Assert::U.show(args1[0], config1)}."
+      assert_that(test_run_results(:fail).first.message).equals(exp)
+    end
   end
 
   class AssertNotMatchTests < Assert::Context
     include Assert::Test::TestHelpers
 
     desc "`assert_not_match`"
-    setup do
-      desc = @desc = "assert not match fail desc"
-      args = @args = [/a/, "a string", desc]
-      @test = Factory.test do
+    subject {
+      args = args1
+      Factory.test do
         assert_not_match(*args)             # fail
         assert_not_match("not", "a string") # pass
       end
-      @c = @test.config
-      @test.run(&test_run_callback)
-    end
-    subject{ @test }
+    }
+
+    let(:desc1) { "assert not match fail desc" }
+    let(:args1) { [/a/, "a string", desc1] }
+    let(:config1) { subject.config }
 
     should "produce results as expected" do
-      assert_equal 2, test_run_result_count
-      assert_equal 1, test_run_result_count(:pass)
-      assert_equal 1, test_run_result_count(:fail)
-    end
+      subject.run(&test_run_callback)
 
-    should "have a fail message with custom and generic explanations" do
-      exp = "#{@args[2]}\nExpected #{Assert::U.show(@args[1], @c)}"\
-            " to not match #{Assert::U.show(@args[0], @c)}."
-      assert_equal exp, test_run_results(:fail).first.message
-    end
+      assert_that(test_run_result_count).equals(2)
+      assert_that(test_run_result_count(:pass)).equals(1)
+      assert_that(test_run_result_count(:fail)).equals(1)
 
+      exp =
+        "#{args1[2]}\nExpected #{Assert::U.show(args1[1], config1)}"\
+        " to not match #{Assert::U.show(args1[0], config1)}."
+      assert_that(test_run_results(:fail).first.message).equals(exp)
+    end
   end
-
 end
-

data/test/unit/assertions/assert_nil_tests.rb

@@ -4,64 +4,59 @@ require "assert/assertions"
 require "assert/utils"
 
 module Assert::Assertions
-
   class AssertNilTests < Assert::Context
     include Assert::Test::TestHelpers
 
     desc "`assert_nil`"
-    setup do
-      desc = @desc = "assert nil empty fail desc"
-      args = @args = [1, desc]
-      @test = Factory.test do
+    subject {
+      args = args1
+      Factory.test do
         assert_nil(nil)   # pass
         assert_nil(*args) # fail
       end
-      @c = @test.config
-      @test.run(&test_run_callback)
-    end
-    subject{ @test }
+    }
+
+    let(:desc1) { "assert nil empty fail desc" }
+    let(:args1) { [1, desc1] }
+    let(:config1) { subject.config }
 
     should "produce results as expected" do
-      assert_equal 2, test_run_result_count
-      assert_equal 1, test_run_result_count(:pass)
-      assert_equal 1, test_run_result_count(:fail)
-    end
+      subject.run(&test_run_callback)
 
-    should "have a fail message with custom and generic explanations" do
-      exp = "#{@args[1]}\nExpected #{Assert::U.show(@args[0], @c)} to be nil."
-      assert_equal exp, test_run_results(:fail).first.message
-    end
+      assert_that(test_run_result_count).equals(2)
+      assert_that(test_run_result_count(:pass)).equals(1)
+      assert_that(test_run_result_count(:fail)).equals(1)
 
+      exp = "#{args1[1]}\nExpected #{Assert::U.show(args1[0], config1)} to be nil."
+      assert_that(test_run_results(:fail).first.message).equals(exp)
+    end
   end
 
   class AssertNotNilTests < Assert::Context
     include Assert::Test::TestHelpers
 
     desc "`assert_not_nil`"
-    setup do
-      desc = @desc = "assert not nil empty fail desc"
-      args = @args = [nil, desc]
-      @test = Factory.test do
+    subject {
+      args = args1
+      Factory.test do
         assert_not_nil(1)     # pass
         assert_not_nil(*args) # fail
       end
-      @c = @test.config
-      @test.run(&test_run_callback)
-    end
-    subject{ @test }
+    }
+
+    let(:desc1) { "assert not nil empty fail desc" }
+    let(:args1) { [nil, desc1] }
+    let(:config1) { subject.config }
 
     should "produce results as expected" do
-      assert_equal 2, test_run_result_count
-      assert_equal 1, test_run_result_count(:pass)
-      assert_equal 1, test_run_result_count(:fail)
-    end
+      subject.run(&test_run_callback)
 
-    should "have a fail message with custom and generic explanations" do
-      exp = "#{@args[1]}\nExpected #{Assert::U.show(@args[0], @c)} to not be nil."
-      assert_equal exp, test_run_results(:fail).first.message
-    end
+      assert_that(test_run_result_count).equals(2)
+      assert_that(test_run_result_count(:pass)).equals(1)
+      assert_that(test_run_result_count(:fail)).equals(1)
 
+      exp = "#{args1[1]}\nExpected #{Assert::U.show(args1[0], config1)} to not be nil."
+      assert_that(test_run_results(:fail).first.message).equals(exp)
+    end
   end
-
 end
-