Merge pull request #31 from Earlopain/better-integration-tests

Better integration tests
rubocop · Dec 18, 2023 · 0ca0d0d · 0ca0d0d
2 parents 330cd43 + ef62838
commit 0ca0d0d
Show file tree

Hide file tree

Showing 19 changed files with 654 additions and 444 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -21,7 +21,7 @@ jobs:
         rubocop_version: [""]
         include:
         - ruby: "2.6"
-          rubocop_version: "'1.0.0'"
+          rubocop_version: "'1.45.0'"
         - ruby: "3.2"
           rubocop_version: "github: 'rubocop/rubocop'"
     steps:

diff --git a/lib/rubocop/markdown/preprocess.rb b/lib/rubocop/markdown/preprocess.rb
@@ -39,11 +39,15 @@ class << self
         # using preproccessed source buffer.
         #
         # We have to restore it.
-        def restore!(file)
+        def restore_and_save!(file)
           contents = File.read(file)
-          contents.gsub!(/^##{MARKER}/m, "")
+          restore!(contents)
           File.write(file, contents)
         end
+
+        def restore!(src)
+          src.gsub!(/^##{MARKER}/m, "")
+        end
       end
 
       attr_reader :config

diff --git a/lib/rubocop/markdown/rubocop_ext.rb b/lib/rubocop/markdown/rubocop_ext.rb
@@ -62,30 +62,32 @@ def file_offense_cache(file)
     super
   end
 
-  def inspect_file(*args)
-    super.tap do |(offenses, *)|
-      # Skip offenses reported for ignored MD source (trailing whitespaces, etc.)
-      marker_comment = "##{RuboCop::Markdown::Preprocess::MARKER}"
-      offenses.reject! do |offense|
-        next if RuboCop::Markdown::MARKDOWN_OFFENSE_COPS.include?(offense.cop_name)
-
-        offense.location.source_line.start_with?(marker_comment)
-      end
-    end
-  end
-
   def file_finished(file, offenses)
     return super unless RuboCop::Markdown.markdown_file?(file)
 
     # Run Preprocess.restore if file has been autocorrected
     if @options[:auto_correct] || @options[:autocorrect]
-      RuboCop::Markdown::Preprocess.restore!(file)
+      RuboCop::Markdown::Preprocess.restore_and_save!(file)
     end
 
     super(file, offenses)
   end
 end)
 
+RuboCop::Cop::Commissioner::InvestigationReport.prepend(Module.new do
+  # Skip offenses reported for ignored MD source (trailing whitespaces, etc.)
+  def offenses
+    @offenses ||= begin
+      marker_comment = "##{RuboCop::Markdown::Preprocess::MARKER}"
+      offenses_per_cop.flatten(1).reject do |offense|
+        next if RuboCop::Markdown::MARKDOWN_OFFENSE_COPS.include?(offense.cop_name)
+
+        offense.location.source_line.start_with?(marker_comment)
+      end
+    end
+  end
+end)
+
 # Allow Rubocop to analyze markdown files
 RuboCop::TargetFinder.prepend(Module.new do
   def ruby_file?(file)

diff --git a/rubocop-md.gemspec b/rubocop-md.gemspec
@@ -27,7 +27,7 @@ Gem::Specification.new do |spec|
 
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency "rubocop", ">= 1.0"
+  spec.add_runtime_dependency "rubocop", ">= 1.45"
 
   spec.add_development_dependency "bundler", ">= 1.15"
   spec.add_development_dependency "rake", ">= 13.0"

diff --git a/test/fixtures/NON_CODE_OFFENSES.md b/test/fixtures/NON_CODE_OFFENSES.md
diff --git a/test/fixtures/backticks.md b/test/fixtures/backticks.md
diff --git a/test/fixtures/configs/no_autodetect.yml → test/fixtures/configs/config.yml b/test/fixtures/configs/no_autodetect.yml → test/fixtures/configs/config.yml
@@ -1,4 +1 @@
 inherit_from: "../../../.rubocop.yml"
-
-Markdown:
-  Autodetect: false
diff --git a/...es/configs/no_autodetect_with_require.yml → .../fixtures/configs/config_with_require.yml b/...es/configs/no_autodetect_with_require.yml → .../fixtures/configs/config_with_require.yml
@@ -2,6 +2,3 @@ inherit_from: "../../../.rubocop.yml"
 
 require:
   - "rubocop-md"
-
-Markdown:
-  Autodetect: false
diff --git a/test/fixtures/configs/no_warn_invalid.yml b/test/fixtures/configs/no_warn_invalid.yml
diff --git a/test/fixtures/configs/no_warn_invalid_with_require.yml b/test/fixtures/configs/no_warn_invalid_with_require.yml
diff --git a/test/fixtures/in_flight_parse.rb b/test/fixtures/in_flight_parse.rb
diff --git a/test/fixtures/multiple_invalid_snippets.md b/test/fixtures/multiple_invalid_snippets.md
diff --git a/test/fixtures/multiple_invalid_snippets_unknown.md b/test/fixtures/multiple_invalid_snippets_unknown.md
diff --git a/test/fixtures/multiple_snippets.markdown b/test/fixtures/multiple_snippets.markdown