Skip to content

Commit 8e81a13

Browse files
chore: make client tests look prettier (#129)
1 parent 2107a86 commit 8e81a13

File tree

1 file changed

+27
-18
lines changed

1 file changed

+27
-18
lines changed

test/finch_api/client_test.rb

Lines changed: 27 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,10 @@ def test_retry_count_header
146146
finch.hris.directory.list
147147
end
148148

149-
retry_count_headers = requester.attempts.map { _1[:headers]["x-stainless-retry-count"] }
149+
retry_count_headers = requester.attempts.map do
150+
_1.fetch(:headers).fetch("x-stainless-retry-count")
151+
end
152+
150153
assert_equal(%w[0 1 2], retry_count_headers)
151154
end
152155

@@ -159,7 +162,10 @@ def test_omit_retry_count_header
159162
finch.hris.directory.list(request_options: {extra_headers: {"x-stainless-retry-count" => nil}})
160163
end
161164

162-
retry_count_headers = requester.attempts.map { _1[:headers]["x-stainless-retry-count"] }
165+
retry_count_headers = requester.attempts.map do
166+
_1.fetch(:headers).fetch("x-stainless-retry-count", nil)
167+
end
168+
163169
assert_equal([nil, nil, nil], retry_count_headers)
164170
end
165171

@@ -172,7 +178,10 @@ def test_overwrite_retry_count_header
172178
finch.hris.directory.list(request_options: {extra_headers: {"x-stainless-retry-count" => "42"}})
173179
end
174180

175-
retry_count_headers = requester.attempts.map { _1[:headers]["x-stainless-retry-count"] }
181+
retry_count_headers = requester.attempts.map do
182+
_1.fetch(:headers).fetch("x-stainless-retry-count")
183+
end
184+
176185
assert_equal(%w[42 42 42], retry_count_headers)
177186
end
178187

@@ -185,12 +194,12 @@ def test_client_redirect_307
185194
finch.hris.directory.list(request_options: {extra_headers: {}})
186195
end
187196

188-
assert_equal("/redirected", requester.attempts.last[:url].path)
189-
assert_equal(requester.attempts.first[:method], requester.attempts.last[:method])
190-
assert_equal(requester.attempts.first[:body], requester.attempts.last[:body])
197+
assert_equal("/redirected", requester.attempts.last.fetch(:url).path)
198+
assert_equal(requester.attempts.first.fetch(:method), requester.attempts.last.fetch(:method))
199+
assert_equal(requester.attempts.first.fetch(:body), requester.attempts.last.fetch(:body))
191200
assert_equal(
192-
requester.attempts.first[:headers]["content-type"],
193-
requester.attempts.last[:headers]["content-type"]
201+
requester.attempts.first.fetch(:headers)["content-type"],
202+
requester.attempts.last.fetch(:headers)["content-type"]
194203
)
195204
end
196205

@@ -203,10 +212,10 @@ def test_client_redirect_303
203212
finch.hris.directory.list(request_options: {extra_headers: {}})
204213
end
205214

206-
assert_equal("/redirected", requester.attempts.last[:url].path)
207-
assert_equal(:get, requester.attempts.last[:method])
208-
assert_nil(requester.attempts.last[:body])
209-
assert_nil(requester.attempts.last[:headers]["Content-Type"])
215+
assert_equal("/redirected", requester.attempts.last.fetch(:url).path)
216+
assert_equal(:get, requester.attempts.last.fetch(:method))
217+
assert_nil(requester.attempts.last.fetch(:body))
218+
assert_nil(requester.attempts.last.fetch(:headers)["content-type"])
210219
end
211220

212221
def test_client_redirect_auth_keep_same_origin
@@ -215,12 +224,12 @@ def test_client_redirect_auth_keep_same_origin
215224
finch.requester = requester
216225

217226
assert_raises(FinchAPI::Errors::APIConnectionError) do
218-
finch.hris.directory.list(request_options: {extra_headers: {"Authorization" => "Bearer xyz"}})
227+
finch.hris.directory.list(request_options: {extra_headers: {"authorization" => "Bearer xyz"}})
219228
end
220229

221230
assert_equal(
222-
requester.attempts.first[:headers]["authorization"],
223-
requester.attempts.last[:headers]["authorization"]
231+
requester.attempts.first.fetch(:headers)["authorization"],
232+
requester.attempts.last.fetch(:headers)["authorization"]
224233
)
225234
end
226235

@@ -230,18 +239,18 @@ def test_client_redirect_auth_strip_cross_origin
230239
finch.requester = requester
231240

232241
assert_raises(FinchAPI::Errors::APIConnectionError) do
233-
finch.hris.directory.list(request_options: {extra_headers: {"Authorization" => "Bearer xyz"}})
242+
finch.hris.directory.list(request_options: {extra_headers: {"authorization" => "Bearer xyz"}})
234243
end
235244

236-
assert_nil(requester.attempts.last[:headers]["Authorization"])
245+
assert_nil(requester.attempts.last.fetch(:headers)["authorization"])
237246
end
238247

239248
def test_default_headers
240249
finch = FinchAPI::Client.new(base_url: "http://localhost:4010", access_token: "My Access Token")
241250
requester = MockRequester.new(200, {}, {})
242251
finch.requester = requester
243252
finch.hris.directory.list
244-
headers = requester.attempts.first[:headers]
253+
headers = requester.attempts.first.fetch(:headers)
245254

246255
refute_empty(headers["accept"])
247256
refute_empty(headers["content-type"])

0 commit comments

Comments
 (0)