Merge pull request #1593 from stripe/helenye/merge-ruby-beta

Merge changes from stripe-ruby master
This commit is contained in:
helenye-stripe 2025-04-24 12:44:16 -07:00 committed by GitHub
commit 8d5318dfa6
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 16 additions and 19 deletions

View File

@ -1197,16 +1197,15 @@ module Stripe
context "params serialization" do context "params serialization" do
should "allows empty strings in params" do should "allows empty strings in params" do
stub_request(:get, "#{Stripe::DEFAULT_API_BASE}/v1/invoices/upcoming?customer=cus_123&coupon=").to_return(body: "{}") stub_request(:get, "#{Stripe::DEFAULT_API_BASE}/v1/test_resource?customer=cus_123&coupon=").to_return(body: JSON.generate(object: "test_resource"))
requestor = APIRequestor.new("sk_test_123") requestor = APIRequestor.new("sk_test_123")
requestor.config.api_base = "http://localhost:#{MOCK_PORT}" requestor.send(request_method, :get, "/v1/test_resource", :api,
requestor.send(request_method, :get, "/v1/invoices/upcoming", :api,
params: { customer: "cus_123", coupon: "" }, params: { customer: "cus_123", coupon: "" },
&@read_body_chunk_block) &@read_body_chunk_block)
assert_requested( assert_requested(
:get, :get,
"#{Stripe.api_base}/v1/invoices/upcoming?", "#{Stripe::DEFAULT_API_BASE}/v1/test_resource?",
query: { query: {
customer: "cus_123", customer: "cus_123",
coupon: "", coupon: "",
@ -1215,15 +1214,15 @@ module Stripe
end end
should "filter nils in params" do should "filter nils in params" do
stub_request(:get, "#{Stripe::DEFAULT_API_BASE}/v1/invoices/upcoming?customer=cus_123").to_return(body: "{}") stub_request(:get, "#{Stripe::DEFAULT_API_BASE}/v1/test_resource?customer=cus_123")
.to_return(body: JSON.generate(object: "test_resource"))
requestor = APIRequestor.new("sk_test_123") requestor = APIRequestor.new("sk_test_123")
requestor.config.api_base = "http://localhost:#{MOCK_PORT}" requestor.send(request_method, :get, "/v1/test_resource", :api,
requestor.send(request_method, :get, "/v1/invoices/upcoming", :api,
params: { customer: "cus_123", coupon: nil }, params: { customer: "cus_123", coupon: nil },
&@read_body_chunk_block) &@read_body_chunk_block)
assert_requested( assert_requested(
:get, :get,
"#{Stripe.api_base}/v1/invoices/upcoming?", "#{Stripe::DEFAULT_API_BASE}/v1/test_resource?",
query: { query: {
customer: "cus_123", customer: "cus_123",
} }
@ -1231,17 +1230,16 @@ module Stripe
end end
should "merge query parameters in URL and params" do should "merge query parameters in URL and params" do
stub_request(:get, "#{Stripe.api_base}/v1/invoices/upcoming?coupon=25OFF&customer=cus_123") stub_request(:get, "#{Stripe::DEFAULT_API_BASE}/v1/test_resource?coupon=25OFF&customer=cus_123")
.to_return(body: JSON.generate(object: "invoice")) .to_return(body: JSON.generate(object: "account"))
requestor = APIRequestor.new("sk_test_123") requestor = APIRequestor.new("sk_test_123")
requestor.config.api_base = "http://localhost:#{MOCK_PORT}" requestor.send(request_method, :get, "/v1/test_resource?coupon=25OFF", :api,
requestor.send(request_method, :get, "/v1/invoices/upcoming?coupon=25OFF", :api,
params: { customer: "cus_123" }, params: { customer: "cus_123" },
&@read_body_chunk_block) &@read_body_chunk_block)
assert_requested( assert_requested(
:get, :get,
"#{Stripe.api_base}/v1/invoices/upcoming?", "#{Stripe::DEFAULT_API_BASE}/v1/test_resource?",
query: { query: {
coupon: "25OFF", coupon: "25OFF",
customer: "cus_123", customer: "cus_123",
@ -1250,17 +1248,16 @@ module Stripe
end end
should "prefer query parameters in params when specified in URL as well" do should "prefer query parameters in params when specified in URL as well" do
stub_request(:get, "#{Stripe::DEFAULT_API_BASE}/v1/invoices/upcoming?customer=cus_param") stub_request(:get, "#{Stripe::DEFAULT_API_BASE}/v1/test_resource?customer=cus_param")
.to_return(body: JSON.generate(object: "invoice")) .to_return(body: JSON.generate(object: "account"))
requestor = APIRequestor.new("sk_test_123") requestor = APIRequestor.new("sk_test_123")
requestor.instance_variable_get(:@config).api_base = "http://localhost:#{MOCK_PORT}" requestor.send(request_method, :get, "/v1/test_resource?customer=cus_query", :api,
requestor.send(request_method, :get, "/v1/invoices/upcoming?customer=cus_query", :api,
params: { customer: "cus_param" }, params: { customer: "cus_param" },
&@read_body_chunk_block) &@read_body_chunk_block)
assert_requested( assert_requested(
:get, :get,
"#{Stripe.api_base}/v1/invoices/upcoming?", "#{Stripe::DEFAULT_API_BASE}/v1/test_resource?",
query: { query: {
customer: "cus_param", customer: "cus_param",
} }