Skip to content

Commit fb9d9ee

Browse files
committed
♻️ Use Net::IMAP::FakeServer::TestHelper
The module was originally extracted from this code, and this was accidentally left behind when `Net::IMAP::FakeServer::TestHelper` was originally committed.
1 parent c841cae commit fb9d9ee

File tree

2 files changed

+3
-23
lines changed

2 files changed

+3
-23
lines changed

test/net/imap/fake_server/test_helper.rb

+1
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ def with_fake_server(select: nil, timeout: 5, **opts)
1515
if select
1616
client.select(select)
1717
server.commands.pop
18+
assert server.state.selected?
1819
end
1920
yield server, client
2021
ensure

test/net/imap/test_imap.rb

+2-23
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@ class IMAPTest < Test::Unit::TestCase
99
SERVER_KEY = File.expand_path("../fixtures/server.key", __dir__)
1010
SERVER_CERT = File.expand_path("../fixtures/server.crt", __dir__)
1111

12+
include Net::IMAP::FakeServer::TestHelper
13+
1214
def setup
1315
@do_not_reverse_lookup = Socket.do_not_reverse_lookup
1416
Socket.do_not_reverse_lookup = true
@@ -1031,29 +1033,6 @@ def test_unselect
10311033

10321034
private
10331035

1034-
def with_fake_server(select: nil, timeout: 5, **opts)
1035-
Timeout.timeout(timeout) do
1036-
server = Net::IMAP::FakeServer.new(timeout: timeout, **opts)
1037-
@threads << Thread.new do server.run end
1038-
tls = opts[:implicit_tls]
1039-
tls = {ca_file: server.config.tls[:ca_file]} if tls == true
1040-
client = Net::IMAP.new("localhost", port: server.port, ssl: tls)
1041-
begin
1042-
if select
1043-
client.select(select)
1044-
server.commands.pop
1045-
assert server.state.selected?
1046-
end
1047-
yield server, client
1048-
ensure
1049-
client.logout rescue pp $!
1050-
client.disconnect if !client.disconnected?
1051-
end
1052-
ensure
1053-
server&.shutdown
1054-
end
1055-
end
1056-
10571036
def imaps_test(timeout: 10)
10581037
Timeout.timeout(timeout) do
10591038
server = create_tcp_server

0 commit comments

Comments
 (0)