Merge pull request #14429 from dduugg/rm-rspec-wait

Refactor away rspec-wait
Homebrew · Jan 25, 2023 · e4c18be · e4c18be
2 parents 71fab93 + f126f0d
commit e4c18be
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 9 deletions.
diff --git a/Library/Homebrew/Gemfile b/Library/Homebrew/Gemfile
@@ -25,7 +25,6 @@ gem "rspec-its", require: false
 gem "rspec_junit_formatter", require: false
 gem "rspec-retry", require: false
 gem "rspec-sorbet", require: false
-gem "rspec-wait", require: false
 gem "rubocop", require: false
 gem "rubocop-ast", require: false
 gem "simplecov", require: false

diff --git a/Library/Homebrew/Gemfile.lock b/Library/Homebrew/Gemfile.lock
@@ -128,8 +128,6 @@ GEM
     rspec-sorbet (1.9.1)
       sorbet-runtime
     rspec-support (3.12.0)
-    rspec-wait (0.0.9)
-      rspec (>= 3, < 4)
     rspec_junit_formatter (0.6.0)
       rspec-core (>= 2, < 4, != 2.12.0)
     rubocop (1.44.0)
@@ -248,7 +246,6 @@ DEPENDENCIES
   rspec-its
   rspec-retry
   rspec-sorbet
-  rspec-wait
   rspec_junit_formatter
   rubocop
   rubocop-ast

diff --git a/Library/Homebrew/test/spec_helper.rb b/Library/Homebrew/test/spec_helper.rb
@@ -27,7 +27,6 @@
 
 require "rspec/its"
 require "rspec/github"
-require "rspec/wait"
 require "rspec/retry"
 require "rspec/sorbet"
 require "rubocop/rspec/support"

diff --git a/Library/Homebrew/test/system_command_spec.rb b/Library/Homebrew/test/system_command_spec.rb
@@ -196,10 +196,8 @@
       ] }
     }
 
-    it "returns without deadlocking" do
-      wait(30).for {
-        described_class.run(command, **options)
-      }.to be_a_success
+    it "returns without deadlocking", timeout: 30 do
+      expect(described_class.run(command, **options)).to be_a_success
     end
   end