Skip to content

chore: make client tests look prettier #112

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 8, 2025
Merged

chore: make client tests look prettier #112

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 27 additions & 18 deletions test/openai/client_test.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand All @@ -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

Expand All @@ -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

Expand All @@ -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

Expand All @@ -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
Expand All @@ -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

Expand All @@ -263,19 +272,19 @@ 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
openai = OpenAI::Client.new(base_url: "http://localhost:4010", api_key: "My API Key")
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"])
Expand Down