test/unit/assertions/assert_match_tests.rb in assert-2.18.2 vs test/unit/assertions/assert_match_tests.rb in assert-2.18.3

@@ -6,60 +6,63 @@
 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 { test1 }
+
+    let(:desc1) { "assert match fail desc" }
+    let(:args1) { ["not", "a string", desc1] }
+    let(:test1) {
+      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(:config1) { test1.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
+      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 { test1 }
+
+    let(:desc1) { "assert not match fail desc" }
+    let(:args1) { [/a/, "a string", desc1] }
+    let(:test1) {
+      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(:config1) { test1.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
+      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
-