Remove conditional Ruby 2.7 checks

standardrb · Jun 15, 2024 · af79501 · af79501
1 parent 2bbe066
commit af79501
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 17 deletions.
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -29,7 +29,7 @@ jobs:
         uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby-version }}
-          bundler-cache: false # <-- Can reenable this after dropping 2.7
+          bundler-cache: true
       - name: Install dependencies
         run: bundle install
       - name: Run tests for Ruby ${{ matrix.ruby-version }} on ${{ matrix.os }}

diff --git a/Gemfile b/Gemfile
@@ -5,8 +5,4 @@ gem "rake"
 gem "minitest"
 gem "standard"
 gem "m"
-
-# Remove branch after 2.7 is dropped
-if RUBY_VERSION > "3"
-  gem "mocktail"
-end
+gem "mocktail"
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -17,6 +17,9 @@ GEM
       rake (>= 0.9.2.2)
     method_source (1.0.0)
     minitest (5.19.0)
+    mocktail (2.0.0)
+      sorbet-eraser (~> 0.3.1)
+      sorbet-runtime (~> 0.5.9204)
     parallel (1.24.0)
     parser (3.3.1.0)
       ast (~> 2.4.1)
@@ -43,6 +46,8 @@ GEM
       rubocop (>= 1.48.1, < 2.0)
       rubocop-ast (>= 1.31.1, < 2.0)
     ruby-progressbar (1.13.0)
+    sorbet-eraser (0.3.1)
+    sorbet-runtime (0.5.11435)
     standard (1.33.0)
       language_server-protocol (~> 3.17.0.2)
       lint_roller (~> 1.0)
@@ -62,6 +67,7 @@ PLATFORMS
 DEPENDENCIES
   m
   minitest
+  mocktail
   rake
   standard
   standard-performance!

diff --git a/test/standard/performance/builds_ruleset_test.rb b/test/standard/performance/builds_ruleset_test.rb
@@ -1,8 +1,5 @@
 require "test_helper"
 
-# Remove after 2.7 is dropped
-return unless RUBY_VERSION > "3"
-
 module Standard::Performance
   class BuildsRulesetTest < Minitest::Test
     def setup

diff --git a/test/test_helper.rb b/test/test_helper.rb
@@ -3,15 +3,12 @@
 
 require "minitest/autorun"
 
-# Remove branch after 2.7 is dropped
-if RUBY_VERSION > "3"
-  require "mocktail"
+require "mocktail"
 
-  class Minitest::Test
-    include Mocktail::DSL
+class Minitest::Test
+  include Mocktail::DSL
 
-    def teardown
-      Mocktail.reset
-    end
+  def teardown
+    Mocktail.reset
   end
 end