From f2abd4bff5045474c695a3483972f05bf01c0a53 Mon Sep 17 00:00:00 2001 From: Jon Rowe Date: Thu, 19 Jun 2025 08:15:42 +0100 Subject: [PATCH 1/2] Upgrade aruba Also updates cucumber pin to existing version --- rspec-rails.gemspec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rspec-rails.gemspec b/rspec-rails.gemspec index ef3f76352..6e30a5180 100644 --- a/rspec-rails.gemspec +++ b/rspec-rails.gemspec @@ -53,6 +53,6 @@ Gem::Specification.new do |s| end s.add_development_dependency 'ammeter', '~> 1.1.5' - s.add_development_dependency 'aruba', '~> 0.14.12' - s.add_development_dependency 'cucumber', '> 7.0' + s.add_development_dependency 'aruba', '~> 2.3.1' + s.add_development_dependency 'cucumber', '>= 10.0' end From 8b0681f2366d5209c89734ed612a5330e0425e5c Mon Sep 17 00:00:00 2001 From: Jon Rowe Date: Thu, 19 Jun 2025 08:27:51 +0100 Subject: [PATCH 2/2] Swap out our aruba extension for the modern command --- features/support/env.rb | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/features/support/env.rb b/features/support/env.rb index 7dd6b471e..d2dd4bf4d 100644 --- a/features/support/env.rb +++ b/features/support/env.rb @@ -2,13 +2,14 @@ require 'fileutils' module ArubaExt - def run_command(cmd, timeout = nil) + def run_command_and_stop(cmd, opts = {}) exec_cmd = cmd =~ /^rspec/ ? "bin/#{cmd}" : cmd + unset_bundler_env_vars # Ensure the correct Gemfile and binstubs are found in_current_directory do with_unbundled_env do - super(exec_cmd, timeout) + super(exec_cmd, opts) end end end