megatest 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b0be0dcf9dd26312cec897081522ae6ac404db5447b26d50286ccc8720422743
-  data.tar.gz: 2580f85814d9469dfd1df3c8d3601c8b5ac89b4e4faaf706b4af47154d3c9bdb
+  metadata.gz: 10f2e6b7fd746d7e66164d84868f0314d06f403f649f5a985baaa8db9eb239c4
+  data.tar.gz: 9e6691bc050c0fd73647697e600f20c693d670c1f8982b779545e8d3140a9ef9
 SHA512:
-  metadata.gz: ef25ab7ecc09133635d0ffaef659ce02574f01fd558f2437c187fd3f4f362b40cd13dfcb6d6ac455e0a1462b507dfb6e27efd74e72d18ed57e68f8c1434b25e2
-  data.tar.gz: 68b8dc14b4869a5dea9d51f2c507287acb5bbcce709b1514c965f2b0cc9a0d8edd4da82a89b8e120427e63ece0c159a2f4f27d92362f1b25ded3f9cbdd05c402
+  metadata.gz: e03b691bdf5d28c09575c4c3c2d0995e067f3a7e88159f640d5d1dc0c92010470ec36c20bfb52c3cbf63b4edaf3d09afd24cc5799a5d8c9bf1a5dbd206ae3b86
+  data.tar.gz: b742c4c6d8656cf04ba801112bcf913e1224eef13f8256b5ef7c950deaf9c1a24958c7c294f76c477b01a1017adbf849358e5ff0dcea7761dc8b1c18468288f6

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 ## [Unreleased]
 
+## [0.6.0] - 2025-01-17
+
+- Allow defining setup and teardown with method names.
+- Allow multiple `setup`, `around` and `teardown` blocks in the same test suite.
+
 ## [0.5.0] - 2025-01-17
 
 - Adds `megatest/autorun`

data/lib/megatest/compat.rb

@@ -4,18 +4,6 @@
 
 module Megatest
   module Compat
-    unless Enumerable.method_defined?(:filter_map) # RUBY_VERSION >= "2.7"
-      module FilterMap
-        refine Enumerable do
-          def filter_map(&block)
-            result = map(&block)
-            result.compact!
-            result
-          end
-        end
-      end
-    end
-
     unless Symbol.method_defined?(:start_with?) # RUBY_VERSION >= "2.7"
       module StartWith
         refine Symbol do

data/lib/megatest/dsl.rb

@@ -136,8 +136,14 @@ module Megatest
     end
 
     # Registers a block to be invoked before every test cases.
-    def setup(&block)
-      ::Megatest.registry.suite(self).on_setup(block)
+    def setup(*methods, &block)
+      suite = ::Megatest.registry.suite(self)
+      methods.each do |m|
+        suite.on_setup(-> { send(m) })
+      end
+      if block
+        suite.on_setup(block)
+      end
     end
 
     # Registers a block to be invoked around every test cases.
@@ -157,8 +163,14 @@ module Megatest
 
     # Registers a block to be invoked after every test cases,
     # regardless of whether it passed or failed.
-    def teardown(&block)
-      ::Megatest.registry.suite(self).on_teardown(block)
+    def teardown(*methods, &block)
+      suite = ::Megatest.registry.suite(self)
+      methods.each do |m|
+        suite.on_teardown(-> { send(m) })
+      end
+      if block
+        suite.on_teardown(block)
+      end
     end
   end
 end

data/lib/megatest/state.rb

@@ -28,14 +28,14 @@ module Megatest
     using Compat::StartWith unless Symbol.method_defined?(:start_with?)
 
     class Suite
-      attr_reader :setup_callback, :teardown_callback, :around_callback
+      attr_reader :setup_callbacks, :teardown_callbacks, :around_callbacks
 
       def initialize(registry)
         @registry = registry
         @tags = nil
-        @setup_callback = nil
-        @teardown_callback = nil
-        @around_callback = nil
+        @setup_callbacks = []
+        @teardown_callbacks = []
+        @around_callbacks = []
         @current_context = nil
         @current_tags = nil
       end
@@ -87,26 +87,21 @@ module Megatest
       end
 
       def on_setup(block)
-        raise Error, "The setup block is already defined" if @setup_callback
         raise Error, "setup blocks can't be defined in context blocks" if @current_context
 
-        @setup_callback = block
+        @setup_callbacks.unshift(block)
       end
 
       def on_around(block)
-        raise Error, "The around block is already defined" if @around_callback
         raise Error, "around blocks can't be defined in context blocks" if @current_context
 
-        @around_callback = block
+        @around_callbacks << block
       end
 
       def on_teardown(block)
-        if @teardown_callback
-          raise Error, "The teardown block was already defined as #{@teardown_callback}"
-        end
         raise Error, "teardown blocks can't be defined in context blocks" if @current_context
 
-        @teardown_callback = block
+        @teardown_callbacks << block
       end
     end
 
@@ -370,21 +365,19 @@ module Megatest
         cmp || 0
       end
 
-      def each_setup_callback
+      def each_setup_callback(&block)
         @test_suite.ancestors.reverse_each do |test_suite|
-          yield test_suite.setup_callback if test_suite.setup_callback
+          test_suite.setup_callbacks.each(&block)
         end
       end
 
-      using Compat::FilterMap unless Enumerable.method_defined?(:filter_map)
-
       def around_callbacks
-        @test_suite.ancestors.filter_map(&:around_callback)
+        @test_suite.ancestors.flat_map(&:around_callbacks)
       end
 
-      def each_teardown_callback
+      def each_teardown_callback(&block)
         @test_suite.ancestors.each do |test_suite|
-          yield test_suite.teardown_callback if test_suite.teardown_callback
+          test_suite.teardown_callbacks.each(&block)
         end
       end
 

data/lib/megatest/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Megatest
-  VERSION = "0.5.0"
+  VERSION = "0.6.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: megatest
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Jean Boussier