Merge branch 'beta' into latest-codegen-beta

stripe · Oct 29, 2024 · 3d2c6a3 · 3d2c6a3
2 parents 401eaf7 + 347f1fa
commit 3d2c6a3
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 1 deletion.
diff --git a/src/main/java/com/stripe/Stripe.java b/src/main/java/com/stripe/Stripe.java
@@ -40,7 +40,8 @@ public static void addBetaVersion(String betaName, String betaVersion) {
               stripeVersionWithBetaHeaders, betaName));
     }
 
-    stripeVersionWithBetaHeaders = String.format("%s; %s=%s", stripeVersion, betaName, betaVersion);
+    stripeVersionWithBetaHeaders =
+        String.format("%s; %s=%s", stripeVersionWithBetaHeaders, betaName, betaVersion);
   }
 
   // For testing only.  This is not part of a stable API and could change in non-major versions.

diff --git a/src/test/java/com/stripe/functional/StripeTest.java b/src/test/java/com/stripe/functional/StripeTest.java
@@ -22,4 +22,23 @@ public void testAddBetaVersion() {
           Stripe.addBetaVersion("super_cool_beta", "v1");
         });
   }
+
+  @Test
+  public void testAddSecondBetaVersion() {
+    Stripe.addBetaVersion("super_cool_beta", "v1");
+    assertNotEquals(Stripe.stripeVersion, Stripe.API_VERSION + "; super_cool_beta=v1");
+    assertEquals(
+        Stripe.API_VERSION + "; super_cool_beta=v1", Stripe.getStripeVersionWithBetaHeaders());
+
+    Stripe.addBetaVersion("super_hot_beta", "v2");
+    assertNotEquals(Stripe.stripeVersion, Stripe.API_VERSION + "; super_cool_beta=v1");
+    assertEquals(
+        Stripe.API_VERSION + "; super_cool_beta=v1; super_hot_beta=v2",
+        Stripe.getStripeVersionWithBetaHeaders());
+    assertThrows(
+        RuntimeException.class,
+        () -> {
+          Stripe.addBetaVersion("super_hot_beta", "v1");
+        });
+  }
 }