summaryrefslogtreecommitdiff
path: root/spec/support/integration_specs.rb
diff options
context:
space:
mode:
authorPeter Goldstein <peter.m.goldstein@gmail.com>2022-01-27 18:59:24 -0800
committerGitHub <noreply@github.com>2022-01-27 18:59:24 -0800
commit3e57eb531f2d028cb56cd1ddab9bb07c70b93abf (patch)
treeca47e5a94dde4b16d7fcd841a9becfb6cb6d9245 /spec/support/integration_specs.rb
parent4dc015eb522abfaa2323c36024bc214ab8ccb9cc (diff)
downloadhashie-3e57eb531f2d028cb56cd1ddab9bb07c70b93abf.tar.gz
Add Ruby 3.1 to CI (#558)
* Add Ruby 3.1 to CI Update Rubocop for recent Rubies Disable Rubocop run for Rubies before Ruby 2.4 Quote '3.0' in the CI configuration to ensure it loads a 3.0.x Ruby Set RUBYOPT="--disable_error_highlight" so Ruby 3.1 error matchers pass * Add CHANGELOG.md entry * Re-add deleted line from CHANGELOG.md * Set minimum supported Ruby version to 2.4. Remove a number of code bits designed to support Rubies below version 2.4 * Bump version. Remove unneeded require from Gemfile. Add require to spec/support file
Diffstat (limited to 'spec/support/integration_specs.rb')
-rw-r--r--spec/support/integration_specs.rb9
1 files changed, 8 insertions, 1 deletions
diff --git a/spec/support/integration_specs.rb b/spec/support/integration_specs.rb
index ea0da53..431167d 100644
--- a/spec/support/integration_specs.rb
+++ b/spec/support/integration_specs.rb
@@ -1,10 +1,17 @@
+require File.expand_path('../../../lib/hashie/extensions/ruby_version', __FILE__)
+
# Generates the bundle command for running an integration test
#
# @param [String] integration the integration folder to run
# @param [String] command the command to run
# @return [String]
def integration_command(integration, command)
- "#{integration_gemfile(integration)} #{command}"
+ if Hashie::Extensions::RubyVersion.new(RUBY_VERSION) >=
+ Hashie::Extensions::RubyVersion.new('3.1.0')
+ ruby_opts = "RUBYOPT=--disable-error_highlight "
+ end
+
+ "#{ruby_opts}#{integration_gemfile(integration)} #{command}"
end
# Generates the Gemfile for an integration