From fb9d9eebd82388ce7de390ceba491edac6a45de0 Mon Sep 17 00:00:00 2001
From: nick evans <nicholas.evans@gmail.com>
Date: Mon, 21 Aug 2023 14:41:07 -0400
Subject: [PATCH] =?UTF-8?q?=E2=99=BB=EF=B8=8F=20Use=20Net::IMAP::FakeServe?=
 =?UTF-8?q?r::TestHelper?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

The module was originally extracted from this code, and this was
accidentally left behind when `Net::IMAP::FakeServer::TestHelper` was
originally committed.
---
 test/net/imap/fake_server/test_helper.rb |  1 +
 test/net/imap/test_imap.rb               | 25 ++----------------------
 2 files changed, 3 insertions(+), 23 deletions(-)

diff --git a/test/net/imap/fake_server/test_helper.rb b/test/net/imap/fake_server/test_helper.rb
index d9777c6f..1291a3a7 100644
--- a/test/net/imap/fake_server/test_helper.rb
+++ b/test/net/imap/fake_server/test_helper.rb
@@ -15,6 +15,7 @@ def with_fake_server(select: nil, timeout: 5, **opts)
         if select
           client.select(select)
           server.commands.pop
+          assert server.state.selected?
         end
         yield server, client
       ensure
diff --git a/test/net/imap/test_imap.rb b/test/net/imap/test_imap.rb
index a3911d52..291a97b5 100644
--- a/test/net/imap/test_imap.rb
+++ b/test/net/imap/test_imap.rb
@@ -9,6 +9,8 @@ class IMAPTest < Test::Unit::TestCase
   SERVER_KEY = File.expand_path("../fixtures/server.key", __dir__)
   SERVER_CERT = File.expand_path("../fixtures/server.crt", __dir__)
 
+  include Net::IMAP::FakeServer::TestHelper
+
   def setup
     @do_not_reverse_lookup = Socket.do_not_reverse_lookup
     Socket.do_not_reverse_lookup = true
@@ -1031,29 +1033,6 @@ def test_unselect
 
   private
 
-  def with_fake_server(select: nil, timeout: 5, **opts)
-    Timeout.timeout(timeout) do
-      server = Net::IMAP::FakeServer.new(timeout: timeout, **opts)
-      @threads << Thread.new do server.run end
-      tls = opts[:implicit_tls]
-      tls = {ca_file: server.config.tls[:ca_file]} if tls == true
-      client = Net::IMAP.new("localhost", port: server.port, ssl: tls)
-      begin
-        if select
-          client.select(select)
-          server.commands.pop
-          assert server.state.selected?
-        end
-        yield server, client
-      ensure
-        client.logout rescue pp $!
-        client.disconnect if !client.disconnected?
-      end
-    ensure
-      server&.shutdown
-    end
-  end
-
   def imaps_test(timeout: 10)
     Timeout.timeout(timeout) do
       server = create_tcp_server