Beef up and restructure the RSpec suite to reduce duplication

lib/rspec/wait.rb

@@ -20,6 +20,7 @@ module Wait
     # From: https://github.com/rspec/rspec-expectations/blob/v3.4.0/lib/rspec/expectations/syntax.rb#L72-L74
     def wait_for(*args, &block)
       raise ArgumentError, "The `wait_for` method only accepts a block." if args.any?
+      raise ArgumentError, "The `wait_for` method requires a block." unless block
 
       Target.new(block)
     end
@@ -28,14 +29,14 @@ def wait(arg = nil, timeout: arg, delay: nil, clone_matcher: nil)
       Proxy.new(timeout: timeout, delay: delay, clone_matcher: clone_matcher)
     end
 
-    def with_wait(options)
+    def with_wait(timeout: nil, delay: nil, clone_matcher: nil)
       original_timeout = RSpec.configuration.wait_timeout
       original_delay = RSpec.configuration.wait_delay
       original_clone_matcher = RSpec.configuration.clone_wait_matcher
 
-      RSpec.configuration.wait_timeout = options[:timeout] if options[:timeout]
-      RSpec.configuration.wait_delay = options[:delay] if options[:delay]
-      RSpec.configuration.clone_wait_matcher = options[:clone_matcher] if options.key?(:clone_matcher)
+      RSpec.configuration.wait_timeout = timeout unless timeout.nil?
+      RSpec.configuration.wait_delay = delay unless delay.nil?
+      RSpec.configuration.clone_wait_matcher = clone_matcher unless clone_matcher.nil?
 
       yield
     ensure
@@ -55,6 +56,6 @@ def with_wait(options)
 
   config.around(wait: {}) do |example|
     options = example.metadata.fetch(:wait)
-    with_wait(options) { example.run }
+    with_wait(**options) { example.run }
   end
 end

lib/rspec/wait/handler.rb

@@ -20,6 +20,8 @@ def handle_matcher(target, initial_matcher, message, &block)
             super(target.call, matcher, message, &block)
           end
         rescue RSpec::Expectations::ExpectationNotMetError
+          raise if RSpec.world.wants_to_quit
+
           elapsed_time = Process.clock_gettime(Process::CLOCK_MONOTONIC) - start_time
           raise if elapsed_time > RSpec.configuration.wait_timeout
 

lib/rspec/wait/proxy.rb

@@ -10,12 +10,13 @@ module Wait
     #   wait(3.seconds).for { this }.to eq(that)
     #
     class Proxy
-      def initialize(options = {})
+      def initialize(**options)
         @options = options
       end
 
       def for(*args, &block)
         raise ArgumentError, "The `wait.for` method only accepts a block." if args.any?
+        raise ArgumentError, "The `wait.for` method requires a block." unless block
 
         Target.new(block, @options)
       end

lib/rspec/wait/target.rb

@@ -35,7 +35,7 @@ def not_to(matcher = nil, message = nil, &block)
       private
 
       def with_wait(&block)
-        Wait.with_wait(@wait_options, &block)
+        Wait.with_wait(**@wait_options, &block)
       end
     end
   end

spec/support/eq_with_bad_memoization.rb

@@ -5,6 +5,7 @@
 RSpec::Matchers.define :eq_with_bad_memoization do |expected|
   match do |actual|
     @memo ||= actual
+    @actual = @memo
     @memo == expected
   end
 end

spec/support/pass_fail_expectations.rb

@@ -0,0 +1,23 @@
+# frozen_string_literal: true
+
+module PassFailExpectations
+  def expect_pass(&block)
+    expect(&block).not_to raise_error
+  end
+
+  def expect_fail(&block)
+    expect(&block).to raise_error(RSpec::Expectations::ExpectationNotMetError) do |error|
+      return error
+    end
+  end
+
+  def expect_error(*args, &block)
+    expect(&block).to raise_error(*args) do |error|
+      return error
+    end
+  end
+end
+
+RSpec.configure do |config|
+  config.include(PassFailExpectations)
+end

spec/support/rspec_shutdown.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module RSpecShutdown
+  def with_rspec_shutting_down_in(seconds)
+    original_wants_to_quit = :unknown
+    wants_to_quit_thread =
+      Thread.new do
+        sleep seconds
+        original_wants_to_quit = RSpec.world.wants_to_quit
+        RSpec.world.wants_to_quit = true
+      end
+
+    yield
+  ensure
+    wants_to_quit_thread&.kill
+    RSpec.world.wants_to_quit = original_wants_to_quit unless original_wants_to_quit == :unknown
+  end
+end
+
+RSpec.configure do |config|
+  config.include(RSpecShutdown)
+end

spec/support/ticker.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+class Ticker
+  attr_reader :timeout, :tape
+
+  def initialize(timeout:)
+    @timeout = timeout
+    @tape = ""
+  end
+
+  def start
+    @ticking =
+      Thread.new do
+        timeout.times do
+          sleep 1
+          @tape += "."
+        end
+      end
+  end
+
+  def length
+    tape.length
+  end
+
+  def stop
+    @ticking&.kill
+  end
+end