add Date.now to version script url

revolut-engineering · Oct 25, 2023 · b7b26a4 · b7b26a4
1 parent 56026bc
commit b7b26a4
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 9 deletions.
diff --git a/src/index.test.js b/src/index.test.js
@@ -75,7 +75,7 @@ test(`should load embed script for 'dev'`, async () => {
   const versionScript = document.querySelector('script#revolut-pay-version')
   expect(versionScript).toHaveAttribute(
     'src',
-    'https://merchant.revolut.codes/version.js'
+    expect.stringMatching(/https\:\/\/merchant.revolut.codes\/version.js\?version=\d+/)
   )
 
   await TriggerSuccessVersion('abc12345')
@@ -110,7 +110,7 @@ test(`should load embed script for 'prod'`, async () => {
   const versionScript = document.querySelector('script#revolut-pay-version')
   expect(versionScript).toHaveAttribute(
     'src',
-    'https://merchant.revolut.com/version.js'
+    expect.stringMatching(/https\:\/\/merchant.revolut.com\/version.js\?version=\d+/)
   )
 
   await TriggerSuccessVersion('abc12345')
@@ -146,7 +146,7 @@ test(`should load embed script for 'sandbox'`, async () => {
   const versionScript = document.querySelector('script#revolut-pay-version')
   expect(versionScript).toHaveAttribute(
     'src',
-    'https://sandbox-merchant.revolut.com/version.js'
+    expect.stringMatching(/https\:\/\/sandbox-merchant.revolut.com\/version.js\?version=\d+/)
   )
 
   await TriggerSuccessVersion('abc12345')

diff --git a/src/payments.test.js b/src/payments.test.js
@@ -85,7 +85,7 @@ test(`should load embed script for 'dev'`, async () => {
   const versionScript = document.querySelector('script#revolut-pay-version')
   expect(versionScript).toHaveAttribute(
     'src',
-    'https://merchant.revolut.codes/version.js'
+    expect.stringMatching(/https\:\/\/merchant.revolut.codes\/version.js\?version=\d+/)
   )
 
   await TriggerSuccessVersion('abc12345')
@@ -128,7 +128,7 @@ test(`should load embed script for 'prod'`, async () => {
   const versionScript = document.querySelector('script#revolut-pay-version')
   expect(versionScript).toHaveAttribute(
     'src',
-    'https://merchant.revolut.com/version.js'
+    expect.stringMatching(/https\:\/\/merchant.revolut.com\/version.js\?version=\d+/)
   )
 
   await TriggerSuccessVersion('abc12345')
@@ -171,7 +171,7 @@ test(`should load embed script for 'sandbox'`, async () => {
   const versionScript = document.querySelector('script#revolut-pay-version')
   expect(versionScript).toHaveAttribute(
     'src',
-    'https://sandbox-merchant.revolut.com/version.js'
+    expect.stringMatching(/https\:\/\/sandbox-merchant.revolut.com\/version.js\?version=\d+/)
   )
 
   await TriggerSuccessVersion('abc12345')
@@ -236,7 +236,7 @@ test(`should use 'prod' by default`, async () => {
   const versionScript = document.querySelector('script#revolut-pay-version')
   expect(versionScript).toHaveAttribute(
     'src',
-    'https://merchant.revolut.com/version.js'
+    expect.stringMatching(/https\:\/\/merchant.revolut.com\/version.js\?version=\d+/)
   )
 
   await TriggerSuccessVersion('')

diff --git a/src/upsell.test.js b/src/upsell.test.js
@@ -66,6 +66,12 @@ test(`should load embed script for 'dev'`, async () => {
     mode: 'dev',
     publicToken: 'MERCHANT_PUBLIC_TOKEN_DEV_XXX',
   })
+
+  const versionScript = document.querySelector('script#revolut-pay-version')
+  expect(versionScript).toHaveAttribute(
+    'src',
+    expect.stringMatching(/https\:\/\/merchant.revolut.codes\/version.js\?version=\d+/)
+  )
 
   await TriggerSuccessVersion('abc12345')
 
@@ -102,6 +108,12 @@ test(`should load embed script for 'prod'`, async () => {
     publicToken: 'MERCHANT_PUBLIC_TOKEN_PROD_XXX',
   })
 
+  const versionScript = document.querySelector('script#revolut-pay-version')
+  expect(versionScript).toHaveAttribute(
+    'src',
+    expect.stringMatching(/https\:\/\/merchant.revolut.com\/version.js\?version=\d+/)
+  )
+
   await TriggerSuccessVersion('abc12345')
 
   const embedScript = document.querySelector('script#revolut-upsell')
@@ -137,6 +149,12 @@ test(`should load embed script for 'sandbox'`, async () => {
     publicToken: 'MERCHANT_PUBLIC_TOKEN_SANDBOX_XXX',
   })
 
+  const versionScript = document.querySelector('script#revolut-pay-version')
+  expect(versionScript).toHaveAttribute(
+    'src',
+    expect.stringMatching(/https\:\/\/sandbox-merchant.revolut.com\/version.js\?version=\d+/)
+  )
+
   await TriggerSuccessVersion('abc12345')
 
   const embedScript = document.querySelector('script#revolut-upsell')

diff --git a/src/versionLoader.ts b/src/versionLoader.ts
@@ -1,6 +1,6 @@
 import { MODE, URLS } from './constants'
 import { Mode } from './types'
-import { loadModule } from './utils'
+import { getVersionedUrl, loadModule } from './utils'
 
 let loadedVersion: string = null
 
@@ -12,7 +12,7 @@ export function RevolutPaymentsVersionLoader(
   }
 
   return loadModule({
-    src: URLS[mode].version,
+    src: getVersionedUrl(URLS[mode].version, `${Date.now()}`),
     id: 'revolut-pay-version',
     name: 'RevolutPayVersion',
   })