flakey_spec_catcher 0.10.0 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9894969be42fdb7dfafa961942ce16b1313ca3cffdc746d9613ebe1398d39069
-  data.tar.gz: 75238a79f25ddb8cec6fd60064e9f06d5f5651b8bb3c27e423f317f653f65774
+  metadata.gz: 1be370079a94e8f578e03be6e8683cd76ff8d1f5656422427c8ca3920856b38c
+  data.tar.gz: 6dddff4adf5e7f452a366bff7b67a50e8e4a04e64a9165c80e9318235afcae33
 SHA512:
-  metadata.gz: d3698a10fd2c5d4ae75f3fe0250d7578a82906eb6ad478c759756911501b8f53125a63f1ced325e51c6115a9f76c7ac2264ae28a42c8b65273376186e8e7aa34
-  data.tar.gz: 440e5ef180775556f3292548330cf9572db13d82394921fbbca6053b37ed4c088aa5c37b9dcb06ab2fb4049879c7fe2a093a60cf05da649abb950bf01d0af6cf
+  metadata.gz: b49520ad8fe8a9115ae04bf90c93159694c0bcbbae087acaa9953aac26927b61efb68e3531d9097ea86b5b60d8bf6f84df685baf6798c95bcd0f5e560c752af5
+  data.tar.gz: 927b24f3283dfdd8575c3210a560c21a63f315bc98ada713390b15ac1d3dea0773534d761bf51ca5216eaee03567f7602e50615dc85fdab52620ab78ea456070

data/lib/flakey_spec_catcher/change_capsule.rb

@@ -8,7 +8,7 @@ module FlakeySpecCatcher
   # A ChangeCapsule object will represent the changes made to a block of code. It
   # accomplishes this using ChangeContext and ChangeSummary objects.
   class ChangeCapsule
-    attr_reader :file_name, :change_summary, :change_contexts
+    attr_reader :file_name, :change_summary, :change_contexts, :spec_tree
     SCOPE_SPECIFIERS = %w[it context describe scenario].freeze
     SHARED_EXAMPLES = %w[include_examples it_behaves_like it_should_behave_like matching].freeze
 
@@ -16,6 +16,7 @@ module FlakeySpecCatcher
       @file_name = file_name
       @change_summary = change_summary
       @change_contexts = []
+      @spec_tree = {}
       handle_initial_change_contexts(change_contexts)
     end
 
@@ -112,6 +113,20 @@ module FlakeySpecCatcher
 
       change_context_stack.push(change_context) unless
         change_context_stack.any? { |c| c == change_context }
+
+      build_spec_tree(change_context_stack)
+    end
+
+    def build_spec_tree(change_contexts)
+      return unless change_contexts.count > 1
+
+      current_scope = change_contexts[-1].rerun_info
+      parent_scope = change_contexts[-2].rerun_info
+      @spec_tree[parent_scope] = if @spec_tree[parent_scope]
+        @spec_tree[parent_scope] << current_scope
+      else
+        [current_scope]
+      end
     end
   end
 end

data/lib/flakey_spec_catcher/cli_override.rb

@@ -9,6 +9,7 @@ module FlakeySpecCatcher
   class CliOverride
     attr_reader :rerun_patterns, :rerun_usage, :repeat_factor, :enable_runs, :excluded_tags, :use_parent, :dry_run
     attr_reader :output_file, :split_nodes, :split_index, :verbose, :test_options, :break_on_first_failure
+    attr_reader :list_child_specs
 
     def initialize
       @dry_run = false
@@ -60,6 +61,10 @@ module FlakeySpecCatcher
           @break_on_first_failure = break_on_first_failure
         end
 
+        opts.on('--list-child-specs', 'List Child Specs (Verbose Spec Listing') do |list_child_specs|
+          @list_child_specs = list_child_specs
+        end
+
         opts.on('-e', '--excluded-tags=EXCLUDED_TAGS',
                 'Specify tags to exclude in a comma separated list') do |tags|
           @excluded_tags = parse_tags(tags)

data/lib/flakey_spec_catcher/rerun_manager.rb

@@ -39,6 +39,7 @@ module FlakeySpecCatcher
       else
         all_non_example_groups - identify_tag_excluded_reruns
       end
+      tests = transform_parent_specs(tests).flatten if @user_config.list_child_specs
       filter_reruns_by_ignore_files(tests)
     end
 
@@ -171,5 +172,23 @@ module FlakeySpecCatcher
         @rerun_capsules.push(FlakeySpecCatcher::RerunCapsule.new(testcase: testcase, usage: usage))
       end
     end
+
+    def transform_parent_specs(tests)
+      transformed_tests = []
+      tests.each do |test|
+        capsule = @git_controller.capsule_manager.change_capsules.find { |c| c.file_name == test.split(':')[0] }
+        spec_tree = capsule.spec_tree
+        # If test is a key in the spec_tree, it's an example group, so we queue up its descendant examples
+        if spec_tree[test]
+          spec_tree[test].each do |child|
+            transformed_tests << transform_parent_specs([child]).flatten
+          end
+        # Else test is just an example
+        else
+          transformed_tests << test
+        end
+      end
+      transformed_tests
+    end
   end
 end

data/lib/flakey_spec_catcher/user_config.rb

@@ -12,11 +12,11 @@ module FlakeySpecCatcher
     attr_reader :manual_rerun_patterns, :manual_rerun_usage
     attr_reader :enable_runs, :output_file, :use_parent, :dry_run
     attr_reader :split_nodes, :split_index, :verbose, :test_options
-    attr_reader :break_on_first_failure
+    attr_reader :break_on_first_failure, :list_child_specs
 
     USER_CONFIG_ENV_VARS = %w[FSC_REPEAT_FACTOR FSC_IGNORE_FILES FSC_IGNORE_BRANCHES
                               FSC_SILENT_MODE FSC_RERUN_FILE_ONLY FSC_USAGE_PATTERNS
-                              FSC_EXCLUDED_TAGS FSC_OUTPUT_FILE].freeze
+                              FSC_EXCLUDED_TAGS FSC_OUTPUT_FILE FSC_LIST_CHILD_SPECS].freeze
 
     def initialize(cli_override: CliOverride.new)
       apply_env_var_settings
@@ -33,6 +33,7 @@ module FlakeySpecCatcher
       @ignore_branches = env_var_string_to_array(ENV['FSC_IGNORE_BRANCHES'])
       @silent_mode = env_var_string_to_bool(ENV['FSC_SILENT_MODE'])
       @rerun_file_only = env_var_string_to_bool(ENV['FSC_RERUN_FILE_ONLY'])
+      @list_child_specs = env_var_string_to_bool(ENV['FSC_LIST_CHILD_SPECS'])
       @rspec_usage_patterns = env_var_string_to_pairs(ENV['FSC_USAGE_PATTERNS'])
       @excluded_tags = env_var_string_to_tags(ENV['FSC_EXCLUDED_TAGS'])
       @output_file = ENV['FSC_OUTPUT_FILE']
@@ -46,6 +47,7 @@ module FlakeySpecCatcher
       @use_parent = @cli_override.use_parent
       @repeat_factor = @cli_override.repeat_factor if @cli_override.repeat_factor.to_i.positive?
       @break_on_first_failure = @cli_override.break_on_first_failure
+      @list_child_specs = @cli_override.list_child_specs unless @cli_override.list_child_specs.nil?
       @enable_runs = @cli_override.enable_runs
       @dry_run = @cli_override.dry_run
       @split_nodes = @cli_override.split_nodes unless @cli_override.split_nodes.nil?
@@ -170,7 +172,7 @@ module FlakeySpecCatcher
       end
     end
 
-    # rubocop:disable Metrics/CyclomaticComplexity
+    # rubocop:disable Metrics/CyclomaticComplexity, Metrics/MethodLength
     def override_user_config(env_var, env_value)
       case env_var
       when 'FSC_REPEAT_FACTOR'
@@ -183,6 +185,8 @@ module FlakeySpecCatcher
         @silent_mode = env_var_string_to_bool(env_value)
       when 'FSC_RERUN_FILE_ONLY'
         @rerun_file_only = env_var_string_to_bool(env_value)
+      when 'FSC_LIST_CHILD_SPECS'
+        @list_child_specs = env_var_string_to_bool(env_value)
       when 'FSC_USAGE_PATTERNS'
         @rspec_usage_patterns = env_var_string_to_pairs(env_value)
       when 'FSC_EXCLUDED_TAGS'
@@ -191,6 +195,6 @@ module FlakeySpecCatcher
         @output_file = env_value
       end
     end
-    # rubocop:enable Metrics/CyclomaticComplexity
+    # rubocop:enable Metrics/CyclomaticComplexity, Metrics/MethodLength
   end
 end

data/lib/flakey_spec_catcher/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module FlakeySpecCatcher
-  VERSION = '0.10.0'
+  VERSION = '0.11.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flakey_spec_catcher
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.11.0
 platform: ruby
 authors:
 - Brian Watson
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-07-28 00:00:00.000000000 Z
+date: 2021-10-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec