assert 2.18.0 → 2.19.0

data/test/unit/assertions/assert_equal_tests.rb

@@ -8,28 +8,29 @@ module Assert::Assertions
     include Assert::Test::TestHelpers
 
     desc "`assert_equal`"
-    setup do
-      desc = @desc = "assert equal fail desc"
-      a = @a = ["1", "2", desc]
-      @test = Factory.test do
-        assert_equal(1, 1) # pass
-        assert_equal(*a)   # fail
+    subject {
+      args = args1
+      Factory.test do
+        assert_equal(1, 1)  # pass
+        assert_equal(*args) # fail
       end
-      @c = @test.config
-      @test.run(&test_run_callback)
-    end
-    subject{ @test }
+    }
+
+    let(:desc1) { "assert equal fail desc" }
+    let(:args1) { ["1", "2", 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 = "#{@a[2]}\nExpected #{Assert::U.show(@a[1], @c)}"\
-            " to be equal to #{Assert::U.show(@a[0], @c)}."
-      assert_equal exp, test_run_results(:fail).first.message
+      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 be equal to #{Assert::U.show(args1[0], config1)}."
+      assert_that(test_run_results(:fail).first.message).equals(exp)
     end
   end
 
@@ -37,28 +38,29 @@ module Assert::Assertions
     include Assert::Test::TestHelpers
 
     desc "`assert_not_equal`"
-    setup do
-      desc = @desc = "assert not equal fail desc"
-      a = @a = ["1", "1", desc]
-      @test = Factory.test do
-        assert_not_equal(*a)   # fail
-        assert_not_equal(1, 2) # pass
+    subject {
+      args = args1
+      Factory.test do
+        assert_not_equal(*args) # fail
+        assert_not_equal(1, 2)  # pass
       end
-      @c = @test.config
-      @test.run(&test_run_callback)
-    end
-    subject{ @test }
+    }
+
+    let(:desc1) { "assert not equal 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 = "#{@a[2]}\nExpected #{Assert::U.show(@a[1], @c)}"\
-            " to not be equal to #{Assert::U.show(@a[0], @c)}."
-      assert_equal exp, test_run_results(:fail).first.message
+      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 be equal to #{Assert::U.show(args1[0], config1)}."
+      assert_that(test_run_results(:fail).first.message).equals(exp)
     end
   end
 
@@ -66,21 +68,36 @@ module Assert::Assertions
     include Assert::Test::TestHelpers
 
     desc "with objects that define custom equality operators"
-    setup do
-      is_class = Class.new do
-        def ==(other); true; end
-      end
-      @is = is_class.new
 
-      is_not_class = Class.new do
-        def ==(other); false; end
+    let(:is_class)     {
+      Class.new do
+        def ==(other)
+          if other.is_a?(Assert::ActualValue.not_given.class)
+            super
+          else
+            true
+          end
+        end
       end
-      @is_not = is_not_class.new
-    end
+    }
+    let(:is_not_class) {
+      Class.new do
+        def ==(other)
+          if other.is_a?(Assert::ActualValue.not_given.class)
+            super
+          else
+            false
+          end
+        end
+      end
+    }
+
+    let(:is1) { is_class.new }
+    let(:is_not1) { is_not_class.new }
 
     should "use the equality operator of the exp value" do
-      assert_equal @is, @is_not
-      assert_not_equal @is_not, @is
+      assert_that(is1).equals(is_not1)
+      assert_that(is_not1).does_not_equal(is1)
     end
   end
 
@@ -88,52 +105,55 @@ module Assert::Assertions
     include Assert::Test::TestHelpers
 
     desc "with objects that should use diff when showing"
-    setup do
-      @exp_obj = "I'm a\nstring"
-      @act_obj = "I am a \nstring"
 
-      @c = Factory.modes_off_config
-      @c.use_diff_proc(Assert::U.default_use_diff_proc)
-      @c.run_diff_proc(Assert::U.syscmd_diff_proc)
+    let(:config1) {
+      Factory.modes_off_config.tap do |config|
+        config.use_diff_proc(Assert::U.default_use_diff_proc)
+        config.run_diff_proc(Assert::U.syscmd_diff_proc)
+      end
+    }
 
-      @exp_obj_show = Assert::U.show_for_diff(@exp_obj, @c)
-      @act_obj_show = Assert::U.show_for_diff(@act_obj, @c)
-    end
+    let(:exp_obj1) { "I'm a\nstring" }
+    let(:act_obj1) { "I am a \nstring" }
+    let(:exp_obj_show1) { Assert::U.show_for_diff(exp_obj1, config1) }
+    let(:act_obj_show1) { Assert::U.show_for_diff(act_obj1, config1) }
   end
 
   class AssertEqualDiffTests < DiffTests
     desc "`assert_equal`"
-    setup do
-      exp_obj, act_obj = @exp_obj, @act_obj
-      @test = Factory.test(@c) do
+    subject {
+      exp_obj, act_obj = exp_obj1, act_obj1
+      Factory.test(config1) do
         assert_equal(exp_obj, act_obj)
       end
-      @test.run(&test_run_callback)
-    end
-    subject{ @test }
+    }
 
     should "include diff output in the fail messages" do
-      exp = "Expected does not equal actual, diff:\n"\
-            "#{Assert::U.syscmd_diff_proc.call(@exp_obj_show, @act_obj_show)}"
-      assert_equal exp, test_run_results(:fail).first.message
+      subject.run(&test_run_callback)
+
+      exp =
+        "Expected does not equal actual, diff:\n"\
+        "#{Assert::U.syscmd_diff_proc.call(exp_obj_show1, act_obj_show1)}"
+      assert_that(test_run_results(:fail).first.message).equals(exp)
     end
   end
 
   class AssertNotEqualDiffTests < DiffTests
     desc "`assert_not_equal`"
-    setup do
-      exp_obj, act_obj = @exp_obj, @act_obj
-      @test = Factory.test(@c) do
+    subject {
+      exp_obj = exp_obj1
+      Factory.test(config1) do
         assert_not_equal(exp_obj, exp_obj)
       end
-      @test.run(&test_run_callback)
-    end
-    subject{ @test }
+    }
 
     should "include diff output in the fail messages" do
-      exp = "Expected equals actual, diff:\n"\
-            "#{Assert::U.syscmd_diff_proc.call(@exp_obj_show, @exp_obj_show)}"
-      assert_equal exp, test_run_results(:fail).first.message
+      subject.run(&test_run_callback)
+
+      exp =
+        "Expected equals actual, diff:\n"\
+        "#{Assert::U.syscmd_diff_proc.call(exp_obj_show1, exp_obj_show1)}"
+      assert_that(test_run_results(:fail).first.message).equals(exp)
     end
   end
 end

data/test/unit/assertions/assert_file_exists_tests.rb

@@ -9,27 +9,27 @@ module Assert::Assertions
     include Assert::Test::TestHelpers
 
     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]
-      @test = Factory.test do
+    subject {
+      args = args1
+      Factory.test do
         assert_file_exists(__FILE__) # pass
         assert_file_exists(*args)    # fail
       end
-      @c = @test.config
-      @test.run(&test_run_callback)
-    end
-    subject{ @test }
+    }
+
+    let(:desc1) { "assert file exists fail desc" }
+    let(:args1) { ["/a/path/to/some/file/that/no/exists", 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 exist."
-      assert_equal exp, test_run_results(:fail).first.message
+      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 exist."
+      assert_that(test_run_results(:fail).first.message).equals(exp)
     end
   end
 
@@ -37,28 +37,27 @@ module Assert::Assertions
     include Assert::Test::TestHelpers
 
     desc "`assert_not_file_exists`"
-    setup do
-      desc = @desc = "assert not file exists empty fail desc"
-      args = @args = [__FILE__, desc]
-      @test = Factory.test do
-        assert_not_file_exists("/a/path/to/some/file/that/no/exists") # pass
-        assert_not_file_exists(*args) # fail
+    subject {
+      args = args1
+      Factory.test do
+        assert_not_file_exists("/file/path") # pass
+        assert_not_file_exists(*args)        # fail
       end
-      @c = @test.config
-      @test.run(&test_run_callback)
-    end
-    subject{ @test }
+    }
+
+    let(:desc1) { "assert not file exists fail desc" }
+    let(:args1) { [__FILE__, 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 exist."
-      assert_equal exp, test_run_results(:fail).first.message
+      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 exist."
+      assert_that(test_run_results(:fail).first.message).equals(exp)
     end
   end
 end
-

data/test/unit/assertions/assert_includes_tests.rb

@@ -8,29 +8,30 @@ module Assert::Assertions
     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
+      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
 
@@ -38,30 +39,30 @@ module Assert::Assertions
     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
+      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

@@ -8,28 +8,29 @@ module Assert::Assertions
     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
+      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
 
@@ -37,29 +38,29 @@ module Assert::Assertions
     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
+      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
-