Merge pull request #13734 from dvandersluis/fix-expect-offense

dvandersluis · web-flow · commit 617fd406d16c · 2025-01-21T10:36:27.000-05:00
Fix `ExpectOffense` when a source line contains an escaped caret
diff --git a/lib/rubocop/rspec/expect_offense.rb b/lib/rubocop/rspec/expect_offense.rb
@@ -190,8 +190,10 @@ def expect_no_corrections
       def expect_no_offenses(source, file = nil)
         offenses = inspect_source(source, file)
 
-        # Carets given in `expect_no_offenses` should not be treated as annotations so are escaped
-        expected_annotations = AnnotatedSource.parse(source.gsub('^', '\^'))
+        # Since source given `expect_no_offenses` does not have annotations, we do not need to parse
+        # for them, and can just build an `AnnotatedSource` object from the source lines.
+        # This also prevents treating source lines that begin with a caret as an annotation.
+        expected_annotations = AnnotatedSource.new(source.each_line.to_a, [])
         actual_annotations = expected_annotations.with_offense_annotations(offenses)
         expect(actual_annotations.to_s).to eq(source)
       end
@@ -240,7 +242,7 @@ def self.parse(annotated_source)
             if ANNOTATION_PATTERN.match?(source_line)
               annotations << [source.size, source_line]
             else
-              source << source_line.gsub('\^', '^')
+              source << source_line
             end
           end
           annotations.each { |a| a[0] = 1 } if source.empty?
