From 3a6aa46f9eeb5dbda64bb29f0b7f699964802bcc Mon Sep 17 00:00:00 2001
From: Marc Anguera <srmarc.ai@gmail.com>
Date: Tue, 8 Oct 2024 10:49:07 +0200
Subject: [PATCH] Remove official support for Ruby 2.5 and 2.6 (#89)

---
 .github/workflows/ci.yml |  8 ++++++--
 Gemfile                  | 13 +++++++------
 Rakefile                 |  6 +++---
 features/support/env.rb  |  1 -
 4 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index b79c582..c62e455 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -1,6 +1,10 @@
 name: CI
 
-on: [push, pull_request]
+on:
+  push:
+    branches: [master]
+  pull_request:
+    branches: [master]
 
 jobs:
   test:
@@ -9,7 +13,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby-version: ["3.3", "3.2", "3.1", "3.0", "2.7", "2.6", "2.5"]
+        ruby-version: ["3.3", "3.2", "3.1", "3.0", "2.7"]
     steps:
       - uses: actions/checkout@v4
       - name: Set up Ruby
diff --git a/Gemfile b/Gemfile
index da0aac8..df85393 100644
--- a/Gemfile
+++ b/Gemfile
@@ -10,12 +10,13 @@ gem 'rake', '~> 13.1', require: false
 gem 'yard', '~> 0.9', require: false
 
 # Test tools
-gem 'pry', '~> 0.10', group: :development
-gem 'aruba', '~> 1.0.0'
-gem 'rspec', '~> 3.0'
-gem 'cucumber', '~> 2.0'
-gem 'capybara', '~> 2.5.0'
+gem 'aruba'
+gem 'cucumber'
+gem 'capybara'
+
+# Optional dependencies, included for tests
 gem 'haml', RUBY_VERSION > '3.0' ? '< 7' : '< 6'
 gem 'slim', '>= 3', '< 5'
 gem 'kramdown'
-gem "redcarpet"
+gem 'redcarpet'
+gem 'rack', '< 3'
diff --git a/Rakefile b/Rakefile
index cdb49fc..737f790 100644
--- a/Rakefile
+++ b/Rakefile
@@ -2,9 +2,9 @@ require 'bundler/gem_tasks'
 require 'cucumber/rake/task'
 
 Cucumber::Rake::Task.new(:cucumber, 'Run features that should pass') do |t|
-  exempt_tags = ""
-  exempt_tags << "--tags ~@nojava " if RUBY_PLATFORM == "java"
-  t.cucumber_opts = "--color --tags ~@wip #{exempt_tags} --strict --format #{ENV['CUCUMBER_FORMAT'] || 'pretty'}"
+  exempt_tags = ["--tags 'not @wip'"]
+  exempt_tags << "--tags 'not @nojava'" if RUBY_PLATFORM == "java"
+  t.cucumber_opts = "--require features --color #{exempt_tags.join(' ')} --strict --format #{ENV['CUCUMBER_FORMAT'] || 'pretty'}"
 end
 
 task :test => ["cucumber"]
diff --git a/features/support/env.rb b/features/support/env.rb
index 880eec4..99d7e4f 100644
--- a/features/support/env.rb
+++ b/features/support/env.rb
@@ -3,4 +3,3 @@
 require "middleman-core"
 require "middleman-core/step_definitions"
 require File.join(PROJECT_ROOT_PATH, 'lib', 'middleman-syntax')
-