rspec skips context hooks if all descendant examples are skipped by d…

…atadog

lib/datadog/ci/contrib/rspec/example.rb

@@ -89,6 +89,18 @@ def finish(reporter)
               super(::RSpec::Core::NullReporter)
             end
 
+            def datadog_test_id
+              @datadog_test_id ||= Utils::TestRun.datadog_test_id(
+                datadog_test_name,
+                datadog_test_suite_name,
+                datadog_test_parameters
+              )
+            end
+
+            def datadog_unskippable?
+              !!metadata[CI::Ext::Test::ITR_UNSKIPPABLE_OPTION]
+            end
+
             private
 
             def fetch_top_level_example_group
@@ -151,10 +163,6 @@ def datadog_test_parameters
               )
             end
 
-            def datadog_unskippable?
-              !!metadata[CI::Ext::Test::ITR_UNSKIPPABLE_OPTION]
-            end
-
             def test_visibility_component
               Datadog.send(:components).test_visibility
             end

lib/datadog/ci/contrib/rspec/example_group.rb

@@ -21,19 +21,16 @@ def run(reporter = ::RSpec::Core::NullReporter)
               return super unless top_level?
 
               suite_name = "#{description} at #{file_path}"
-              test_suite = test_visibility_component.start_test_suite(
+              test_suite = test_visibility_component&.start_test_suite(
                 suite_name,
                 tags: {
                   CI::Ext::Test::TAG_SOURCE_FILE => Git::LocalRepository.relative_to_root(metadata[:file_path]),
                   CI::Ext::Test::TAG_SOURCE_START => metadata[:line_number].to_s
                 }
               )
 
-              # try skipping the whole example group
-              # all_skipped = descendant_filtered_examples.all? do |example|
-              # end
-              all_skipped = false
-              metadata[:skip] = true if all_skipped
+              # skip the context hooks if all descendant example are going to be skipped
+              metadata[:skip] = true if all_examples_skipped_by_datadog?
 
               success = super
               return success unless test_suite
@@ -53,13 +50,23 @@ def run(reporter = ::RSpec::Core::NullReporter)
 
             private
 
+            def all_examples_skipped_by_datadog?
+              descendant_filtered_examples.all? do |example|
+                !example.datadog_unskippable? && test_optimisation_component&.skippable?(example)
+              end
+            end
+
             def datadog_configuration
               Datadog.configuration.ci[:rspec]
             end
 
             def test_visibility_component
               Datadog.send(:components).test_visibility
             end
+
+            def test_optimisation_component
+              Datadog.send(:components).test_optimisation
+            end
           end
         end
       end

sig/datadog/ci/contrib/rspec/example.rbs

@@ -9,12 +9,16 @@ module Datadog
 
             @datadog_test_suite_description: String
 
+            @datadog_test_id: String
             @datadog_test_name: String
             @datadog_test_suite_name: String
             @datadog_test_parameters: String
 
             def run: (untyped example_group_instance, untyped reporter) -> untyped
 
+            def datadog_test_id: () -> String
+            def datadog_unskippable?: () -> bool
+
             private
 
             def fetch_top_level_example_group: () -> Hash[Symbol, untyped]
@@ -28,7 +32,6 @@ module Datadog
             def datadog_test_name: () -> String
             def datadog_test_suite_name: () -> String
             def datadog_test_parameters: () -> String
-            def datadog_unskippable?: () -> bool
           end
         end
       end

sig/datadog/ci/contrib/rspec/example_group.rbs

@@ -12,9 +12,13 @@ module Datadog
 
             private
 
+            def all_examples_skipped_by_datadog?: () -> bool
+
             def datadog_configuration: () -> untyped
 
-            def test_visibility_component: () -> Datadog::CI::TestVisibility::Component
+            def test_visibility_component: () -> Datadog::CI::TestVisibility::Component?
+
+            def test_optimisation_component: () -> Datadog::CI::TestOptimisation::Component?
           end
         end
       end

vendor/rbs/rspec/0/rspec.rbs

@@ -46,6 +46,7 @@ module RSpec::Core::ExampleGroup
     def file_path: () -> String
     def description: () -> String
     def metadata: () -> untyped
+    def descendant_filtered_examples: () -> Array[untyped]
   end
 end