Move test helper to module

Shopify · Mar 17, 2023 · f52fc0f · f52fc0f
1 parent 9f95018
commit f52fc0f
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 11 deletions.
diff --git a/spec/erb_lint/cli_spec.rb b/spec/erb_lint/cli_spec.rb
@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require "spec_helper"
+require "spec_utils"
 require "erb_lint/cli"
 require "erb_lint/cache"
 require "pp"
@@ -103,7 +104,7 @@ module ERBLint
         module Linters
           class FakeLinter < Linter
             def run(processed_source)
-              add_offense(source_range_for_code(processed_source, "<violation></violation>"),
+              add_offense(SpecUtils.source_range_for_code(processed_source, "<violation></violation>"),
                 "#{self.class.name} error")
             end
           end

diff --git a/spec/erb_lint/linters/no_unused_disable_spec.rb b/spec/erb_lint/linters/no_unused_disable_spec.rb
@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require "spec_helper"
+require "spec_utils"
 
 describe ERBLint::Linters::NoUnusedDisable do
   let(:linter_config) { described_class.config_schema.new }
@@ -33,7 +34,7 @@ class Fake < ERBLint::Linter
       let(:file) { "<span></span><%# erblint:disable-line Fake %>" }
       before do
         offense = ERBLint::Offense.new(ERBLint::Linters::Fake.new(file_loader, linter_config),
-          source_range_for_code(processed_source, "<span></span>"),
+          SpecUtils.source_range_for_code(processed_source, "<span></span>"),
           "some fake linter message")
         offense.disabled = true
         linter.run(processed_source, [offense])
@@ -52,7 +53,7 @@ class Fake < ERBLint::Linter
       before do
         offense = ERBLint::Offense.new(
           ERBLint::Linters::Fake.new(file_loader, linter_config),
-          source_range_for_code(processed_source, "<span>bad content</span>"),
+          SpecUtils.source_range_for_code(processed_source, "<span>bad content</span>"),
           "some fake linter message"
         )
         offense.disabled = true
@@ -70,7 +71,7 @@ class Fake < ERBLint::Linter
       before do
         offense = ERBLint::Offense.new(
           ERBLint::Linters::Fake.new(file_loader, linter_config),
-          source_range_for_code(processed_source, "<span></span>"),
+          SpecUtils.source_range_for_code(processed_source, "<span></span>"),
           "some fake linter message"
         )
         offense.disabled = true
@@ -91,7 +92,7 @@ class Fake < ERBLint::Linter
       before do
         offense = ERBLint::Offense.new(
           ERBLint::Linters::Fake.new(file_loader, linter_config),
-          source_range_for_code(processed_source, "<span></span>"),
+          SpecUtils.source_range_for_code(processed_source, "<span></span>"),
           "some fake linter message"
         )
         offense.disabled = true

diff --git a/spec/erb_lint/runner_spec.rb b/spec/erb_lint/runner_spec.rb
@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require "spec_helper"
+require "spec_utils"
 
 describe ERBLint::Runner do
   let(:file_loader) { ERBLint::FileLoader.new("/root/directory") }
@@ -138,7 +139,8 @@ module ERBLint
       module Linters
         class FakeLinter3 < Linter
           def run(processed_source)
-            add_offense(source_range_for_code(processed_source, "<span>bad content</span>"), "#{self.class.name} error")
+            add_offense(SpecUtils.source_range_for_code(processed_source, "<span>bad content</span>"),
+              "#{self.class.name} error")
           end
         end
 

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -1,8 +1,3 @@
 # frozen_string_literal: true
 
 require "erb_lint/all"
-
-def source_range_for_code(processed_source, code)
-  offending_source = processed_source.file_content.match(code)
-  processed_source.to_source_range(offending_source.begin(0)...offending_source.end(0))
-end
diff --git a/spec/spec_utils.rb b/spec/spec_utils.rb
@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+module SpecUtils
+  def self.source_range_for_code(processed_source, code)
+    offending_source = processed_source.file_content.match(code)
+    processed_source.to_source_range(offending_source.begin(0)...offending_source.end(0))
+  end
+end