From 7a89a3cd9cb2c364d3b22da96c894040bcf7167b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Karol=20S=C3=B3jko?= Date: Thu, 24 Nov 2022 19:05:50 +0100 Subject: [PATCH] fix(snjs): subscription id increments - run e2e --- packages/snjs/mocha/files.test.js | 5 +++-- packages/snjs/mocha/settings.test.js | 9 +++++---- packages/snjs/mocha/subscriptions.test.js | 3 ++- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/packages/snjs/mocha/files.test.js b/packages/snjs/mocha/files.test.js index 7c58e6856..ade39efa9 100644 --- a/packages/snjs/mocha/files.test.js +++ b/packages/snjs/mocha/files.test.js @@ -12,6 +12,7 @@ describe('files', function () { let context let fileService let itemManager + let subscriptionId = 1001 beforeEach(function () { localStorage.clear() @@ -39,7 +40,7 @@ describe('files', function () { if (subscription) { await Factory.publishMockedEvent('SUBSCRIPTION_PURCHASED', { userEmail: context.email, - subscriptionId: 1, + subscriptionId: subscriptionId++, subscriptionName: 'PRO_PLAN', subscriptionExpiresAt: (new Date().getTime() + 3_600_000) * 1_000, timestamp: Date.now(), @@ -84,7 +85,7 @@ describe('files', function () { await Factory.publishMockedEvent('SUBSCRIPTION_PURCHASED', { userEmail: context.email, - subscriptionId: 1, + subscriptionId: subscriptionId++, subscriptionName: 'PLUS_PLAN', subscriptionExpiresAt: (new Date().getTime() - 3_600_000) * 1_000, timestamp: Date.now(), diff --git a/packages/snjs/mocha/settings.test.js b/packages/snjs/mocha/settings.test.js index 079e16b3d..bbac19784 100644 --- a/packages/snjs/mocha/settings.test.js +++ b/packages/snjs/mocha/settings.test.js @@ -13,6 +13,7 @@ describe('settings service', function () { let application let context + let subscriptionId = 2001 beforeEach(async function () { localStorage.clear() @@ -118,7 +119,7 @@ describe('settings service', function () { it('reads a subscription setting', async () => { await Factory.publishMockedEvent('SUBSCRIPTION_PURCHASED', { userEmail: context.email, - subscriptionId: 1, + subscriptionId: subscriptionId++, subscriptionName: 'PRO_PLAN', subscriptionExpiresAt: (new Date().getTime() + 3_600_000) * 1_000, timestamp: Date.now(), @@ -143,7 +144,7 @@ describe('settings service', function () { await Factory.publishMockedEvent('SUBSCRIPTION_PURCHASED', { userEmail: context.email, - subscriptionId: 42, + subscriptionId: subscriptionId, subscriptionName: 'PRO_PLAN', subscriptionExpiresAt: (new Date().getTime() + 3_600_000) * 1_000, timestamp: Date.now(), @@ -173,7 +174,7 @@ describe('settings service', function () { await Factory.publishMockedEvent('SUBSCRIPTION_EXPIRED', { userEmail: context.email, - subscriptionId: 42, + subscriptionId: subscriptionId++, subscriptionName: 'PRO_PLAN', timestamp: Date.now(), offline: false, @@ -186,7 +187,7 @@ describe('settings service', function () { await Factory.publishMockedEvent('SUBSCRIPTION_PURCHASED', { userEmail: context.email, - subscriptionId: 43, + subscriptionId: subscriptionId++, subscriptionName: 'PRO_PLAN', subscriptionExpiresAt: (new Date().getTime() + 3_600_000) * 1_000, timestamp: Date.now(), diff --git a/packages/snjs/mocha/subscriptions.test.js b/packages/snjs/mocha/subscriptions.test.js index 888ec4761..d6571d950 100644 --- a/packages/snjs/mocha/subscriptions.test.js +++ b/packages/snjs/mocha/subscriptions.test.js @@ -8,6 +8,7 @@ describe('subscriptions', function () { let application let context let subscriptionManager + let subscriptionId afterEach(async function () { await Factory.safeDeinit(application) @@ -32,7 +33,7 @@ describe('subscriptions', function () { await Factory.publishMockedEvent('SUBSCRIPTION_PURCHASED', { userEmail: context.email, - subscriptionId: 1, + subscriptionId: subscriptionId++, subscriptionName: 'PRO_PLAN', subscriptionExpiresAt: (new Date().getTime() + 3_600_000) * 1_000, timestamp: Date.now(),