Skip to content

Commit

Permalink
add Date.now to version script url
Browse files Browse the repository at this point in the history
  • Loading branch information
andrewbents committed Oct 25, 2023
1 parent 56026bc commit a4b9ef0
Show file tree
Hide file tree
Showing 4 changed files with 47 additions and 9 deletions.
12 changes: 9 additions & 3 deletions src/index.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,9 @@ 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')
Expand Down Expand Up @@ -110,7 +112,9 @@ 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')
Expand Down Expand Up @@ -146,7 +150,9 @@ 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')
Expand Down
16 changes: 12 additions & 4 deletions src/payments.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,9 @@ 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')
Expand Down Expand Up @@ -128,7 +130,9 @@ 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')
Expand Down Expand Up @@ -171,7 +175,9 @@ 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')
Expand Down Expand Up @@ -236,7 +242,9 @@ 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('')
Expand Down
24 changes: 24 additions & 0 deletions src/upsell.test.js
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,14 @@ test(`should load embed script for 'dev'`, async () => {
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')

const embedScript = document.querySelector('script#revolut-upsell')
Expand Down Expand Up @@ -102,6 +110,14 @@ 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')
Expand Down Expand Up @@ -137,6 +153,14 @@ 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')
Expand Down
4 changes: 2 additions & 2 deletions src/versionLoader.ts
Original file line number Diff line number Diff line change
@@ -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

Expand All @@ -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',
})
Expand Down

0 comments on commit a4b9ef0

Please sign in to comment.