Skip to content

Commit 060c286

Browse files
chore: make client tests look prettier (#241)
1 parent eb00ee4 commit 060c286

File tree

1 file changed

+33
-20
lines changed

1 file changed

+33
-20
lines changed

test/orb/client_test.rb

Lines changed: 33 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,10 @@ def test_retry_count_header
148148
orb.customers.create(email: "dev@stainless.com", name: "x")
149149
end
150150

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

@@ -165,7 +168,10 @@ def test_omit_retry_count_header
165168
)
166169
end
167170

168-
retry_count_headers = requester.attempts.map { _1[:headers]["x-stainless-retry-count"] }
171+
retry_count_headers = requester.attempts.map do
172+
_1.fetch(:headers).fetch("x-stainless-retry-count", nil)
173+
end
174+
169175
assert_equal([nil, nil, nil], retry_count_headers)
170176
end
171177

@@ -182,7 +188,10 @@ def test_overwrite_retry_count_header
182188
)
183189
end
184190

185-
retry_count_headers = requester.attempts.map { _1[:headers]["x-stainless-retry-count"] }
191+
retry_count_headers = requester.attempts.map do
192+
_1.fetch(:headers).fetch("x-stainless-retry-count")
193+
end
194+
186195
assert_equal(%w[42 42 42], retry_count_headers)
187196
end
188197

@@ -195,12 +204,12 @@ def test_client_redirect_307
195204
orb.customers.create(email: "dev@stainless.com", name: "x", request_options: {extra_headers: {}})
196205
end
197206

198-
assert_equal("/redirected", requester.attempts.last[:url].path)
199-
assert_equal(requester.attempts.first[:method], requester.attempts.last[:method])
200-
assert_equal(requester.attempts.first[:body], requester.attempts.last[:body])
207+
assert_equal("/redirected", requester.attempts.last.fetch(:url).path)
208+
assert_equal(requester.attempts.first.fetch(:method), requester.attempts.last.fetch(:method))
209+
assert_equal(requester.attempts.first.fetch(:body), requester.attempts.last.fetch(:body))
201210
assert_equal(
202-
requester.attempts.first[:headers]["content-type"],
203-
requester.attempts.last[:headers]["content-type"]
211+
requester.attempts.first.fetch(:headers)["content-type"],
212+
requester.attempts.last.fetch(:headers)["content-type"]
204213
)
205214
end
206215

@@ -213,10 +222,10 @@ def test_client_redirect_303
213222
orb.customers.create(email: "dev@stainless.com", name: "x", request_options: {extra_headers: {}})
214223
end
215224

216-
assert_equal("/redirected", requester.attempts.last[:url].path)
217-
assert_equal(:get, requester.attempts.last[:method])
218-
assert_nil(requester.attempts.last[:body])
219-
assert_nil(requester.attempts.last[:headers]["Content-Type"])
225+
assert_equal("/redirected", requester.attempts.last.fetch(:url).path)
226+
assert_equal(:get, requester.attempts.last.fetch(:method))
227+
assert_nil(requester.attempts.last.fetch(:body))
228+
assert_nil(requester.attempts.last.fetch(:headers)["content-type"])
220229
end
221230

222231
def test_client_redirect_auth_keep_same_origin
@@ -228,13 +237,13 @@ def test_client_redirect_auth_keep_same_origin
228237
orb.customers.create(
229238
email: "dev@stainless.com",
230239
name: "x",
231-
request_options: {extra_headers: {"Authorization" => "Bearer xyz"}}
240+
request_options: {extra_headers: {"authorization" => "Bearer xyz"}}
232241
)
233242
end
234243

235244
assert_equal(
236-
requester.attempts.first[:headers]["authorization"],
237-
requester.attempts.last[:headers]["authorization"]
245+
requester.attempts.first.fetch(:headers)["authorization"],
246+
requester.attempts.last.fetch(:headers)["authorization"]
238247
)
239248
end
240249

@@ -247,11 +256,11 @@ def test_client_redirect_auth_strip_cross_origin
247256
orb.customers.create(
248257
email: "dev@stainless.com",
249258
name: "x",
250-
request_options: {extra_headers: {"Authorization" => "Bearer xyz"}}
259+
request_options: {extra_headers: {"authorization" => "Bearer xyz"}}
251260
)
252261
end
253262

254-
assert_nil(requester.attempts.last[:headers]["Authorization"])
263+
assert_nil(requester.attempts.last.fetch(:headers)["authorization"])
255264
end
256265

257266
def test_client_default_idempotency_key_on_writes
@@ -263,7 +272,9 @@ def test_client_default_idempotency_key_on_writes
263272
orb.customers.create(email: "dev@stainless.com", name: "x", request_options: {max_retries: 1})
264273
end
265274

266-
idempotency_headers = requester.attempts.map { _1[:headers]["Idempotency-Key".downcase] }
275+
idempotency_headers = requester.attempts.map do
276+
_1.fetch(:headers).fetch("idempotency-key")
277+
end
267278

268279
assert_kind_of(String, idempotency_headers.first)
269280
refute_empty(idempotency_headers.first)
@@ -283,15 +294,17 @@ def test_request_option_idempotency_key_on_writes
283294
)
284295
end
285296

286-
requester.attempts.each { assert_equal("user-supplied-key", _1[:headers]["Idempotency-Key".downcase]) }
297+
requester.attempts.each do
298+
assert_equal("user-supplied-key", _1.fetch(:headers).fetch("idempotency-key"))
299+
end
287300
end
288301

289302
def test_default_headers
290303
orb = Orb::Client.new(base_url: "http://localhost:4010", api_key: "My API Key")
291304
requester = MockRequester.new(200, {}, {})
292305
orb.requester = requester
293306
orb.customers.create(email: "dev@stainless.com", name: "x")
294-
headers = requester.attempts.first[:headers]
307+
headers = requester.attempts.first.fetch(:headers)
295308

296309
refute_empty(headers["accept"])
297310
refute_empty(headers["content-type"])

0 commit comments

Comments
 (0)