Merge upstream and update generated code for v1333

CHANGELOG.md

@@ -4,6 +4,10 @@
 * [#1477](https://github.com/stripe/stripe-ruby/pull/1477) Update generated code for beta
   * Add support for `trigger_action` method on resource `PaymentIntent`
 
+## 13.1.1 - 2024-11-06
+* [#1483](https://github.com/stripe/stripe-ruby/pull/1483) Fix APIResource#retrieve not sending `stripe_version`
+* [#1478](https://github.com/stripe/stripe-ruby/pull/1478) Update changelog with a note on 2024-10-28.acacia API version
+
 ## 13.1.0 - 2024-10-29
 * [#1472](https://github.com/stripe/stripe-ruby/pull/1472) This release changes the pinned API version to `2024-10-28.acacia`.
   * Add support for `submit_card` test helper method on resource `Issuing.Card`

OPENAPI_VERSION

@@ -1 +1 @@
-v1329
+v1333

lib/stripe/request_options.rb

@@ -63,7 +63,7 @@ module Stripe
         idempotency_key: req_opts[:idempotency_key],
         stripe_account: req_opts[:stripe_account] || object_opts[:stripe_account],
         stripe_context: req_opts[:stripe_context] || object_opts[:stripe_context],
-        stripe_version: req_opts[:stripe_version] || object_opts[:api_version],
+        stripe_version: req_opts[:stripe_version] || object_opts[:stripe_version],
       }
 
       # Remove nil values from headers

lib/stripe/resources/issuing/card.rb

@@ -3,7 +3,7 @@
 
 module Stripe
   module Issuing
-    # You can [create physical or virtual cards](https://stripe.com/docs/issuing/cards) that are issued to cardholders.
+    # You can [create physical or virtual cards](https://stripe.com/docs/issuing) that are issued to cardholders.
     class Card < APIResource
       extend Stripe::APIOperations::Create
       extend Stripe::APIOperations::List

test/stripe/request_options_test.rb

@@ -77,5 +77,16 @@ module Stripe
         assert_equal({ "A-Header" => "header", "B-Header" => "header" }, request_opts[:headers])
       end
     end
+
+    context "combine_opts" do
+      should "correctly combine user specified options" do
+        object_opts = { api_key: "sk_123", stripe_version: "2022-11-15" }
+        request_opts = { api_key: "sk_456", stripe_account: "acct_123" }
+        combined = RequestOptions.combine_opts(object_opts, request_opts)
+        assert_equal(combined[:stripe_version], "2022-11-15")
+        assert_equal(combined[:api_key], "sk_456")
+        assert_equal(combined[:stripe_account], "acct_123")
+      end
+    end
   end
 end