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:
Tomas Bures 2017-05-28 19:23:43 +02:00
commit 731226dfeb
20 changed files with 580 additions and 105 deletions

View file

@ -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']}"]`
}
}),
});