marsh_grass 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 94c562ed414ec9c4d7f9d7801f3e783d3e7f1d08
-  data.tar.gz: 954768dee75685d72489a712810651e9ae6a66f3
+  metadata.gz: 75c25a9fd71d7bc9e868b9d82a590e6c98ec1d3b
+  data.tar.gz: 73e7f8bac791254293a91121b7f63850f438e440
 SHA512:
-  metadata.gz: 44aeb6bb84714c4adb13ab9c1611e0692e75994efb662e4a9c21f133de8554001c2fcb69b7256d755daa299545b48c05b89a8c3c99a67f081907830ef51d4d61
-  data.tar.gz: d83206174d904b9af43b49c7584ed7f7093b3c2ef467f81390cf28bfcb29c757d5e43eb6432c8dd9cb261086016415f07dbd0fe317423cc555f130a92f855a0e
+  metadata.gz: 746ab6c822be5085e6bde4152d27974ba55b9981ec8aee2fd24feef188b8f9744efdd6e7d290f888506c80f86a6b397ad62df49916bf5fcde19c81469dd1455a
+  data.tar.gz: a6ee7aae1fef25f098f76319047185c8760403c159500ff1496e0834eae2a3d681eae4786e59e8bb0d95a4094ff365d6cbedee1187aafc1812ec12b32de47105

data/lib/marsh_grass/rspec.rb

@@ -10,7 +10,21 @@ RSpec.configure do |config|
     example.metadata.delete(tag)
   end
 
+  def run_example_or_duplicate(original_example, test_description)
+    if !original_example.executed?
+      # Let the original example be the first repetition that is printed
+      original_example.metadata[:description] = test_description
+      original_example.run
+    else
+      repetition = original_example.duplicate_with
+      repetition.metadata[:description] = test_description
+      original_example.example_group.context.add_example(repetition)
+    end
+  end
+
   config.around(time_of_day: true) do |original_example|
+    shared_description = original_example.metadata[:description]
+
     now = Time.now
     time_of_day = untag_example(original_example, :time_of_day)
     test_segments = time_of_day.is_a?(Array) ? time_of_day : [time_of_day]
@@ -19,27 +33,15 @@ RSpec.configure do |config|
     minutes_to_run = test_segments.include?(:minutes) ? (0..59) : [now.min]
     seconds_to_run = test_segments.include?(:seconds) ? (0..59) : [now.sec]
 
-    total = hours_to_run.size * minutes_to_run.size * seconds_to_run.size
-
-    def describe_time_of_day(test, hour, minute, second)
-      test.metadata[:description] = "Run Time #{hour}:#{minute}:#{second}: #{test.metadata[:description]}"
-    end
-
-    run_count = 0
     hours_to_run.each do |hour|
       minutes_to_run.each do |minute|
         seconds_to_run.each do |second|
-          run_count += 1
           # Freeze time at the specified hour, minute, and/or second.
           # We need to run the test within the Timecop.freeze block,
           # in order to actually be affected by Timecop.
           Timecop.freeze(now.year, now.month, now.day, hour, minute, second) do
-            # Let the original example be the final repetition
-            last_run = run_count == total
-            example = last_run ? original_example : original_example.duplicate_with
-            # Run example with a helpful description
-            describe_time_of_day(example, hour, minute, second)
-            example.run(original_example.example_group_instance, original_example.reporter)
+            test_description = "Run Time #{hour}:#{minute}:#{second}: #{shared_description}"
+            run_example_or_duplicate(original_example, test_description)
           end
         end
       end
@@ -47,6 +49,8 @@ RSpec.configure do |config|
   end
 
   config.around(surrounding_time: true) do |original_example|
+    shared_description = original_example.metadata[:description]
+
     now = Time.now
     surrounding_time = untag_example(original_example, :surrounding_time)
     hour = surrounding_time.fetch(:hour, now.hour)
@@ -55,10 +59,6 @@ RSpec.configure do |config|
     # 1000 milliseconds before & after the surrounding time
     test_time_float = Time.local(now.year, now.month, now.day, hour, minute, second).to_f
 
-    def describe_exact_time(test, time)
-      test.metadata[:description] = "Run Time #{time.strftime('%H:%M:%S:%L')}: #{test.metadata[:description]}"
-    end
-
     (-1000..1000).each do |millisecond|
       # Travel to the specified hour, minute, second, and millisecond, allowing
       # for time to elapse.
@@ -66,84 +66,60 @@ RSpec.configure do |config|
       # in order to actually be affected by Timecop.
       test_time = Time.at(test_time_float + millisecond.to_f / 1000)
       Timecop.travel(test_time) do
-        # Let the original example be the final repetition
-        last_run = millisecond == 1000
-        example = last_run ? original_example : original_example.duplicate_with
-        # Run example with a helpful description
-        describe_exact_time(example, test_time)
-        example.run(original_example.example_group_instance, original_example.reporter)
+        test_description = "Run Time #{test_time.strftime('%H:%M:%S:%L')}: #{shared_description}"
+        run_example_or_duplicate(original_example, test_description)
       end
     end
   end
 
   config.around(elapsed_time: true) do |original_example|
-    def describe_time_elapsed(test, scale)
-      test.metadata[:description] = "Run Speed #{scale}x Slower: #{test.metadata[:description]}"
-    end
+    shared_description = original_example.metadata[:description]
 
     # Freeze time at the specified hour, minute, and/or second.
     # We need to run the test within the Timecop.freeze block,
     # in order to actually be affected by Timecop.
     time_multipliers = untag_example(original_example, :elapsed_time)
     time_multipliers = (1..10) unless time_multipliers.respond_to?(:each)
+
     time_multipliers.each do |seconds_multiplier|
       Timecop.scale(seconds_multiplier) do
-        # Let the original example be the final repetition
-        last_run = seconds_multiplier == time_multipliers.last
-        example = last_run ? original_example : original_example.duplicate_with
-        # Run example with a helpful description
-        describe_time_elapsed(example, seconds_multiplier)
-        example.run(original_example.example_group_instance, original_example.reporter)
+        test_description = "Run Speed #{seconds_multiplier}x Slower: #{shared_description}"
+        run_example_or_duplicate(original_example, test_description)
       end
     end
   end
 
   config.around(time_zones: true) do |original_example|
+    shared_description = original_example.metadata[:description]
     untag_example(original_example, :time_zones)
 
     utc = Time.now.utc
     time_zone_hours = %w[-12 -11 -10 -09 -08 -07 -06 -05 -04 -03 -02 -01 +00 +01 +02 +03 +04 +05 +06 +07 +08 +09 +10 +11 +12 +13 +14]
     time_zone_minutes = %w[00 30]
 
-    def describe_time_zone(test, time_zone_hour, time_zone_minute)
-      test.metadata[:description] = "Time Zone Offset #{time_zone_hour}:#{time_zone_minute}: #{test.metadata[:description]}"
-    end
-
-    total = time_zone_hours.size * time_zone_minutes.size
-
-    time_zone_hours.each.with_index do |time_zone_hour, hour_index|
-      time_zone_minutes.each.with_index(1) do |time_zone_minute, minute_index|
-        adjustment = "#{time_zone_hour}:#{time_zone_minute}"
-        adjusted_time = Time.new(utc.year, utc.month, utc.day, utc.hour, utc.min, utc.sec, adjustment)
+    time_zone_hours.each do |time_zone_hour|
+      time_zone_minutes.each do |time_zone_minute|
         # We need to run the test within the Timecop.freeze block,
         # in order to actually be affected by Timecop.
+        adjustment = "#{time_zone_hour}:#{time_zone_minute}"
+        adjusted_time = Time.new(utc.year, utc.month, utc.day, utc.hour, utc.min, utc.sec, adjustment)
         Timecop.travel(adjusted_time) do
-          # Let the original example be the final repetition
-          last_run = (hour_index * 2) + minute_index == total
-          example = last_run ? original_example : original_example.duplicate_with
-          # Run example with a helpful description
-          describe_time_zone(example, time_zone_hour, time_zone_minute)
-          example.run(original_example.example_group_instance, original_example.reporter)
+          test_description = "Time Zone Offset #{time_zone_hour}:#{time_zone_minute}: #{shared_description}"
+          run_example_or_duplicate(original_example, test_description)
         end
       end
     end
   end
 
   config.around(repetitions: true) do |original_example|
+    shared_description = original_example.metadata[:description]
+
     repetitions = untag_example(original_example, :repetitions)
     total = repetitions.is_a?(Integer) ? repetitions : 1000
 
-    def describe_repetition_count(test, count, total)
-      test.metadata[:description] = "Repetition #{count} of #{total}: #{test.metadata[:description]}"
-    end
-
     (1..total).each do |count|
-      # Let the original example be the final repetition
-      last_run = count == total
-      example = last_run ? original_example : original_example.duplicate_with
-      # Run example with a helpful description
-      describe_repetition_count(example, count, total)
-      example.run(original_example.example_group_instance, original_example.reporter)
+      test_description = "Repetition #{count} of #{total}: #{shared_description}"
+      run_example_or_duplicate(original_example, test_description)
     end
   end
 end

data/lib/marsh_grass/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module MarshGrass
-  VERSION = '0.1.2'
+  VERSION = '0.1.3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: marsh_grass
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Wes Rich