From 85a13e340369f8615995eeb32c9c6f235bd42008 Mon Sep 17 00:00:00 2001 From: "stainless-app[bot]" <142633134+stainless-app[bot]@users.noreply.github.com> Date: Tue, 8 Apr 2025 17:55:43 +0000 Subject: [PATCH] chore: make client tests look prettier --- test/openai/client_test.rb | 45 +++++++++++++++++++++++--------------- 1 file changed, 27 insertions(+), 18 deletions(-) diff --git a/test/openai/client_test.rb b/test/openai/client_test.rb index dd6ec3ea..0e142a74 100644 --- a/test/openai/client_test.rb +++ b/test/openai/client_test.rb @@ -156,7 +156,10 @@ def test_retry_count_header openai.chat.completions.create(messages: [{content: "string", role: :developer}], model: :"o3-mini") end - retry_count_headers = requester.attempts.map { _1[:headers]["x-stainless-retry-count"] } + retry_count_headers = requester.attempts.map do + _1.fetch(:headers).fetch("x-stainless-retry-count") + end + assert_equal(%w[0 1 2], retry_count_headers) end @@ -173,7 +176,10 @@ def test_omit_retry_count_header ) end - retry_count_headers = requester.attempts.map { _1[:headers]["x-stainless-retry-count"] } + retry_count_headers = requester.attempts.map do + _1.fetch(:headers).fetch("x-stainless-retry-count", nil) + end + assert_equal([nil, nil, nil], retry_count_headers) end @@ -190,7 +196,10 @@ def test_overwrite_retry_count_header ) end - retry_count_headers = requester.attempts.map { _1[:headers]["x-stainless-retry-count"] } + retry_count_headers = requester.attempts.map do + _1.fetch(:headers).fetch("x-stainless-retry-count") + end + assert_equal(%w[42 42 42], retry_count_headers) end @@ -207,12 +216,12 @@ def test_client_redirect_307 ) end - assert_equal("/redirected", requester.attempts.last[:url].path) - assert_equal(requester.attempts.first[:method], requester.attempts.last[:method]) - assert_equal(requester.attempts.first[:body], requester.attempts.last[:body]) + assert_equal("/redirected", requester.attempts.last.fetch(:url).path) + assert_equal(requester.attempts.first.fetch(:method), requester.attempts.last.fetch(:method)) + assert_equal(requester.attempts.first.fetch(:body), requester.attempts.last.fetch(:body)) assert_equal( - requester.attempts.first[:headers]["content-type"], - requester.attempts.last[:headers]["content-type"] + requester.attempts.first.fetch(:headers)["content-type"], + requester.attempts.last.fetch(:headers)["content-type"] ) end @@ -229,10 +238,10 @@ def test_client_redirect_303 ) end - assert_equal("/redirected", requester.attempts.last[:url].path) - assert_equal(:get, requester.attempts.last[:method]) - assert_nil(requester.attempts.last[:body]) - assert_nil(requester.attempts.last[:headers]["Content-Type"]) + assert_equal("/redirected", requester.attempts.last.fetch(:url).path) + assert_equal(:get, requester.attempts.last.fetch(:method)) + assert_nil(requester.attempts.last.fetch(:body)) + assert_nil(requester.attempts.last.fetch(:headers)["content-type"]) end def test_client_redirect_auth_keep_same_origin @@ -244,13 +253,13 @@ def test_client_redirect_auth_keep_same_origin openai.chat.completions.create( messages: [{content: "string", role: :developer}], model: :"o3-mini", - request_options: {extra_headers: {"Authorization" => "Bearer xyz"}} + request_options: {extra_headers: {"authorization" => "Bearer xyz"}} ) end assert_equal( - requester.attempts.first[:headers]["authorization"], - requester.attempts.last[:headers]["authorization"] + requester.attempts.first.fetch(:headers)["authorization"], + requester.attempts.last.fetch(:headers)["authorization"] ) end @@ -263,11 +272,11 @@ def test_client_redirect_auth_strip_cross_origin openai.chat.completions.create( messages: [{content: "string", role: :developer}], model: :"o3-mini", - request_options: {extra_headers: {"Authorization" => "Bearer xyz"}} + request_options: {extra_headers: {"authorization" => "Bearer xyz"}} ) end - assert_nil(requester.attempts.last[:headers]["Authorization"]) + assert_nil(requester.attempts.last.fetch(:headers)["authorization"]) end def test_default_headers @@ -275,7 +284,7 @@ def test_default_headers requester = MockRequester.new(200, {}, {}) openai.requester = requester openai.chat.completions.create(messages: [{content: "string", role: :developer}], model: :"o3-mini") - headers = requester.attempts.first[:headers] + headers = requester.attempts.first.fetch(:headers) refute_empty(headers["accept"]) refute_empty(headers["content-type"])