rubocop-rspec_parity 1.5.0 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4c9e27c87b24c7df00daa4eb0a88c31644a7f9986b384d5c875d42bb8358d071
-  data.tar.gz: aaeab2c5bccca24e24c39250299235ec3a46950f48bee5181a575b2cf45ef683
+  metadata.gz: 2fc4286fcc69b46b490ae21db9ce9681ca7dd25577521e329d0bc3d89b33940a
+  data.tar.gz: da7872a16a143f8d44a178c7b1912996c8d5213fb1538a8f4231e9ceedf361dc
 SHA512:
-  metadata.gz: 858ae886ee9a32d83cd0a8695f0e5d0acc8758af31802ef5fdfe3d4686860dc40991adfa29cacb5a24a4191a9d94011e531b35edccbc40b8300b83c2c46b2996
-  data.tar.gz: 7d1184d3ea750869fcf9d655865e3a1d7b93a3d30f2292bc8e57fbd6cb4166e8da9a8ee274c54ccb9d2f825039911b230ede34731be80f9ade8c98dd3a59e8df
+  metadata.gz: 3d9f782158d6c053256401c6b687eb8b22dd1780f444b42783609b428ea0f82898a33e5c502818df86be8e56847a7be8012a99ead9c3aaffe91e5420d7be5a66
+  data.tar.gz: 44b7a03a46444bcacbec096e659fd435dc288278ba1f14d72d87311d1bca1b4feb32643c68c6fcb3ff2fbb5be1118adddddb8e4ec164b4d710cc00efbb287bc5

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 ## [Unreleased]
 
+## [1.6.0] - 2026-06-11
+
+Fixed: `SufficientContexts` now counts each `it`/`example` within a single context as a separate scenario, so specs that cover branches with multiple examples (instead of separate contexts) no longer trigger false violations
+Updated: `SufficientContexts` violation message now explains that each branch needs one `context` or `it`, and that compound conditions like `a && b` need a scenario per operand
+
 ## [1.5.0] - 2026-05-21
 
 Added: `SufficientContexts` now inlines branches from private/protected helpers that are called from exactly one site in the same class (controlled by the new `TraceSingleUsePrivateMethods` config key, default `true`). Violation messages list the helpers whose branches were counted.

data/lib/rubocop/cop/rspec_parity/sufficient_contexts.rb

@@ -42,8 +42,9 @@ module RuboCop
         include DepartmentConfig
         include SpecFileFinder
 
-        MSG = "Method `%<method_name>s` has %<branches>d %<branch_word>s but only %<contexts>d %<context_word>s " \
-              "in spec. Add %<missing>d more %<missing_word>s to cover all branches."
+        MSG = "Method `%<method_name>s` has %<branches>d %<branch_word>s but the spec covers only " \
+              "%<contexts>d %<scenario_word>s. Add %<missing>d more %<missing_word>s " \
+              "(one `context` or `it` per branch; compound conditions like `a && b` need a scenario per operand)."
 
         TRACED_SUFFIX = " (including branches from: %<traced>s)"
 
@@ -59,6 +60,9 @@ module RuboCop
           /^autosave_/
         ].freeze
 
+        # Tallies extracted from a spec's text for a single method describe block.
+        ParsedSpec = Struct.new(:context_count, :example_count, :has_examples, :has_direct_examples)
+
         def initialize(config = nil, options = nil)
           super
           @ignore_memoization = cop_config.fetch("IgnoreMemoization", true)
@@ -121,9 +125,9 @@ module RuboCop
                            branches: branches,
                            branch_word: pluralize("branch", branches),
                            contexts: contexts,
-                           context_word: pluralize("context", contexts),
+                           scenario_word: pluralize("scenario", contexts),
                            missing: missing,
-                           missing_word: pluralize("context", missing))
+                           missing_word: pluralize("scenario", missing))
           message += format(TRACED_SUFFIX, traced: traced_methods.join(", ")) if traced_methods.any?
           message
         end
@@ -231,21 +235,38 @@ module RuboCop
 
         def count_contexts_for_method(spec_content, method_name)
           method_pattern = Regexp.escape(method_name)
-          context_count, has_examples, has_direct_examples = parse_spec_content(spec_content, method_pattern)
+          result = parse_spec_content(spec_content, method_pattern)
+
+          scenario_count(
+            result.context_count, result.example_count,
+            has_examples: result.has_examples, has_direct_examples: result.has_direct_examples
+          )
+        end
+
+        # A test scenario is the smaller unit between "a context block" and "an
+        # `it`/`example`". A single context whose examples each exercise a branch
+        # covers as many scenarios as it has examples, so the scenario count is
+        # the larger of the context-based count and the raw example count. Empty
+        # placeholder contexts (no examples) still count via the context-based
+        # path, so this never under-counts relative to the old behaviour.
+        def scenario_count(context_count, example_count, has_examples:, has_direct_examples:)
+          context_based =
+            if context_count.positive? && has_direct_examples
+              context_count + 1
+            elsif context_count.zero? && has_examples
+              1
+            else
+              context_count
+            end
 
-          if context_count.positive? && has_direct_examples
-            context_count + 1
-          elsif context_count.zero? && has_examples
-            1
-          else
-            context_count
-          end
+          [context_based, example_count].max
         end
 
         # rubocop:disable Metrics/MethodLength
         def parse_spec_content(spec_content, method_pattern) # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/PerceivedComplexity
           in_method_block = false
           context_count = 0
+          example_count = 0
           has_examples = false
           has_direct_examples = false
           base_indent = 0
@@ -269,6 +290,7 @@ module RuboCop
                 context_count += 1
               elsif nested_example?(line)
                 has_examples = true
+                example_count += 1
                 child_indent ||= current_indent
                 has_direct_examples = true if current_indent == child_indent
               end
@@ -277,7 +299,7 @@ module RuboCop
             end
           end
 
-          [context_count, has_examples, has_direct_examples]
+          ParsedSpec.new(context_count, example_count, has_examples, has_direct_examples)
         end
         # rubocop:enable Metrics/MethodLength
 
@@ -307,7 +329,6 @@ module RuboCop
 
           case word
           when "branch" then "branches"
-          when "context" then "contexts"
           else "#{word}s"
           end
         end
@@ -447,6 +468,7 @@ module RuboCop
           # Count contexts/describes and examples at the top level (under class describe)
           base_indent = lines[describe_line_index].match(/^(\s*)/)[1].length
           context_count = 0
+          example_count = 0
           has_examples = false
           has_direct_examples = false
           child_indent = nil
@@ -462,18 +484,13 @@ module RuboCop
               context_count += 1
             elsif line.match?(/^\s*(?:it|example|specify)\s+/)
               has_examples = true
+              example_count += 1
               child_indent ||= indent
               has_direct_examples = true if indent == child_indent
             end
           end
 
-          if context_count.positive? && has_direct_examples
-            context_count + 1
-          elsif context_count.zero? && has_examples
-            1
-          else
-            context_count
-          end
+          scenario_count(context_count, example_count, has_examples:, has_direct_examples:)
         end
         # rubocop:enable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/MethodLength, Metrics/PerceivedComplexity
       end

data/lib/rubocop/rspec_parity/version.rb

@@ -2,6 +2,6 @@
 
 module RuboCop
   module RSpecParity
-    VERSION = "1.5.0"
+    VERSION = "1.6.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubocop-rspec_parity
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.6.0
 platform: ruby
 authors:
 - Povilas Jurcys