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

Removes timeouts and uses data-automation-id as element selector

Browse Source
This commit is contained in:
Vlad
2017-11-07 08:40:53 -05:00
committed by pavel-mailpoet
parent d399ddf6b6
commit f1918ac953
8 changed files with 32 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
assets/js/src/newsletters/listings/notification.jsx
View File

@ -310,7 +310,7 @@ const NewsletterListNotification = React.createClass({
return (
<div>
<h1 className="title">
{MailPoet.I18n.t('pageTitle')} <Link className="page-title-action" to="/new">{MailPoet.I18n.t('new')}</Link>
{MailPoet.I18n.t('pageTitle')} <Link className="page-title-action" to="/new" data-automation-id="new_email">{MailPoet.I18n.t('new')}</Link>
</h1>
<ListingTabs tab="notification" />

2
assets/js/src/newsletters/listings/notification_history.jsx
View File

@ -100,7 +100,7 @@ const NewsletterListNotificationHistory = React.createClass({
return (
<div>
<h1 className="title">
{MailPoet.I18n.t('pageTitle')} <Link className="page-title-action" to="/new">{MailPoet.I18n.t('new')}</Link>
{MailPoet.I18n.t('pageTitle')} <Link className="page-title-action" to="/new" data-automation-id="new_email">{MailPoet.I18n.t('new')}</Link>
</h1>
<ListingTabs tab="notification" />

1
assets/js/src/newsletters/listings/standard.jsx
View File

@ -211,6 +211,7 @@ const NewsletterListStandard = React.createClass({
onClick={() => MailPoet.trackEvent('Emails > Add New',
{ 'MailPoet Free version': window.mailpoet_version }
)}
data-automation-id="new_email"
>
{MailPoet.I18n.t('new')}
</Link>

2
assets/js/src/newsletters/listings/welcome.jsx
View File

@ -291,7 +291,7 @@ const NewsletterListWelcome = React.createClass({
return (
<div>
<h1 className="title">
{ MailPoet.I18n.t('pageTitle') } <Link className="page-title-action" to="/new">{ MailPoet.I18n.t('new') }</Link>
{ MailPoet.I18n.t('pageTitle') } <Link className="page-title-action" to="/new" data-automation-id="new_email">{ MailPoet.I18n.t('new') }</Link>
</h1>
<ListingTabs tab="welcome" />

1
assets/js/src/newsletters/templates.jsx
View File

@ -258,6 +258,7 @@ define(
&nbsp;
<a
className="button button-primary"
data-automation-id={'select_template_' + index}
onClick={this.handleSelectTemplate.bind(null, template)}
>
{MailPoet.I18n.t('select')}

4
lib/Form/Block/Select.php
View File

@ -10,10 +10,10 @@ class Select extends Base {
$field_name = 'data[' . static::getFieldName($block) . ']';
$field_validation = static::getInputValidation($block);
$automation_id = ($block['id'] == 'status') ? 'data-automation-id="form_status"' : '';
$html .= '<p class="mailpoet_paragraph">';
$html .= static::renderLabel($block);
$html .= '<select class="mailpoet_select" name="'.$field_name.'">';
$html .= '<select class="mailpoet_select" name="'.$field_name.'" ' . $automation_id . '>';
if(isset($block['params']['label_within']) && $block['params']['label_within']) {
$html .= '<option value="">'.static::getFieldLabel($block).'</option>';

42
tests/acceptance/ManageSubscriptionLinkCest.php
View File

@ -13,32 +13,35 @@ class ManageSubscriptionLinkCest {
$I->wantTo('Create and send new email to WordPress Users list');
$I->loginAsAdmin();
$I->pauseExecution();
$I->amOnMailpoetPage('Emails');
$I->click('a.page-title-action');
$I->pauseExecution();
$I->click('[data-automation-id=\'new_email\']');
// step 1 - select type
$I->seeInCurrentUrl('#/new');
$I->click('Create');
$I->wait(3);
// step 2 - select template
$first_template_element = '[data-automation-id=\'select_template_1\']';
$I->waitForElement($first_template_element);
$I->seeInCurrentUrl('#/template');
$I->click('Select', 'ul.mailpoet_boxes > li:nth-child(1)');
$I->wait(3);
$I->click($first_template_element);
// step 3 - design newsletter (update subject)
$title_element ='[data-automation-id=\'newsletter_title\']';
$I->waitForElement($title_element);
$I->seeInCurrentUrl('mailpoet-newsletter-editor');
$I->waitForElement('.mailpoet_input_title');
$I->fillField('.mailpoet_input_title', $this->newsletter_title);
$I->fillField($title_element, $this->newsletter_title);
$I->click('Next');
// step 4 - send
$I->waitForElement('input.select2-search__field');
$search_field_element = 'input.select2-search__field';
$I->waitForElement($search_field_element);
$I->seeInCurrentUrl('#/send');
$I->fillField('input.select2-search__field', 'WordPress Users');
$I->pressKey('input.select2-search__field', \WebDriverKeys::ENTER);
$I->fillField($search_field_element, 'WordPress Users');
$I->pressKey($search_field_element, \WebDriverKeys::ENTER);
$I->click('Send');
$I->wait(3);
$I->waitForText('Sent to 1 of 1');
}
@ -52,23 +55,27 @@ class ManageSubscriptionLinkCest {
$I->switchToNextTab();
$I->waitForText('Manage your subscription');
$form_status_element = '[data-automation-id=\'form_status\']';
// set status to unsubscribed
$I->selectOption('.mailpoet_select', 'Unsubscribed');
$I->selectOption($form_status_element, 'Unsubscribed');
$I->click('Save');
$I->wait(3);
$I->seeOptionIsSelected('.mailpoet_select', 'Unsubscribed');
$I->waitForElement($form_status_element);
$I->seeOptionIsSelected($form_status_element, 'Unsubscribed');
// change status back to subscribed
$I->selectOption('.mailpoet_select', 'Subscribed');
$I->selectOption($form_status_element, 'Subscribed');
$I->click('Save');
$I->wait(3);
$I->seeOptionIsSelected('.mailpoet_select', 'Subscribed');
$I->waitForElement($form_status_element);
$I->seeOptionIsSelected($form_status_element, 'Subscribed');
$I->seeNoJSErrors();
}
function unsubscribeLink(\AcceptanceTester $I) {
$I->wantTo('Verify that "unsubscribe" link works and subscriber status is set to unsubscribed');
$form_status_element = '[data-automation-id=\'form_status\']';
$I->amOnUrl('http://mailhog:8025');
$I->click(Locator::contains('span.subject', $this->newsletter_title));
$I->switchToIframe('preview-html');
@ -76,8 +83,7 @@ class ManageSubscriptionLinkCest {
$I->switchToNextTab();
$I->waitForText('You are now unsubscribed');
$I->click('Manage your subscription');
$I->wait(3);
$I->seeOptionIsSelected('.mailpoet_select', 'Unsubscribed');
$I->seeOptionIsSelected($form_status_element, 'Unsubscribed');
$I->seeNoJSErrors();
}
}

1
views/newsletter/templates/components/heading.hbs
View File

@ -2,6 +2,7 @@
<input
type="text"
class="mailpoet_input mailpoet_input_title"
data-automation-id="newsletter_title"
value="{{ model.subject }}"
placeholder="<%= __('Click here to change the subject!') %>"
/>