Cavemanon/piratepoet
8
Fork 0
Code Pull Requests Actions Releases 16 Activity

Fix acceptance tests

Browse Source
This commit is contained in:
Amine Ben hammou
2020-03-20 05:54:10 +01:00
committed by Veljko V
parent e88aef03d9
commit 13eebc742c
9 changed files with 84 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
assets/js/src/settings/pages/advanced/inactive_subscribers.tsx
View File

@@ -6,7 +6,7 @@ import { Label, Inputs } from 'settings/components';
export default function InactiveSubscribers() {
const [duration, setDuration] = useSetting('deactivate_subscriber_after_inactive_days');
const [trackingEnabled] = useSetting('tracking', 'enabled');
return (
<>
<Label
@@ -28,9 +28,13 @@ export default function InactiveSubscribers() {
htmlFor=""
/>
<Inputs>
{!trackingEnabled && <p data-automation-id="inactive-subscribers-disabled">{t('disabledBecauseTrackingIs')}</p>}
{trackingEnabled && (
<div data-automation-id="inactive-subscribers-enabled">
<input
type="radio"
id="inactive-subscribers-disabled"
data-automation-id="inactive-subscribers-option-never"
value=""
checked={duration === ''}
onChange={onChange(setDuration)}
@@ -56,6 +60,7 @@ export default function InactiveSubscribers() {
value="180"
checked={duration === '180'}
onChange={onChange(setDuration)}
data-automation-id="inactive-subscribers-default"
/>
<label htmlFor="inactive-subscribers-6-months">
{t('after6months')}
@@ -71,6 +76,8 @@ export default function InactiveSubscribers() {
<label htmlFor="inactive-subscribers-12-months">
{t('after12months')}
</label>
</div>
)}
</Inputs>
</>
);

9
assets/js/src/settings/pages/advanced/reinstall.tsx
View File

@@ -27,7 +27,14 @@ export default function Reinstall() {
htmlFor=""
/>
<Inputs>
<button type="button" className="button" onClick={onClick}>{t('reinstallNow')}</button>
<button
type="button"
className="button"
onClick={onClick}
data-automation-id="reinstall-button"
>
{t('reinstallNow')}
</button>
</Inputs>
</>
);

2
assets/js/src/settings/pages/advanced/share_data.tsx
View File

@@ -34,6 +34,7 @@ export default function ShareData() {
value="1"
checked={enabled === '1'}
onChange={onChange(setEnabled)}
data-automation-id="analytics-yes"
/>
<label htmlFor="share-data-enabled">
{t('yes')}
@@ -45,6 +46,7 @@ export default function ShareData() {
value=""
checked={enabled === ''}
onChange={onChange(setEnabled)}
data-automation-id="analytics-no"
/>
<label htmlFor="share-data-disabled">
{t('no')}

3
assets/js/src/settings/pages/advanced/task_scheduler.tsx
View File

@@ -36,6 +36,7 @@ export default function TaskScheduler() {
value="WordPress"
checked={method === 'WordPress'}
onChange={onChange(setMethod)}
data-automation-id="wordress_cron_radio"
/>
<label htmlFor="cron_trigger-method-wordpress">
{t('websiteVisitors')}
@@ -47,6 +48,7 @@ export default function TaskScheduler() {
value="MailPoet"
checked={method === 'MailPoet'}
onChange={onChange(setMethod)}
data-automation-id="mailpoet_cron_radio"
/>
<label htmlFor="cron_trigger-method-mailpoet">
{ReactStringReplace(t('mailpoetScript'),
@@ -70,6 +72,7 @@ export default function TaskScheduler() {
value="Linux Cron"
checked={method === 'Linux Cron'}
onChange={onChange(setMethod)}
data-automation-id="linux_cron_radio"
/>
<label htmlFor="cron_trigger-method-cron">
{t('serverCron')}

2
assets/js/src/settings/pages/advanced/tracking.tsx
View File

@@ -21,6 +21,7 @@ export default function Tracking() {
value="1"
checked={enabled === '1'}
onChange={onChange(setEnabled)}
data-automation-id="tracking-enabled-radio"
/>
<label htmlFor="tracking-enabled">
{t('yes')}
@@ -32,6 +33,7 @@ export default function Tracking() {
value=""
checked={enabled === ''}
onChange={onChange(setEnabled)}
data-automation-id="tracking-disabled-radio"
/>
<label htmlFor="tracking-disabled">
{t('no')}

48
tests/acceptance/AdvancedSettingsCest.php
View File

@@ -12,39 +12,17 @@ class AdvancedSettingsCest {
$i->login();
$i->amOnMailPoetPage('Settings');
$i->click('[data-automation-id="settings-advanced-tab"]');
$i->waitForText('Bounce email address');
$i->selectOption($noAnonymousData, 'No');
$i->waitForElement($noAnonymousData);
$i->click($noAnonymousData);
//save + refresh
$i->click($submitButton);
$i->waitForText($successMessage);
$i->seeOptionIsSelected($noAnonymousData, 'No');
$i->seeCheckboxIsChecked($noAnonymousData);
//repeat for Yes
$i->selectOption($yesAnonymousData, 'Yes');
$i->click($yesAnonymousData);
$i->click($submitButton);
$i->waitForText($successMessage);
$i->seeOptionIsSelected($yesAnonymousData, 'Yes');
}
public function addBounceEmailAddress(\AcceptanceTester $i) {
$i->wantTo('Add a bounce email address on Advanced Settings page');
$bounceAddressField = '[data-automation-id="bounce-address-field"]';
$bounceAddressText = 'bounce@bounce.bounce';
$submitButton = '[data-automation-id="settings-submit-button"]';
$successMessage = "Settings saved";
$i->login();
$i->amOnMailPoetPage('Settings');
$i->click('[data-automation-id="settings-advanced-tab"]');
$i->waitForElement($bounceAddressField);
$i->fillField($bounceAddressField, $bounceAddressText);
$i->click($submitButton);
$i->waitForText($successMessage);
$i->waitForElement($bounceAddressField);
//check System Info to make sure the value changed in db
$i->amOnMailPoetPage('Help');
$i->waitForText('Knowledge Base');
$i->click('System Info');
$i->waitForText('The information below is useful');
$i->waitForText($bounceAddressText);
$i->seeCheckboxIsChecked($yesAnonymousData);
}
public function toggleTaskScheduler(\AcceptanceTester $i) {
@@ -55,18 +33,17 @@ class AdvancedSettingsCest {
$systemInfoWordPressCron = "Task Scheduler method: WordPress";
$systemInfoMailPoetCron = "Task Scheduler method: MailPoet";
$systemInfoLinuxCron = "Task Scheduler method: Linux Cron";
$bounceAddressField = '[data-automation-id="bounce-address-field"]';
$submitButton = '[data-automation-id="settings-submit-button"]';
$successMessage = "Settings saved";
//switch to MailPoet cron
$i->login();
$i->amOnMailPoetPage('Settings');
$i->click('[data-automation-id="settings-advanced-tab"]');
$i->waitForElement($bounceAddressField);
$i->waitForElement($chooseMailPoetCron);
$i->click($chooseMailPoetCron);
$i->click($submitButton);
$i->waitForText($successMessage);
$i->waitForElement($bounceAddressField);
$i->waitForElement($chooseMailPoetCron);
//check System Info to make sure the value changed
$i->amOnMailPoetPage('Help');
$i->waitForText('Knowledge Base');
@@ -76,11 +53,11 @@ class AdvancedSettingsCest {
//switch to linux cron
$i->amOnMailPoetPage('Settings');
$i->click('[data-automation-id="settings-advanced-tab"]');
$i->waitForElement($bounceAddressField);
$i->waitForElement($chooseLinuxCron);
$i->click($chooseLinuxCron);
$i->click($submitButton);
$i->waitForText($successMessage);
$i->waitForElement($bounceAddressField);
$i->waitForElement($chooseLinuxCron);
//check System Info to make sure the value changed
$i->amOnMailPoetPage('Help');
$i->waitForText('Knowledge Base');
@@ -90,11 +67,11 @@ class AdvancedSettingsCest {
//switch to default cron
$i->amOnMailPoetPage('Settings');
$i->click('[data-automation-id="settings-advanced-tab"]');
$i->waitForElement($bounceAddressField);
$i->waitForElement($chooseWordPressCron);
$i->click($chooseWordPressCron);
$i->click($submitButton);
$i->waitForText($successMessage);
$i->waitForElement($bounceAddressField);
$i->waitForElement($chooseWordPressCron);
//check System Info to make sure the value changed
$i->amOnMailPoetPage('Help');
$i->waitForText('Knowledge Base');
@@ -143,9 +120,12 @@ class AdvancedSettingsCest {
public function checkInactiveSubscribers(\AcceptanceTester $i) {
$i->wantTo('Check that inactive subsribers has default value');
$inactiveSubscribersDefault = '[data-automation-id="inactive-subscribers-default"]';
$trackingEnabled = '[data-automation-id="tracking-enabled-radio"]';
$i->login();
$i->amOnMailPoetPage('Settings');
$i->click('[data-automation-id="settings-advanced-tab"]');
$i->waitForElement($trackingEnabled);
$i->click($trackingEnabled);
$i->waitForElement($inactiveSubscribersDefault);
$i->seeCheckboxIsChecked($inactiveSubscribersDefault);

2
tests/acceptance/ReinstallFromScratchCest.php
View File

@@ -30,7 +30,7 @@ class ReinstallFromScratchCest {
// Step 2 - reinstall from scratch
$i->amOnPage('/wp-admin/admin.php?page=mailpoet-settings#advanced');
$i->waitForElement('#mailpoet_reinstall');
$i->waitForElement('[data-automation-id="reinstall-button"]');
$i->click('Reinstall now...');
$i->acceptPopup();
$i->waitForText('Welcome! Let’s get you started on the right foot.');

2
tests/acceptance/SettingsInactiveSubscribersChangeCest.php
View File

@@ -36,7 +36,7 @@ class SettingsInactiveSubscribersChangeCest {
$i->login();
$i->amOnMailPoetPage('Settings');
$i->click('[data-automation-id="settings-advanced-tab"]');
$i->waitForElement('[data-automation-id="inactive-subscribers-enabled"]');
$i->waitForElement('[data-automation-id="inactive-subscribers-option-never"]');
$i->click('[data-automation-id="inactive-subscribers-option-never"]');
$i->click('[data-automation-id="settings-submit-button"]');
$i->waitForText('Settings saved');

2
tests/acceptance/SettingsPageBasicsCest.php
View File

@@ -23,7 +23,7 @@ class SettingsPageBasicsCest {
$i->seeNoJSErrors();
//Advanced Tab
$i->click('[data-automation-id="settings-advanced-tab"]');
$i->waitForText('Bounce email address');
$i->waitForText('Newsletter task scheduler');
$i->seeNoJSErrors();
//Activation Key Tab
$i->click('[data-automation-id="activation_settings_tab"]');