Skip to content

Commit 3b5da2d

Browse files
committed
✅ Fix ruby 2.7 compatability in backported tests
1 parent 3a1af34 commit 3b5da2d

File tree

1 file changed

+16
-14
lines changed

1 file changed

+16
-14
lines changed

test/net/imap/test_imap_response_handlers.rb

Lines changed: 16 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -37,16 +37,17 @@ def teardown
3737
assert_equal 2, imap.response_handlers.length
3838

3939
imap.noop
40-
assert_pattern do
41-
responses => [
42-
[:block, Net::IMAP::UntaggedResponse[name: "EXPUNGE", data: 1]],
43-
[:proc, Net::IMAP::UntaggedResponse[name: "EXPUNGE", data: 1]],
44-
[:block, Net::IMAP::UntaggedResponse[name: "EXPUNGE", data: 2]],
45-
[:proc, Net::IMAP::UntaggedResponse[name: "EXPUNGE", data: 2]],
46-
[:block, Net::IMAP::UntaggedResponse[name: "EXPUNGE", data: 3]],
47-
[:proc, Net::IMAP::UntaggedResponse[name: "EXPUNGE", data: 3]],
48-
]
49-
end
40+
responses = responses[0, 6].map {|which, resp|
41+
[which, resp.class, resp.name, resp.data]
42+
}
43+
assert_equal [
44+
[:block, Net::IMAP::UntaggedResponse, "EXPUNGE", 1],
45+
[:proc, Net::IMAP::UntaggedResponse, "EXPUNGE", 1],
46+
[:block, Net::IMAP::UntaggedResponse, "EXPUNGE", 2],
47+
[:proc, Net::IMAP::UntaggedResponse, "EXPUNGE", 2],
48+
[:block, Net::IMAP::UntaggedResponse, "EXPUNGE", 3],
49+
[:proc, Net::IMAP::UntaggedResponse, "EXPUNGE", 3],
50+
], responses
5051
end
5152
end
5253

@@ -56,14 +57,15 @@ def teardown
5657
alerts = []
5758
untagged = 0
5859
handler0 = ->{ greeting ||= _1 }
59-
handler1 = ->{ alerts << _1.data.text if _1 in {data: {code: {name: "ALERT"}}} }
60-
handler2 = ->{ expunges << _1.data if _1 in {name: "EXPUNGE"} }
61-
handler3 = ->{ untagged += 1 if _1.is_a?(Net::IMAP::UntaggedResponse) }
60+
handler1 = ->(r) { alerts << r.data.text if r.data.code.name == "ALERT" rescue nil }
61+
handler2 = ->(r) { expunges << r.data if r.name == "EXPUNGE" }
62+
handler3 = ->(r) { untagged += 1 if r.is_a?(Net::IMAP::UntaggedResponse) }
6263
response_handlers = [handler0, handler1, handler2, handler3]
6364

6465
run_fake_server_in_thread do |server|
6566
port = server.port
66-
imap = Net::IMAP.new("localhost", port:, response_handlers:)
67+
imap = Net::IMAP.new("localhost", port: port,
68+
response_handlers: response_handlers)
6769
assert_equal response_handlers, imap.response_handlers
6870
refute_same response_handlers, imap.response_handlers
6971

0 commit comments

Comments
 (0)