assert 2.18.3 → 2.18.4

data/test/system/test_tests.rb

@@ -6,17 +6,15 @@ class Assert::Test
     include Assert::Test::TestHelpers
 
     desc "Assert::Test"
-    subject { test1 }
 
     setup do
-      test1.run(&test_run_callback)
+      subject.run(&test_run_callback)
     end
   end
 
   class NoResultsTests < SystemTests
     desc "when producing no results"
-
-    let(:test1) { Factory.test }
+    subject { Factory.test }
 
     should "generate 0 results" do
       assert_that(test_run_result_count).equals(0)
@@ -25,8 +23,7 @@ class Assert::Test
 
   class PassTests < SystemTests
     desc "when passing a single assertion"
-
-    let(:test1) { Factory.test{ assert(1 == 1) } }
+    subject { Factory.test{ assert(1 == 1) } }
 
     should "generate 1 result" do
       assert_that(test_run_result_count).equals(1)
@@ -39,8 +36,7 @@ class Assert::Test
 
   class FailTests < SystemTests
     desc "when failing a single assertion"
-
-    let(:test1) { Factory.test{ assert(1 == 0) } }
+    subject { Factory.test{ assert(1 == 0) } }
 
     should "generate 1 result" do
       assert_that(test_run_result_count).equals(1)
@@ -53,8 +49,7 @@ class Assert::Test
 
   class SkipTests < SystemTests
     desc "when skipping once"
-
-    let(:test1) { Factory.test{ skip } }
+    subject { Factory.test{ skip } }
 
     should "generate 1 result" do
       assert_that(test_run_result_count).equals(1)
@@ -67,8 +62,7 @@ class Assert::Test
 
   class ErrorTests < SystemTests
     desc "when erroring once"
-
-    let(:test1) { Factory.test{ raise("WHAT") } }
+    subject { Factory.test{ raise("WHAT") } }
 
     should "generate 1 result" do
       assert_that(test_run_result_count).equals(1)
@@ -81,8 +75,7 @@ class Assert::Test
 
   class MixedTests < SystemTests
     desc "when passing 1 assertion and failing 1 assertion"
-
-    let(:test1) {
+    subject {
       Factory.test do
         assert(1 == 1)
         assert(1 == 0)
@@ -104,8 +97,7 @@ class Assert::Test
 
   class MixedSkipTests < SystemTests
     desc "when passing 1 assertion and failing 1 assertion with a skip call in between"
-
-    let(:test1) {
+    subject {
       Factory.test do
         assert(1 == 1)
         skip
@@ -136,8 +128,7 @@ class Assert::Test
 
   class MixedErrorTests < SystemTests
     desc "when passing 1 assertion and failing 1 assertion with an exception raised in between"
-
-    let(:test1) {
+    subject {
       Factory.test do
         assert(1 == 1)
         raise Exception, "something errored"
@@ -168,8 +159,7 @@ class Assert::Test
 
   class MixedPassTests < SystemTests
     desc "when passing 1 assertion and failing 1 assertion with a pass call in between"
-
-    let(:test1) {
+    subject {
       Factory.test do
         assert(1 == 1)
         pass
@@ -196,8 +186,7 @@ class Assert::Test
 
   class MixedFailTests < SystemTests
     desc "when failing 1 assertion and passing 1 assertion with a fail call in between"
-
-    let(:test1) {
+    subject {
       Factory.test do
         assert(1 == 0)
         fail
@@ -224,8 +213,7 @@ class Assert::Test
 
   class MixedFlunkTests < SystemTests
     desc "has failing 1 assertion and passing 1 assertion with a flunk call in between"
-
-    let(:test1) {
+    subject {
       Factory.test do
         assert(1 == 0)
         flunk
@@ -252,6 +240,9 @@ class Assert::Test
 
   class WithSetupsTests < SystemTests
     desc "that has setup logic"
+    subject {
+      Factory.test("t", Factory.context_info(context_class1)) { pass "TEST" }
+    }
 
     let(:context_class1) {
       Factory.context_class do
@@ -261,9 +252,6 @@ class Assert::Test
         def setup; pass "test/unit style setup"; end
       end
     }
-    let(:test1) {
-      Factory.test("t", Factory.context_info(context_class1)) { pass "TEST" }
-    }
 
     should "execute all setup logic when run" do
       assert_that(test_run_result_count(:pass)).equals(3)
@@ -275,6 +263,9 @@ class Assert::Test
 
   class WithTeardownsTests < SystemTests
     desc "that has teardown logic"
+    subject {
+      Factory.test("t", Factory.context_info(context_class1)) { pass "TEST" }
+    }
 
     let(:context_class1) {
       Factory.context_class do
@@ -284,9 +275,6 @@ class Assert::Test
         def teardown; pass "test/unit style teardown"; end
       end
     }
-    let(:test1) {
-      Factory.test("t", Factory.context_info(context_class1)) { pass "TEST" }
-    }
 
     should "execute all teardown logic when run" do
       assert_that(test_run_result_count(:pass)).equals(3)
@@ -298,6 +286,9 @@ class Assert::Test
 
   class WithAroundsTests < SystemTests
     desc "that has around logic (in addition to setups/teardowns)"
+    subject {
+      Factory.test("t", Factory.context_info(context_class1)) { pass "TEST" }
+    }
 
     let(:parent_context_class1) {
       Factory.modes_off_context_class do
@@ -328,9 +319,6 @@ class Assert::Test
         teardown { pass "child teardown2" }
       end
     }
-    let(:test1) {
-      Factory.test("t", Factory.context_info(context_class1)) { pass "TEST" }
-    }
 
     should "run the arounds outside of the setups/teardowns/test" do
       assert_that(test_run_result_count(:pass)).equals(13)

data/test/unit/assert_tests.rb

@@ -7,7 +7,9 @@ require "much-stub"
 module Assert
   class UnitTests < Assert::Context
     desc "Assert"
-    subject { Assert }
+    subject { unit_class }
+
+    let(:unit_class) { Assert }
 
     should have_imeths :config, :configure, :view, :suite, :runner
     should have_imeths :stubs, :stub, :unstub, :unstub!, :stub_send

data/test/unit/assertions/assert_block_tests.rb

@@ -6,10 +6,7 @@ module Assert::Assertions
     include Assert::Test::TestHelpers
 
     desc "`assert_block`"
-    subject { test1 }
-
-    let(:desc1) { "assert block fail desc" }
-    let(:test1) {
+    subject {
       desc = desc1
       Factory.test do
         assert_block { true }        # pass
@@ -17,6 +14,8 @@ module Assert::Assertions
       end
     }
 
+    let(:desc1) { "assert block fail desc" }
+
     should "produce results as expected" do
       subject.run(&test_run_callback)
 
@@ -33,10 +32,7 @@ module Assert::Assertions
     include Assert::Test::TestHelpers
 
     desc "`assert_not_block`"
-    subject { test1 }
-
-    let(:desc1) { "assert not block fail desc" }
-    let(:test1) {
+    subject {
       desc = desc1
       Factory.test do
         assert_not_block(desc) { true } # fail
@@ -44,6 +40,8 @@ module Assert::Assertions
       end
     }
 
+    let(:desc1) { "assert not block fail desc" }
+
     should "produce results as expected" do
       subject.run(&test_run_callback)
 

data/test/unit/assertions/assert_empty_tests.rb

@@ -8,18 +8,17 @@ module Assert::Assertions
     include Assert::Test::TestHelpers
 
     desc "`assert_empty`"
-    subject { test1 }
-
-    let(:desc1) { "assert empty fail desc" }
-    let(:args1) { [[1], desc1] }
-    let(:test1) {
+    subject {
       args = args1
       Factory.test do
         assert_empty([])    # pass
         assert_empty(*args) # fail
       end
     }
-    let(:config1) { test1.config }
+
+    let(:desc1) { "assert empty fail desc" }
+    let(:args1) { [[1], desc1] }
+    let(:config1) { subject.config }
 
     should "produce results as expected" do
       subject.run(&test_run_callback)
@@ -38,18 +37,17 @@ module Assert::Assertions
     include Assert::Test::TestHelpers
 
     desc "`assert_not_empty`"
-    subject { test1 }
-
-    let(:desc1) { "assert not empty fail desc" }
-    let(:args1) { [[], desc1] }
-    let(:test1) {
+    subject {
       args = args1
       Factory.test do
         assert_not_empty([1])   # pass
         assert_not_empty(*args) # fail
       end
     }
-    let(:config1) { test1.config }
+
+    let(:desc1) { "assert not empty fail desc" }
+    let(:args1) { [[], desc1] }
+    let(:config1) { subject.config }
 
     should "produce results as expected" do
       subject.run(&test_run_callback)

data/test/unit/assertions/assert_equal_tests.rb

@@ -8,18 +8,17 @@ module Assert::Assertions
     include Assert::Test::TestHelpers
 
     desc "`assert_equal`"
-    subject { test1 }
-
-    let(:desc1) { "assert equal fail desc" }
-    let(:args1) { ["1", "2", desc1] }
-    let(:test1) {
+    subject {
       args = args1
       Factory.test do
         assert_equal(1, 1)  # pass
         assert_equal(*args) # fail
       end
     }
-    let(:config1) { test1.config }
+
+    let(:desc1) { "assert equal fail desc" }
+    let(:args1) { ["1", "2", desc1] }
+    let(:config1) { subject.config }
 
     should "produce results as expected" do
       subject.run(&test_run_callback)
@@ -39,18 +38,17 @@ module Assert::Assertions
     include Assert::Test::TestHelpers
 
     desc "`assert_not_equal`"
-    subject { test1 }
-
-    let(:desc1) { "assert not equal fail desc" }
-    let(:args1) { ["1", "1", desc1] }
-    let(:test1) {
+    subject {
       args = args1
       Factory.test do
         assert_not_equal(*args) # fail
         assert_not_equal(1, 2)  # pass
       end
     }
-    let(:config1) { test1.config }
+
+    let(:desc1) { "assert not equal fail desc" }
+    let(:args1) { ["1", "1", desc1] }
+    let(:config1) { subject.config }
 
     should "produce results as expected" do
       subject.run(&test_run_callback)
@@ -103,9 +101,7 @@ module Assert::Assertions
 
   class AssertEqualDiffTests < DiffTests
     desc "`assert_equal`"
-    subject { test1 }
-
-    let(:test1) {
+    subject {
       exp_obj, act_obj = exp_obj1, act_obj1
       Factory.test(config1) do
         assert_equal(exp_obj, act_obj)
@@ -124,9 +120,7 @@ module Assert::Assertions
 
   class AssertNotEqualDiffTests < DiffTests
     desc "`assert_not_equal`"
-    subject { test1 }
-
-    let(:test1) {
+    subject {
       exp_obj = exp_obj1
       Factory.test(config1) do
         assert_not_equal(exp_obj, exp_obj)

data/test/unit/assertions/assert_file_exists_tests.rb

@@ -9,18 +9,17 @@ module Assert::Assertions
     include Assert::Test::TestHelpers
 
     desc "`assert_file_exists`"
-    subject { test1 }
-
-    let(:desc1) { "assert file exists fail desc" }
-    let(:args1) { ["/a/path/to/some/file/that/no/exists", desc1] }
-    let(:test1) {
+    subject {
       args = args1
       Factory.test do
         assert_file_exists(__FILE__) # pass
         assert_file_exists(*args)    # fail
       end
     }
-    let(:config1) { test1.config }
+
+    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
       subject.run(&test_run_callback)
@@ -38,18 +37,17 @@ module Assert::Assertions
     include Assert::Test::TestHelpers
 
     desc "`assert_not_file_exists`"
-    subject { test1 }
-
-    let(:desc1) { "assert not file exists fail desc" }
-    let(:args1) { [__FILE__, desc1] }
-    let(:test1) {
+    subject {
       args = args1
       Factory.test do
         assert_not_file_exists("/file/path") # pass
         assert_not_file_exists(*args)        # fail
       end
     }
-    let(:config1) { test1.config }
+
+    let(:desc1) { "assert not file exists fail desc" }
+    let(:args1) { [__FILE__, desc1] }
+    let(:config1) { subject.config }
 
     should "produce results as expected" do
       subject.run(&test_run_callback)

data/test/unit/assertions/assert_includes_tests.rb

@@ -8,18 +8,17 @@ module Assert::Assertions
     include Assert::Test::TestHelpers
 
     desc "`assert_includes`"
-    subject { test1 }
-
-    let(:desc1) { "assert includes fail desc" }
-    let(:args1) { [2, [1], desc1] }
-    let(:test1) {
+    subject {
       args = args1
       Factory.test do
         assert_includes(1, [1]) # pass
         assert_includes(*args)  # fail
       end
     }
-    let(:config1) { test1.config }
+
+    let(:desc1) { "assert includes fail desc" }
+    let(:args1) { [2, [1], desc1] }
+    let(:config1) { subject.config }
 
     should "produce results as expected" do
       subject.run(&test_run_callback)
@@ -40,18 +39,17 @@ module Assert::Assertions
     include Assert::Test::TestHelpers
 
     desc "`assert_not_included`"
-    subject { test1 }
-
-    let(:desc1) { "assert not included fail desc" }
-    let(:args1) { [1, [1], desc1] }
-    let(:test1) {
+    subject {
       args = args1
       Factory.test do
         assert_not_included(2, [1]) # pass
         assert_not_included(*args)  # fail
       end
     }
-    let(:config1) { test1.config }
+
+    let(:desc1) { "assert not included fail desc" }
+    let(:args1) { [1, [1], desc1] }
+    let(:config1) { subject.config }
 
     should "produce results as expected" do
       subject.run(&test_run_callback)

data/test/unit/assertions/assert_instance_of_tests.rb

@@ -8,18 +8,17 @@ module Assert::Assertions
     include Assert::Test::TestHelpers
 
     desc "`assert_instance_of`"
-    subject { test1 }
-
-    let(:desc1) { "assert instance of fail desc" }
-    let(:args1) { [Array, "object", desc1] }
-    let(:test1) {
+    subject {
       args = args1
       Factory.test do
         assert_instance_of(String, "object") # pass
         assert_instance_of(*args)            # fail
       end
     }
-    let(:config1) { test1.config }
+
+    let(:desc1) { "assert instance of fail desc" }
+    let(:args1) { [Array, "object", desc1] }
+    let(:config1) { subject.config }
 
     should "produce results as expected" do
       subject.run(&test_run_callback)
@@ -39,18 +38,17 @@ module Assert::Assertions
     include Assert::Test::TestHelpers
 
     desc "`assert_not_instance_of`"
-    subject { test1 }
-
-    let(:desc1) { "assert not instance of fail desc" }
-    let(:args1) { [String, "object", desc1] }
-    let(:test1) {
+    subject {
       args = args1
       Factory.test do
         assert_not_instance_of(*args)           # fail
         assert_not_instance_of(Array, "object") # pass
       end
     }
-    let(:config1) { test1.config }
+
+    let(:desc1) { "assert not instance of fail desc" }
+    let(:args1) { [String, "object", desc1] }
+    let(:config1) { subject.config }
 
     should "produce results as expected" do
       subject.run(&test_run_callback)