test_bench 1.1.0.0 → 1.2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9d18b019b73d853e50b78abd989c8d8969c65eb7c5beedc0f3eeadb415f652aa
-  data.tar.gz: e8a421026be5f2cf1c5f2af81ddd6a763ab0095669bbda97998fee4ca6fafb83
+  metadata.gz: afaeab0cc192ef871046e2b2080e87f9ae413a0da8a55e2893e240f76369c87e
+  data.tar.gz: 9cca5db44320b3956cbb8754251703087024411d274e608a2d731ce6c7a2729d
 SHA512:
-  metadata.gz: bc855a5819e98378bae988487b7d8e55c5143ca157f6f116c1411e2bbf087771a6bf992650049d07cb3b1a8a0666ad56ef4ef05686a88536264884700851de77
-  data.tar.gz: 15a6baea7cbbf7f8cfcccaa17c3bb128fe396be9ffb227087335f4edc5a569d95cdbe066359f9af80907f3fa298e8299af8be0d402fb6e08c3c125222fe69a23
+  metadata.gz: 80da06a441f1f3a547a62ee37fbf36f1d6c1c9541bd240c82fc94d7d380da1f6ddf717d6a626c5f50161488dfe4178057e14c59183ad751660bf8627fc322db4
+  data.tar.gz: 42d0355bb4f6c81a1819da5cfffa1fd41ece43b1f1a2e14600e5f52a9ef53f11a10309c792862bef9557bfe62a5e44a644883dda4b427b362fd813f8c2361c0b

data/lib/test_bench/cli/parse_arguments.rb

@@ -62,7 +62,7 @@ module TestBench
           parser.separator('')
           parser.separator("Configuration Options")
 
-          parser.on('-a', '--[no-]abort-on-error', %{Exit immediately after any test failure or error (Default: #{Session::Defaults.abort_on_error ? 'on' : 'off'})}) do |abort_on_error|
+          parser.on('-a', '--[no-]abort-on-error', %{Exit immediately after any test failure or error (Default: #{TestBench::Defaults.abort_on_error ? 'on' : 'off'})}) do |abort_on_error|
             env['TEST_BENCH_ABORT_ON_ERROR'] = abort_on_error ? 'on' : 'off'
           end
 
@@ -116,7 +116,7 @@ module TestBench
             env['TEST_BENCH_OUTPUT_STYLING'] = styling_text
           end
 
-          parser.on('-p', '--[no-]permit-deactivated-tests', %{Do not fail the test run if there are deactivated tests or contexts, e.g. _test or _context (Default: #{!DeactivationVariants::Defaults.fail_session ? 'on' : 'off'})}) do |permit_deactivated_tests|
+          parser.on('-p', '--[no-]permit-deactivated-tests', %{Do not fail the test run if there are deactivated tests or contexts, e.g. _test or _context (Default: #{!TestBench::Defaults.fail_deactivated_tests ? 'on' : 'off'})}) do |permit_deactivated_tests|
             env['TEST_BENCH_FAIL_DEACTIVATED_TESTS'] = !permit_deactivated_tests ? 'on' : 'off'
           end
 

data/lib/test_bench/deactivation_variants.rb

@@ -1,21 +1,11 @@
 module TestBench
   module DeactivationVariants
     def _context(title=nil, &block)
-      test_session.fail! if Defaults.fail_session
-
       context(title)
     end
 
     def _test(title=nil, &block)
-      test_session.fail! if Defaults.fail_session
-
       test(title)
     end
-
-    module Defaults
-      def self.fail_session
-        Environment::Boolean.fetch('TEST_BENCH_FAIL_DEACTIVATED_TESTS', true)
-      end
-    end
   end
 end

data/lib/test_bench/run.rb

@@ -3,7 +3,7 @@ module TestBench
     Error = Class.new(RuntimeError)
 
     def session
-      @session ||= Session::Substitute.build
+      @session ||= Fixture::Session::Substitute.build
     end
     attr_writer :session
 
@@ -25,7 +25,7 @@ module TestBench
 
       instance.exclude_pattern = exclude unless exclude.nil?
 
-      Session.configure(instance, session: session)
+      Fixture::Session.configure(instance, session: session)
       instance.session.output = output unless output.nil?
 
       instance

data/lib/test_bench/test_bench.rb

@@ -2,7 +2,9 @@ module TestBench
   def self.session
     @session ||= build_session.tap do |session|
       at_exit do
-        exit 1 if session.failed?
+        exit_code = exit_code(session)
+
+        exit(exit_code) unless exit_code.zero?
       end
     end
   end
@@ -65,7 +67,7 @@ module TestBench
   end
 
   def self.session_error_policy(abort_on_error=nil)
-    abort_on_error = Session::Defaults.abort_on_error if abort_on_error.nil?
+    abort_on_error = Defaults.abort_on_error if abort_on_error.nil?
 
     if abort_on_error
       :abort
@@ -74,11 +76,29 @@ module TestBench
     end
   end
 
+  def self.exit_code(session, fail_deactivated_tests: nil)
+    if fail_deactivated_tests.nil?
+      fail_deactivated_tests = Defaults.fail_deactivated_tests
+    end
+
+    if session.failed?
+      1
+    elsif session.skip?
+      fail_deactivated_tests ? 2 : 0
+    else
+      0
+    end
+  end
+
   Session = Fixture::Session
 
-  module Session::Defaults
+  module Defaults
     def self.abort_on_error
       Environment::Boolean.fetch('TEST_BENCH_ABORT_ON_ERROR', false)
     end
+
+    def self.fail_deactivated_tests
+      Environment::Boolean.fetch('TEST_BENCH_FAIL_DEACTIVATED_TESTS', true)
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: test_bench
 version: !ruby/object:Gem::Version
-  version: 1.1.0.0
+  version: 1.2.0.0
 platform: ruby
 authors:
 - Nathan Ladd
 autorequire:
 bindir: script
 cert_chain: []
-date: 2020-07-23 00:00:00.000000000 Z
+date: 2020-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test_bench-fixture
@@ -72,8 +72,6 @@ files:
 - lib/test_bench/controls/time.rb
 - lib/test_bench/deactivation_variants.rb
 - lib/test_bench/environment/boolean.rb
-- lib/test_bench/fixture
-- lib/test_bench/fixture.rb
 - lib/test_bench/fixtures.rb
 - lib/test_bench/fixtures/configure_receiver.rb
 - lib/test_bench/output.rb

data/lib/test_bench/fixture

@@ -1 +0,0 @@
-lib/test_bench/home/ntl/Projects/test-bench-fixture/lib/test_bench/fixture

data/lib/test_bench/fixture.rb

@@ -1 +0,0 @@
-lib/test_bench/home/ntl/Projects/test-bench-fixture/lib/test_bench/fixture.rb