Merge pull request #850 from cucumber/test-with-ruby-3-1

mvz · web-flow · commit 031cc156ff0b · 2022-01-07T13:18:53.000+01:00
Test with Ruby 3.1 in CI
diff --git a/.github/workflows/ruby.yml b/.github/workflows/ruby.yml
@@ -14,6 +14,7 @@ on:
 
 env:
   CUCUMBER_PUBLISH_QUIET: true
+  RUBYOPTS: "--disable-did-you-mean"
   JRUBY_OPTS: "--dev"
 
 jobs:
@@ -22,7 +23,7 @@ jobs:
 
     strategy:
       matrix:
-        ruby: ["3.0", jruby-9.2]
+        ruby: ["3.0", "3.1", jruby-9.2]
         appraisal: [cucumber_7]
         include:
           - ruby: "2.5"
diff --git a/.simplecov b/.simplecov
@@ -31,6 +31,3 @@ SimpleCov.configure do
   # lets, befores, afters, etc are being used.
   add_group "Specs", "spec/"
 end
-
-# Run simplecov by default
-SimpleCov.start unless ENV.key? "ARUBA_NO_COVERAGE"
diff --git a/features/support/simplecov_setup.rb b/features/support/simplecov_setup.rb
@@ -3,7 +3,10 @@
 unless RUBY_PLATFORM.include?("java")
   require "simplecov"
   root = File.expand_path("../..", __dir__)
-  SimpleCov.command_name(ENV["SIMPLECOV_COMMAND_NAME"])
+  command_name = ENV["SIMPLECOV_COMMAND_NAME"] || "Cucumber Features"
+  SimpleCov.command_name(command_name)
   SimpleCov.root(root)
-  load File.join(root, ".simplecov")
+
+  # Run simplecov by default
+  SimpleCov.start unless ENV.key? "ARUBA_NO_COVERAGE"
 end
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -2,8 +2,10 @@
 
 unless RUBY_PLATFORM.include?("java")
   require "simplecov"
-  SimpleCov.command_name "rspec"
-  SimpleCov.start
+  SimpleCov.command_name "RSpec"
+
+  # Run simplecov by default
+  SimpleCov.start unless ENV.key? "ARUBA_NO_COVERAGE"
 end
 
 # Loading support files
