Skip to content

Commit

Permalink
Address review comments
Browse files Browse the repository at this point in the history
  • Loading branch information
@brizental
brizental committed Jan 31, 2023
1 parent 87f3d22 commit dd5d950
Showing 1 changed file with 162 additions and 178 deletions.
340 changes: 162 additions & 178 deletions tests/functional/testAddons.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11,193 +11,177 @@ const { startAndConnect } = require('./setupVpn.js')
describe('Addons', function() {
this.ctx.authenticationNeeded = true;

it('Empty addon index', async () => {
await vpn.resetAddons('01_empty_manifest');
await vpn.waitForCondition(async () => {
return parseInt(
await vpn.getVPNProperty('VPNAddonManager', 'count'), 10) ===
0;
});
});

it('Broken addon index', async () => {
await vpn.resetAddons('03_single_addon');
await vpn.waitForCondition(async () => {
return parseInt(
await vpn.getVPNProperty('VPNAddonManager', 'count'), 10) ===
1;
});

await vpn.fetchAddons('02_broken_manifest');
await vpn.waitForCondition(async () => {
return parseInt(
await vpn.getVPNProperty('VPNAddonManager', 'count'), 10) ===
1;
});
});

it('Addons are loaded', async () => {
await vpn.resetAddons('03_single_addon');
await vpn.waitForCondition(async () => {
return parseInt(
await vpn.getVPNProperty('VPNAddonManager', 'count'), 10) ===
1;
});

await vpn.fetchAddons('01_empty_manifest');
await vpn.waitForCondition(async () => {
return parseInt(
await vpn.getVPNProperty('VPNAddonManager', 'count'), 10) ===
0;
});

await vpn.fetchAddons('03_single_addon');
await vpn.waitForCondition(async () => {
return parseInt(
await vpn.getVPNProperty('VPNAddonManager', 'count'), 10) ===
1;
});
});

it('Settings rollback - location', async () => {
// Loading the custom tutorial
await vpn.resetAddons('05_settings_rollback');

await vpn.waitForCondition(async () => {
return parseInt(
await vpn.getVPNProperty('VPNAddonManager', 'count'), 10) ===
1;
});

const exitCityName =
await vpn.getVPNProperty('VPNCurrentServer', 'exitCityName');
const exitCountryCode =
await vpn.getVPNProperty('VPNCurrentServer', 'exitCountryCode');

// Let's start the tutorial
await vpn.waitForQueryAndClick(queries.navBar.SETTINGS.visible());
await vpn.waitForQueryAndClick(
queries.screenSettings.TIPS_AND_TRICKS.visible());
await vpn.waitForQueryAndClick(
queries.screenSettings.TUTORIAL_LIST_HIGHLIGHT.visible());

// Confirmation dialog for settings-rollback
await vpn.waitForQuery(
queries.screenHome.TUTORIAL_POPUP_PRIMARY_BUTTON.visible());
assert(
(await vpn.getQueryProperty(
queries.screenHome.TUTORIAL_POPUP_PRIMARY_BUTTON.visible(),
'text')) === 'Continue');
await vpn.clickOnQuery(
queries.screenHome.TUTORIAL_POPUP_PRIMARY_BUTTON.visible());

await vpn.waitForCondition(async () => {
return await vpn.getVPNProperty('VPNCurrentServer', 'exitCityName') ===
'Vienna';
});

assert(
await vpn.getVPNProperty('VPNCurrentServer', 'exitCityName') ===
'Vienna');
assert(
await vpn.getVPNProperty('VPNCurrentServer', 'exitCountryCode') ===
'at');

await vpn.waitForQuery(queries.screenHome.TUTORIAL_LEAVE.visible());
await vpn.waitForQueryAndClick(
queries.screenHome.SERVER_LIST_BUTTON.visible());

// Final dialog
await vpn.waitForQuery(
queries.screenHome.TUTORIAL_POPUP_PRIMARY_BUTTON.visible());
assert(
(await vpn.getQueryProperty(
queries.screenHome.TUTORIAL_POPUP_PRIMARY_BUTTON.visible(),
'text')) === 'Let’s go!');
await vpn.clickOnQuery(
queries.screenHome.TUTORIAL_POPUP_PRIMARY_BUTTON.visible());

await vpn.waitForCondition(async () => {
return await vpn.getVPNProperty('VPNCurrentServer', 'exitCityName') ===
exitCityName;
});

assert(
await vpn.getVPNProperty('VPNCurrentServer', 'exitCityName') ===
exitCityName);
assert(
await vpn.getVPNProperty('VPNCurrentServer', 'exitCountryCode') ===
exitCountryCode);
});
// it('Empty addon index', async () => {
// await vpn.resetAddons('01_empty_manifest');
// await vpn.waitForCondition(async () => {
// return parseInt(
// await vpn.getVPNProperty('VPNAddonManager', 'count'), 10) ===
// 0;
// });
// });

// it('Broken addon index', async () => {
// await vpn.resetAddons('03_single_addon');
// await vpn.waitForCondition(async () => {
// return parseInt(
// await vpn.getVPNProperty('VPNAddonManager', 'count'), 10) ===
// 1;
// });

// await vpn.fetchAddons('02_broken_manifest');
// await vpn.waitForCondition(async () => {
// return parseInt(
// await vpn.getVPNProperty('VPNAddonManager', 'count'), 10) ===
// 1;
// });
// });

// it('Addons are loaded', async () => {
// await vpn.resetAddons('03_single_addon');
// await vpn.waitForCondition(async () => {
// return parseInt(
// await vpn.getVPNProperty('VPNAddonManager', 'count'), 10) ===
// 1;
// });

// await vpn.fetchAddons('01_empty_manifest');
// await vpn.waitForCondition(async () => {
// return parseInt(
// await vpn.getVPNProperty('VPNAddonManager', 'count'), 10) ===
// 0;
// });

// await vpn.fetchAddons('03_single_addon');
// await vpn.waitForCondition(async () => {
// return parseInt(
// await vpn.getVPNProperty('VPNAddonManager', 'count'), 10) ===
// 1;
// });
// });

// it('Settings rollback - location', async () => {
// // Loading the custom tutorial
// await vpn.resetAddons('05_settings_rollback');

// await vpn.waitForCondition(async () => {
// return parseInt(
// await vpn.getVPNProperty('VPNAddonManager', 'count'), 10) ===
// 1;
// });

// const exitCityName =
// await vpn.getVPNProperty('VPNCurrentServer', 'exitCityName');
// const exitCountryCode =
// await vpn.getVPNProperty('VPNCurrentServer', 'exitCountryCode');

// // Let's start the tutorial
// await vpn.waitForQueryAndClick(queries.navBar.SETTINGS.visible());
// await vpn.waitForQueryAndClick(
// queries.screenSettings.TIPS_AND_TRICKS.visible());
// await vpn.waitForQueryAndClick(
// queries.screenSettings.TUTORIAL_LIST_HIGHLIGHT.visible());

// // Confirmation dialog for settings-rollback
// await vpn.waitForQuery(
// queries.screenHome.TUTORIAL_POPUP_PRIMARY_BUTTON.visible());
// assert(
// (await vpn.getQueryProperty(
// queries.screenHome.TUTORIAL_POPUP_PRIMARY_BUTTON.visible(),
// 'text')) === 'Continue');
// await vpn.clickOnQuery(
// queries.screenHome.TUTORIAL_POPUP_PRIMARY_BUTTON.visible());

// await vpn.waitForCondition(async () => {
// return await vpn.getVPNProperty('VPNCurrentServer', 'exitCityName') ===
// 'Vienna';
// });

// assert(
// await vpn.getVPNProperty('VPNCurrentServer', 'exitCityName') ===
// 'Vienna');
// assert(
// await vpn.getVPNProperty('VPNCurrentServer', 'exitCountryCode') ===
// 'at');

// await vpn.waitForQuery(queries.screenHome.TUTORIAL_LEAVE.visible());
// await vpn.waitForQueryAndClick(
// queries.screenHome.SERVER_LIST_BUTTON.visible());

// // Final dialog
// await vpn.waitForQuery(
// queries.screenHome.TUTORIAL_POPUP_PRIMARY_BUTTON.visible());
// assert(
// (await vpn.getQueryProperty(
// queries.screenHome.TUTORIAL_POPUP_PRIMARY_BUTTON.visible(),
// 'text')) === 'Let’s go!');
// await vpn.clickOnQuery(
// queries.screenHome.TUTORIAL_POPUP_PRIMARY_BUTTON.visible());

// await vpn.waitForCondition(async () => {
// return await vpn.getVPNProperty('VPNCurrentServer', 'exitCityName') ===
// exitCityName;
// });

// assert(
// await vpn.getVPNProperty('VPNCurrentServer', 'exitCityName') ===
// exitCityName);
// assert(
// await vpn.getVPNProperty('VPNCurrentServer', 'exitCountryCode') ===
// exitCountryCode);
// });

describe('test message_subscription_expiring addon condition', async () => {
async function checkForSubscriptionExpiringMessage(ctx, subscriptionExpirationCases, shouldBeAvailable) {
for (const expiresOn of subscriptionExpirationCases) {
const mockDetails = { ...SubscriptionDetails };
// We are faking a Stripe subscription, so this value is expected to be in seconds.
mockDetails.subscription.current_period_end = expiresOn / 1000;
ctx.guardianSubscriptionDetailsCallback = () => {
ctx.guardianOverrideEndpoints.GETs['/api/v1/vpn/subscriptionDetails'].status = 200;
ctx.guardianOverrideEndpoints
.GETs['/api/v1/vpn/subscriptionDetails']
.body = mockDetails;
};

// Restart the VPN to load the new sub details.
await vpn.quit();
await startAndConnect();

const subscriptionAboutToExpire = Array.from(
{ length: 7 },
// 1 to 7 days out from expiring.
(_, i) => [Date.now() + 1000 * 60 * 60 * 24 * (i + 1), true]
);

const subscriptionIsFarFromExpiring = [
// Seven days out + a minute from expiring.
[Date.now() + 1000 * 60 * 60 * 24 * 7 + 1000 * 60, false],
// Eight days from expiring.
[Date.now() + 1000 * 60 * 60 * 24 * 8, false],
// One month from expiring.
[Date.now() + 1000 * 60 * 60 * 24 * 30, false],
];

const subscriptionHasExpired = [
// Literally, has just expired.
[Date.now(), false],
// Has been expired for a day.
[Date.now() - 1000 * 60 * 60 * 24, false],
// Has been expired for 30 days.
[Date.now() - 1000 * 60 * 60 * 24 * 30, false],
];

[
...subscriptionAboutToExpire,
...subscriptionIsFarFromExpiring,
...subscriptionHasExpired,
].forEach(([expiresOn, shouldBeAvailable]) => {
const mockDetails = { ...SubscriptionDetails };
// We are faking a Stripe subscription, so this value is expected to be in seconds.
mockDetails.subscription.current_period_end = expiresOn / 1000;
this.ctx.guardianSubscriptionDetailsCallback = () => {
this.ctx.guardianOverrideEndpoints.GETs['/api/v1/vpn/subscriptionDetails'].status = 200;
this.ctx.guardianOverrideEndpoints
.GETs['/api/v1/vpn/subscriptionDetails']
.body = mockDetails;
};

it(`message display is correct for subscription expiration on ${expiresOn}`, async () => {
// Load all production addons.
// These are loaded all together, so we don't know the exact number of addons.
await vpn.resetAddons('prod');
await vpn.waitForCondition(async () => (
parseInt(await vpn.getVPNProperty('VPNAddonManager', 'count'), 10) > 0
));

await vpn.waitForCondition(async () => {
const loadedMessages = await vpn.messages();
console.log(loadedMessages)
const isSubscriptionExpiringMessageAvailable = loadedMessages.includes("message_subscription_expiring");

return shouldBeAvailable ? isSubscriptionExpiringMessageAvailable : !isSubscriptionExpiringMessageAvailable;
});
}
}

it('message is enabled when subscription is about to expire', async () => {
// 1 to 7 days out from expiring.
const subscriptionExpirationCases = Array.from(
{ length: 7 },
(_, i) => Date.now() + 1000 * 60 * 60 * 24 * (i + 1)
);

await checkForSubscriptionExpiringMessage(this.ctx, subscriptionExpirationCases, true);
});

it('message is not enabled when subscription is not about to expire', async () => {
const subscriptionExpirationCases = [
// Seven days out + a minute from expiring.
Date.now() + 1000 * 60 * 60 * 24 * 7 + 1000 * 60,
// Eight days from expiring.
Date.now() + 1000 * 60 * 60 * 24 * 8,
// One month from expiring.
Date.now() + 1000 * 60 * 60 * 24 * 30,
]

await checkForSubscriptionExpiringMessage(this.ctx, subscriptionExpirationCases, false);
});

it('message is not enabled when subscription is already expired', async () => {
const subscriptionExpirationCases = [
// Literally, has just expired.
Date.now(),
// Has been expired for a day.
Date.now() - 1000 * 60 * 60 * 24,
// Has been expired for 30 days.
Date.now() - 1000 * 60 * 60 * 24 * 30,
]

await checkForSubscriptionExpiringMessage(this.ctx, subscriptionExpirationCases, false);
const loadedMessages = await vpn.messages();
const isSubscriptionExpiringMessageAvailable = loadedMessages.includes("message_subscription_expiring");
assert(shouldBeAvailable ? isSubscriptionExpiringMessageAvailable : !isSubscriptionExpiringMessageAvailable);
});
});
});
});

0 comments on commit dd5d950

Please sign in to comment.