test-unit 3.4.9 → 3.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 381321596727dd997b6137fd59dc637ebb74ff6cb0a3f29465116d01c4ceebce
-  data.tar.gz: b18049275749a55cf6e89eeb74d95b21c5904bd46b9845c64b5564dc6e756946
+  metadata.gz: 5d7f5b0dc45031fefcdfb3041dfdc747c92eeaecd992cca117e151e4cac580d2
+  data.tar.gz: b3473fdb9cea9212e89b5c35cfe6ecee43f2c4efd1c69b5ed7bc9c1d97278b23
 SHA512:
-  metadata.gz: f384ac4b1a874f19602fd20bd3d1cda9ad0bff3012c9fafaefb35828b038ca9431b739e123d185927334dcbe63a79e377e2f91f9f9b542288a3e619a87e44baf
-  data.tar.gz: fe8e03f084c69bab668039fc94cdf84f54a6824f724e8528b28dbd21b9b4d1f62e64bf5cb60d64312fc5aded9cc5df20058d64db51b25d5d9fce10cdd89dd902
+  metadata.gz: 6ff80ac0c8e57c424769c1bc393bee079525b6e589e9b81e9aca09915336d63d285e0a26278b6f904c68d87f59c0e6f23231226132440a45dc4b4d05e341401a
+  data.tar.gz: d801dfe17d358768d30711e53c8d27530f9aa46623d44829d839e8c3129351bd3d6ac5fd594fb9a726d21f7657773fd6dcd94c77cf964392a23fda1056245dc3

data/doc/text/news.md

@@ -1,5 +1,12 @@
 # News
 
+## 3.5.0 - 2021-10-18 {#version-3-5-0}
+
+### Fixes
+
+  * Fixed a bug that `keep: true` is ignored when the last `data`
+    doesn't have `keep: true`.
+
 ## 3.4.9 - 2021-10-18 {#version-3-4-9}
 
 ### Improvements

data/lib/test/unit/data-sets.rb

@@ -22,17 +22,16 @@ module Test
         add(data_set)
       end
 
+      def have_keep?
+        each_data_set do |_, options|
+          return true if options[:keep]
+        end
+        false
+      end
+
       def keep
         new_data_sets = self.class.new
-        all_data_sets = Enumerator.new do |yielder|
-          block = lambda do |(data_set, options)|
-            yielder << [data_set, options]
-          end
-          @procs.each(&block)
-          @variables.each(&block)
-          @value_sets.each(&block)
-        end
-        all_data_sets.each do |data_set, options|
+        each_data_set do |data_set, options|
           next if options.nil?
           next unless options[:keep]
           new_data_sets.add(data_set, options)
@@ -79,6 +78,12 @@ module Test
       end
 
       private
+      def each_data_set(&block)
+        @procs.each(&block)
+        @variables.each(&block)
+        @value_sets.each(&block)
+      end
+
       def each_pattern(variables)
         grouped_variables = variables.group_by do |_, options|
           options[:group]

data/lib/test/unit/data.rb

@@ -170,11 +170,11 @@ module Test
           options ||= {}
           data_sets = current_attribute(:data)[:value] || DataSets.new
           data_sets.add(data_set, options)
-          if options[:keep]
+          if options[:keep] or data_sets.have_keep?
             keep_hook = lambda do |attr|
               attr.merge(value: attr[:value].keep)
             end
-            options = options.merge(keep_hook: keep_hook)
+            options = options.merge(keep: true, keep_hook: keep_hook)
           end
           attribute(:data, data_sets, options)
         end

data/lib/test/unit/version.rb

@@ -1,5 +1,5 @@
 module Test
   module Unit
-    VERSION = "3.4.9"
+    VERSION = "3.5.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: test-unit
 version: !ruby/object:Gem::Version
-  version: 3.4.9
+  version: 3.5.0
 platform: ruby
 authors:
 - Kouhei Sutou