Merge branch 'master' of github.com:Mailtrain-org/mailtrain
Conflicts: test/e2e/index.js test/e2e/lib/mail.js test/e2e/lib/mocha-e2e.js test/e2e/lib/page.js test/e2e/lib/worker-counter.js test/e2e/page-objects/subscription.js
This commit is contained in:
commit
731226dfeb
20 changed files with 580 additions and 105 deletions
|
@ -2,8 +2,9 @@
|
|||
"parser": "babel-eslint",
|
||||
"rules": {
|
||||
"strict": 0,
|
||||
"no-invalid-this": 0,
|
||||
"no-unused-expressions": 0
|
||||
"no-console": 0,
|
||||
"comma-dangle": 0,
|
||||
"arrow-body-style": 0
|
||||
},
|
||||
"env": {
|
||||
"mocha": true
|
||||
|
|
|
@ -1,11 +1,9 @@
|
|||
'use strict';
|
||||
|
||||
require('./lib/exit-unless-test');
|
||||
const { mocha } = require('./lib/mocha-e2e');
|
||||
const mocha = require('./lib/mocha-e2e').mocha;
|
||||
const path = require('path');
|
||||
|
||||
global.USE_SHARED_DRIVER = true;
|
||||
|
||||
const only = 'only';
|
||||
const skip = 'skip';
|
||||
|
||||
|
|
|
@ -13,15 +13,46 @@ module.exports = {
|
|||
}
|
||||
},
|
||||
lists: {
|
||||
one: {
|
||||
l1: {
|
||||
id: 1,
|
||||
cid: 'Hkj1vCoJb',
|
||||
publicSubscribe: 1,
|
||||
unsubscriptionMode: 0
|
||||
unsubscriptionMode: 0, // (one-step, no form)
|
||||
},
|
||||
l2: {
|
||||
id: 2,
|
||||
cid: 'SktV4HDZ-',
|
||||
publicSubscribe: 1,
|
||||
unsubscriptionMode: 1, // (one-step, with form)
|
||||
},
|
||||
l3: {
|
||||
id: 3,
|
||||
cid: 'BkdvNBw-W',
|
||||
publicSubscribe: 1,
|
||||
unsubscriptionMode: 2, // (two-step, no form)
|
||||
},
|
||||
l4: {
|
||||
id: 4,
|
||||
cid: 'rJMKVrDZ-',
|
||||
publicSubscribe: 1,
|
||||
unsubscriptionMode: 3, // (two-step, with form)
|
||||
},
|
||||
l5: {
|
||||
id: 5,
|
||||
cid: 'SJgoNSw-W',
|
||||
publicSubscribe: 1,
|
||||
unsubscriptionMode: 4, // (manual unsubscribe)
|
||||
},
|
||||
l6: {
|
||||
id: 6,
|
||||
cid: 'HyveEPvWW',
|
||||
publicSubscribe: 0,
|
||||
unsubscriptionMode: 0, // (one-step, no form)
|
||||
}
|
||||
},
|
||||
settings: {
|
||||
'service-url' : 'http://localhost:' + config.www.port + '/',
|
||||
'service-url': 'http://localhost:' + config.www.port + '/',
|
||||
'admin-email': 'admin@example.com',
|
||||
'default-homepage': 'https://mailtrain.org',
|
||||
'smtp-hostname': config.testserver.host,
|
||||
'smtp-port': config.testserver.port,
|
||||
|
|
|
@ -13,10 +13,8 @@ const driver = new webdriver.Builder()
|
|||
.forBrowser(config.app.seleniumwebdriver.browser || 'phantomjs')
|
||||
.build();
|
||||
|
||||
|
||||
const failHandlerRunning = new WorkerCounter();
|
||||
|
||||
|
||||
function UseCaseReporter(runner) {
|
||||
Mocha.reporters.Base.call(this, runner);
|
||||
|
||||
|
@ -212,4 +210,4 @@ module.exports = {
|
|||
steps,
|
||||
precondition,
|
||||
driver
|
||||
};
|
||||
};
|
||||
|
|
|
@ -32,9 +32,13 @@ module.exports = (...extras) => Object.assign({
|
|||
return params;
|
||||
},
|
||||
|
||||
async waitUntilVisible() {
|
||||
async waitUntilVisible(selector) {
|
||||
await driver.wait(until.elementLocated(By.css('body')), waitTimeout);
|
||||
|
||||
if (selector) {
|
||||
await driver.wait(until.elementLocated(By.css(selector)), waitTimeout);
|
||||
}
|
||||
|
||||
for (const elem of (this.elementsToWaitFor || [])) {
|
||||
const sel = this.elements[elem];
|
||||
if (!sel) {
|
||||
|
@ -54,13 +58,13 @@ module.exports = (...extras) => Object.assign({
|
|||
await driver.executeScript('document.mailTrainRefreshAcknowledged = true;');
|
||||
},
|
||||
|
||||
async waitUntilVisibleAfterRefresh() {
|
||||
async waitUntilVisibleAfterRefresh(selector) {
|
||||
await driver.wait(new webdriver.Condition('for refresh', async driver => {
|
||||
const val = await driver.executeScript('return document.mailTrainRefreshAcknowledged;');
|
||||
return !val;
|
||||
}), waitTimeout);
|
||||
|
||||
await this.waitUntilVisible();
|
||||
await this.waitUntilVisible(selector);
|
||||
},
|
||||
|
||||
async click(key) {
|
||||
|
|
|
@ -19,6 +19,11 @@ module.exports = list => ({
|
|||
}
|
||||
}),
|
||||
|
||||
webSubscribeNonPublic: web({
|
||||
url: `/subscription/${list.cid}`,
|
||||
textsToWaitFor: ['The list does not allow public subscriptions'],
|
||||
}),
|
||||
|
||||
webConfirmSubscriptionNotice: web({
|
||||
url: `/subscription/${list.cid}/confirm-subscription-notice`,
|
||||
textsToWaitFor: ['We need to confirm your email address']
|
||||
|
@ -116,6 +121,36 @@ module.exports = list => ({
|
|||
elements: {
|
||||
resubscribeLink: `a[href^="${config.settings['service-url']}subscription/${list.cid}"]`
|
||||
}
|
||||
})
|
||||
});
|
||||
}),
|
||||
|
||||
webUnsubscribe: web({
|
||||
elementsToWaitFor: ['submitButton'],
|
||||
textsToWaitFor: ['Unsubscribe'],
|
||||
elements: {
|
||||
submitButton: 'a[href="#submit"]'
|
||||
}
|
||||
}),
|
||||
|
||||
webConfirmUnsubscriptionNotice: web({
|
||||
url: `/subscription/${list.cid}/confirm-unsubscription-notice`,
|
||||
textsToWaitFor: ['We need to confirm your email address']
|
||||
}),
|
||||
|
||||
mailConfirmUnsubscription: mail({
|
||||
elementsToWaitFor: ['confirmLink'],
|
||||
textsToWaitFor: ['Please Confirm Unsubscription'],
|
||||
elements: {
|
||||
confirmLink: `a[href^="${config.settings['service-url']}subscription/confirm/unsubscribe/"]`
|
||||
}
|
||||
}),
|
||||
|
||||
webManualUnsubscribeNotice: web({
|
||||
url: `/subscription/${list.cid}/manual-unsubscribe-notice`,
|
||||
elementsToWaitFor: ['contactLink'],
|
||||
textsToWaitFor: ['Online Unsubscription Is Not Possible', config.settings['admin-email']],
|
||||
elements: {
|
||||
contactLink: `a[href^="mailto:${config.settings['admin-email']}"]`
|
||||
}
|
||||
}),
|
||||
|
||||
});
|
||||
|
|
|
@ -9,7 +9,7 @@ const expect = require('chai').expect;
|
|||
const page = require('../page-objects/user');
|
||||
const home = require('../page-objects/home');
|
||||
|
||||
suite('Login use-cases', function() {
|
||||
suite('Login use-cases', () => {
|
||||
before(() => driver.manage().deleteAllCookies());
|
||||
|
||||
test('User can access home page', async () => {
|
||||
|
|
|
@ -6,14 +6,19 @@ const config = require('../lib/config');
|
|||
const { useCase, step, precondition, driver } = require('../lib/mocha-e2e');
|
||||
const shortid = require('shortid');
|
||||
const expect = require('chai').expect;
|
||||
const createPage = require('../page-objects/subscription');
|
||||
|
||||
const page = require('../page-objects/subscription')(config.lists.one);
|
||||
function getPage(listConf) {
|
||||
return createPage(listConf);
|
||||
}
|
||||
|
||||
function generateEmail() {
|
||||
return 'keep.' + shortid.generate() + '@mailtrain.org';
|
||||
}
|
||||
|
||||
async function subscribe(subscription) {
|
||||
async function subscribe(listConf, subscription) {
|
||||
const page = getPage(listConf);
|
||||
|
||||
await step('User navigates to list subscription page.', async () => {
|
||||
await page.webSubscribe.navigate();
|
||||
});
|
||||
|
@ -62,23 +67,25 @@ async function subscribe(subscription) {
|
|||
return subscription;
|
||||
}
|
||||
|
||||
async function subscriptionExistsPrecondition(subscription) {
|
||||
async function subscriptionExistsPrecondition(listConf, subscription) {
|
||||
await precondition('Subscription exists', 'Subscription to a public list (main scenario)', async () => {
|
||||
await subscribe(subscription);
|
||||
await subscribe(listConf, subscription);
|
||||
});
|
||||
return subscription;
|
||||
}
|
||||
|
||||
suite('Subscription use-cases', function() {
|
||||
suite('Subscription use-cases', () => {
|
||||
before(() => driver.manage().deleteAllCookies());
|
||||
|
||||
useCase('Subscription to a public list (main scenario)', async () => {
|
||||
await subscribe({
|
||||
await subscribe(config.lists.l1, {
|
||||
email: generateEmail()
|
||||
});
|
||||
});
|
||||
|
||||
useCase('Subscription to a public list (invalid email)', async () => {
|
||||
const page = getPage(config.lists.l1);
|
||||
|
||||
await step('User navigates to list subscribe page', async () => {
|
||||
await page.webSubscribe.navigate();
|
||||
});
|
||||
|
@ -95,7 +102,9 @@ suite('Subscription use-cases', function() {
|
|||
});
|
||||
|
||||
useCase('Subscription to a public list (email already registered)', async () => {
|
||||
const subscription = await subscriptionExistsPrecondition({
|
||||
const page = getPage(config.lists.l1);
|
||||
|
||||
const subscription = await subscriptionExistsPrecondition(config.lists.l1, {
|
||||
email: generateEmail()
|
||||
});
|
||||
|
||||
|
@ -118,10 +127,18 @@ suite('Subscription use-cases', function() {
|
|||
|
||||
});
|
||||
|
||||
useCase('Subscription to a non-public list');
|
||||
useCase('Subscription to a non-public list', async () => {
|
||||
const page = getPage(config.lists.l6);
|
||||
|
||||
await step('User navigates to list subscription page and sees message that this list does not allow public subscriptions.', async () => {
|
||||
await page.webSubscribeNonPublic.navigate();
|
||||
});
|
||||
});
|
||||
|
||||
useCase('Change profile info', async () => {
|
||||
const subscription = await subscriptionExistsPrecondition({
|
||||
const page = getPage(config.lists.l1);
|
||||
|
||||
const subscription = await subscriptionExistsPrecondition(config.lists.l1, {
|
||||
email: generateEmail(),
|
||||
firstName: 'John',
|
||||
lastName: 'Doe'
|
||||
|
@ -163,7 +180,9 @@ suite('Subscription use-cases', function() {
|
|||
});
|
||||
|
||||
useCase('Change email', async () => {
|
||||
const subscription = await subscriptionExistsPrecondition({
|
||||
const page = getPage(config.lists.l1);
|
||||
|
||||
const subscription = await subscriptionExistsPrecondition(config.lists.l1, {
|
||||
email: generateEmail(),
|
||||
firstName: 'John',
|
||||
lastName: 'Doe'
|
||||
|
@ -221,7 +240,9 @@ suite('Subscription use-cases', function() {
|
|||
});
|
||||
|
||||
useCase('Unsubscription from list #1 (one-step, no form).', async () => {
|
||||
const subscription = await subscriptionExistsPrecondition({
|
||||
const page = getPage(config.lists.l1);
|
||||
|
||||
const subscription = await subscriptionExistsPrecondition(config.lists.l1, {
|
||||
email: generateEmail()
|
||||
});
|
||||
|
||||
|
@ -238,13 +259,181 @@ suite('Subscription use-cases', function() {
|
|||
});
|
||||
});
|
||||
|
||||
useCase('Unsubscription from list #2 (one-step, with form).');
|
||||
useCase('Unsubscription from list #2 (one-step, with form).', async () => {
|
||||
const page = getPage(config.lists.l2);
|
||||
|
||||
useCase('Unsubscription from list #3 (two-step, no form).');
|
||||
const subscription = await subscriptionExistsPrecondition(config.lists.l2, {
|
||||
email: generateEmail()
|
||||
});
|
||||
|
||||
useCase('Unsubscription from list #4 (two-step, with form).');
|
||||
await step('User clicks the unsubscribe button.', async () => {
|
||||
await page.mailSubscriptionConfirmed.click('unsubscribeLink');
|
||||
});
|
||||
|
||||
useCase('Unsubscription from list #5 (manual unsubscribe).');
|
||||
await step('Systems shows a form to unsubscribe.', async () => {
|
||||
await page.webUnsubscribe.waitUntilVisibleAfterRefresh();
|
||||
});
|
||||
|
||||
await step('User confirms unsubscribe and clicks the unsubscribe button.', async () => {
|
||||
await page.webUnsubscribe.submit();
|
||||
});
|
||||
|
||||
await step('System shows a notice that confirms unsubscription.', async () => {
|
||||
await page.webUnsubscribedNotice.waitUntilVisibleAfterRefresh();
|
||||
});
|
||||
|
||||
await step('System sends an email that confirms unsubscription.', async () => {
|
||||
await page.mailUnsubscriptionConfirmed.fetchMail(subscription.email);
|
||||
});
|
||||
});
|
||||
|
||||
useCase('Unsubscription from list #3 (two-step, no form).', async () => {
|
||||
const page = getPage(config.lists.l3);
|
||||
|
||||
const subscription = await subscriptionExistsPrecondition(config.lists.l3, {
|
||||
email: generateEmail()
|
||||
});
|
||||
|
||||
await step('User clicks the unsubscribe button.', async () => {
|
||||
await page.mailSubscriptionConfirmed.click('unsubscribeLink');
|
||||
});
|
||||
|
||||
await step('System shows a notice that further instructions are in the email.', async () => {
|
||||
await page.webConfirmUnsubscriptionNotice.waitUntilVisibleAfterRefresh();
|
||||
});
|
||||
|
||||
await step('System sends an email with a link to confirm unsubscription.', async () => {
|
||||
await page.mailConfirmUnsubscription.fetchMail(subscription.email);
|
||||
});
|
||||
|
||||
await step('User clicks the confirm unsubscribe button in the email.', async () => {
|
||||
await page.mailConfirmUnsubscription.click('confirmLink');
|
||||
});
|
||||
|
||||
await step('System shows a notice that confirms unsubscription.', async () => {
|
||||
await page.webUnsubscribedNotice.waitUntilVisibleAfterRefresh();
|
||||
});
|
||||
|
||||
await step('System sends an email that confirms unsubscription.', async () => {
|
||||
await page.mailUnsubscriptionConfirmed.fetchMail(subscription.email);
|
||||
});
|
||||
});
|
||||
|
||||
useCase('Unsubscription from list #4 (two-step, with form).', async () => {
|
||||
const page = getPage(config.lists.l4);
|
||||
|
||||
const subscription = await subscriptionExistsPrecondition(config.lists.l4, {
|
||||
email: generateEmail()
|
||||
});
|
||||
|
||||
await step('User clicks the unsubscribe button.', async () => {
|
||||
await page.mailSubscriptionConfirmed.click('unsubscribeLink');
|
||||
});
|
||||
|
||||
await step('Systems shows a form to unsubscribe.', async () => {
|
||||
await page.webUnsubscribe.waitUntilVisibleAfterRefresh();
|
||||
});
|
||||
|
||||
await step('User confirms unsubscribe and clicks the unsubscribe button.', async () => {
|
||||
await page.webUnsubscribe.submit();
|
||||
});
|
||||
|
||||
await step('System shows a notice that further instructions are in the email.', async () => {
|
||||
await page.webConfirmUnsubscriptionNotice.waitUntilVisibleAfterRefresh();
|
||||
});
|
||||
|
||||
await step('System sends an email with a link to confirm unsubscription.', async () => {
|
||||
await page.mailConfirmUnsubscription.fetchMail(subscription.email);
|
||||
});
|
||||
|
||||
await step('User clicks the confirm unsubscribe button in the email.', async () => {
|
||||
await page.mailConfirmUnsubscription.click('confirmLink');
|
||||
});
|
||||
|
||||
await step('System shows a notice that confirms unsubscription.', async () => {
|
||||
await page.webUnsubscribedNotice.waitUntilVisibleAfterRefresh();
|
||||
});
|
||||
|
||||
await step('System sends an email that confirms unsubscription.', async () => {
|
||||
await page.mailUnsubscriptionConfirmed.fetchMail(subscription.email);
|
||||
});
|
||||
});
|
||||
|
||||
useCase('Unsubscription from list #5 (manual unsubscribe).', async () => {
|
||||
const page = getPage(config.lists.l5);
|
||||
|
||||
await subscriptionExistsPrecondition(config.lists.l5, {
|
||||
email: generateEmail()
|
||||
});
|
||||
|
||||
await step('User clicks the unsubscribe button.', async () => {
|
||||
await page.mailSubscriptionConfirmed.click('unsubscribeLink');
|
||||
});
|
||||
|
||||
await step('Systems shows a notice that online unsubscription is not possible.', async () => {
|
||||
await page.webManualUnsubscribeNotice.waitUntilVisibleAfterRefresh();
|
||||
});
|
||||
});
|
||||
|
||||
useCase('Resubscription.', async () => {
|
||||
const page = getPage(config.lists.l1);
|
||||
|
||||
const subscription = await subscriptionExistsPrecondition(config.lists.l1, {
|
||||
email: generateEmail(),
|
||||
firstName: 'John',
|
||||
lastName: 'Doe'
|
||||
});
|
||||
|
||||
await step('User clicks the unsubscribe button.', async () => {
|
||||
await page.mailSubscriptionConfirmed.click('unsubscribeLink');
|
||||
});
|
||||
|
||||
await step('System shows a notice that confirms unsubscription.', async () => {
|
||||
await page.webUnsubscribedNotice.waitUntilVisibleAfterRefresh();
|
||||
});
|
||||
|
||||
await step('System sends an email that confirms unsubscription.', async () => {
|
||||
await page.mailUnsubscriptionConfirmed.fetchMail(subscription.email);
|
||||
});
|
||||
|
||||
await step('User clicks the resubscribe button.', async () => {
|
||||
await page.mailUnsubscriptionConfirmed.click('resubscribeLink');
|
||||
});
|
||||
|
||||
await step('Systems shows the subscription form. The form contains data entered during initial subscription.', async () => {
|
||||
await page.webSubscribe.waitUntilVisibleAfterRefresh();
|
||||
expect(await page.webSubscribe.getValue('emailInput')).to.equal(subscription.email);
|
||||
expect(await page.webSubscribe.getValue('firstNameInput')).to.equal(subscription.firstName);
|
||||
expect(await page.webSubscribe.getValue('lastNameInput')).to.equal(subscription.lastName);
|
||||
});
|
||||
|
||||
await step('User submits the subscription form.', async () => {
|
||||
await page.webSubscribe.submit();
|
||||
});
|
||||
|
||||
await step('System shows a notice that further instructions are in the email.', async () => {
|
||||
await page.webConfirmSubscriptionNotice.waitUntilVisibleAfterRefresh();
|
||||
});
|
||||
|
||||
await step('System sends an email with a link to confirm the subscription.', async () => {
|
||||
await page.mailConfirmSubscription.fetchMail(subscription.email);
|
||||
});
|
||||
|
||||
await step('User clicks confirm subscription in the email', async () => {
|
||||
await page.mailConfirmSubscription.click('confirmLink');
|
||||
});
|
||||
|
||||
await step('System shows a notice that subscription has been confirmed.', async () => {
|
||||
await page.webSubscribedNotice.waitUntilVisibleAfterRefresh();
|
||||
});
|
||||
|
||||
await step('System sends an email with subscription confirmation. The manage and unsubscribe links are identical with the initial subscription.', async () => {
|
||||
await page.mailSubscriptionConfirmed.fetchMail(subscription.email);
|
||||
const unsubscribeLink = await page.mailSubscriptionConfirmed.getHref('unsubscribeLink');
|
||||
const manageLink = await page.mailSubscriptionConfirmed.getHref('manageLink');
|
||||
expect(subscription.unsubscribeLink).to.equal(unsubscribeLink);
|
||||
expect(subscription.manageLink).to.equal(manageLink);
|
||||
});
|
||||
});
|
||||
|
||||
useCase('Resubscription.'); // This one is supposed to check that values pre-filled in resubscription (i.e. the re-subscribe link in unsubscription confirmation) are the same as the ones used before.
|
||||
});
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue