Update to ruby/spec@902ab83

5 files changed, 24 insertions, 22 deletions

diff --git a/spec/ruby/security/cve_2019_8321_spec.rb b/spec/ruby/security/cve_2019_8321_spec.rb
index a8a86e7d97..84cd10ced1 100644
--- a/spec/ruby/security/cve_2019_8321_spec.rb
+++ b/spec/ruby/security/cve_2019_8321_spec.rb
@@ -1,20 +1,22 @@
 require_relative '../spec_helper'
 
-require 'rubygems'
-require 'rubygems/user_interaction'
+guard_not -> { platform_is :darwin and ENV['GITHUB_ACTIONS'] } do # frequent timeout/hang on macOS in GitHub Actions
+  require 'rubygems'
+  require 'rubygems/user_interaction'
 
-describe "CVE-2019-8321 is resisted by" do
-  it "sanitising verbose messages" do
-    ui = Class.new {
-      include Gem::UserInteraction
-    }.new
-    ui.should_receive(:say).with(".]2;nyan.")
-    verbose_before = Gem.configuration.verbose
-    begin
-      Gem.configuration.verbose = :really_verbose
-      ui.verbose("\e]2;nyan\a")
-    ensure
-      Gem.configuration.verbose = verbose_before
+  describe "CVE-2019-8321 is resisted by" do
+    it "sanitising verbose messages" do
+      ui = Class.new {
+        include Gem::UserInteraction
+      }.new
+      ui.should_receive(:say).with(".]2;nyan.")
+      verbose_before = Gem.configuration.verbose
+      begin
+        Gem.configuration.verbose = :really_verbose
+        ui.verbose("\e]2;nyan\a")
+      ensure
+        Gem.configuration.verbose = verbose_before
+      end
     end
   end
 end
diff --git a/spec/ruby/security/cve_2019_8322_spec.rb b/spec/ruby/security/cve_2019_8322_spec.rb
index a84d7a5a95..6f996572c5 100644
--- a/spec/ruby/security/cve_2019_8322_spec.rb
+++ b/spec/ruby/security/cve_2019_8322_spec.rb
@@ -1,11 +1,11 @@
 require_relative '../spec_helper'
 
-require 'yaml'
-require 'rubygems'
-require 'rubygems/safe_yaml'
-require 'rubygems/commands/owner_command'
+guard_not -> { platform_is :darwin and ENV['GITHUB_ACTIONS'] } do # frequent timeout/hang on macOS in GitHub Actions
+  require 'yaml'
+  require 'rubygems'
+  require 'rubygems/safe_yaml'
+  require 'rubygems/commands/owner_command'
 
-platform_is_not :darwin do # frequent timeout/hang on macOS
   describe "CVE-2019-8322 is resisted by" do
     it "sanitising owner names" do
       command = Gem::Commands::OwnerCommand.new
diff --git a/spec/ruby/security/cve_2019_8323_spec.rb b/spec/ruby/security/cve_2019_8323_spec.rb
index 3632d3b028..c98aae9021 100644
--- a/spec/ruby/security/cve_2019_8323_spec.rb
+++ b/spec/ruby/security/cve_2019_8323_spec.rb
@@ -1,6 +1,6 @@
 require_relative '../spec_helper'
 
-platform_is_not :darwin do # frequent timeout/hang on macOS
+guard_not -> { platform_is :darwin and ENV['GITHUB_ACTIONS'] } do # frequent timeout/hang on macOS in GitHub Actions
   require 'optparse'
 
   require 'rubygems'
diff --git a/spec/ruby/security/cve_2019_8325_spec.rb b/spec/ruby/security/cve_2019_8325_spec.rb
index 309445a50f..c8978e00e5 100644
--- a/spec/ruby/security/cve_2019_8325_spec.rb
+++ b/spec/ruby/security/cve_2019_8325_spec.rb
@@ -1,6 +1,6 @@
 require_relative '../spec_helper'
 
-platform_is_not :darwin do # frequent timeout/hang on macOS
+guard_not -> { platform_is :darwin and ENV['GITHUB_ACTIONS'] } do # frequent timeout/hang on macOS in GitHub Actions
   require 'rubygems'
   require 'rubygems/command_manager'
 
diff --git a/spec/ruby/security/cve_2020_10663_spec.rb b/spec/ruby/security/cve_2020_10663_spec.rb
index 766590d501..159fdc0cb4 100644
--- a/spec/ruby/security/cve_2020_10663_spec.rb
+++ b/spec/ruby/security/cve_2020_10663_spec.rb
@@ -22,7 +22,7 @@ guard -> {
   JSON.const_defined?(:Pure) or
   version_is(JSON::VERSION, '2.3.0')
 } do
-  platform_is_not :darwin do # frequent timeout/hang on macOS
+  guard_not -> { platform_is :darwin and ENV['GITHUB_ACTIONS'] } do # frequent timeout/hang on macOS in GitHub Actions
     describe "CVE-2020-10663 is resisted by" do
       it "only creating custom objects if passed create_additions: true or using JSON.load" do
         obj = JSONSpecs::MyClass.new("bar")