diff --git a/assets/js/src/listing/listing.jsx b/assets/js/src/listing/listing.jsx index 6f731916b2..ac41bf38db 100644 --- a/assets/js/src/listing/listing.jsx +++ b/assets/js/src/listing/listing.jsx @@ -186,7 +186,7 @@ const ListingItem = React.createClass({ const row_classes = classNames({ 'is-expanded': this.state.expanded }); return ( - + { checkbox } { this.props.onRenderItem(this.props.item, actions) } diff --git a/assets/js/src/newsletters/listings/tabs.jsx b/assets/js/src/newsletters/listings/tabs.jsx index b00b229afa..3df80cf2fd 100644 --- a/assets/js/src/newsletters/listings/tabs.jsx +++ b/assets/js/src/newsletters/listings/tabs.jsx @@ -46,7 +46,7 @@ const ListingTabs = React.createClass({ }); return ( -

+

{ tabs }

); diff --git a/tests/_data/acceptanceDump.sql b/tests/_data/acceptanceDump.sql index c4f7c312e5..ae2242275d 100644 --- a/tests/_data/acceptanceDump.sql +++ b/tests/_data/acceptanceDump.sql @@ -134,6 +134,10 @@ CREATE TABLE `wp_mailpoet_newsletters` ( PRIMARY KEY (`id`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_520_ci; +INSERT INTO `wp_mailpoet_newsletters` VALUES +(1,NULL,NULL,'Standard newsletter','standard','wp@example.com','test','draft','','','','','','2017-11-16 11:02:35',NULL,NULL), +(2,NULL,NULL,'Welcome email','welcome','wp@example.com','test','draft','','','','','','2017-11-16 11:02:35',NULL,NULL), +(3,NULL,NULL,'Post notification','notification','wp@example.com','test','draft','','','','','','2017-11-16 11:02:35',NULL,NULL); DROP TABLE IF EXISTS `wp_mailpoet_newsletter_links`; CREATE TABLE `wp_mailpoet_newsletter_links` ( @@ -486,7 +490,8 @@ CREATE TABLE `wp_mailpoet_subscribers` ( ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_520_ci; INSERT INTO `wp_mailpoet_subscribers` (`id`, `wp_user_id`, `first_name`, `last_name`, `email`, `status`, `subscribed_ip`, `confirmed_ip`, `confirmed_at`, `created_at`, `updated_at`, `deleted_at`, `unconfirmed_data`) VALUES -(1, 1, 'admin', '', 'wp@example.com', 'subscribed', NULL, NULL, NULL, '2017-10-30 00:57:39', '2017-10-30 00:57:39', NULL, NULL); +(1, 1, 'admin', '', 'wp@example.com', 'subscribed', NULL, NULL, NULL, '2017-10-30 00:57:39', '2017-10-30 00:57:39', NULL, NULL), +(2, NULL, 'first', 'last', 'subscriber@example.com', 'subscribed', NULL, NULL, NULL, '2017-11-16 10:39:00', '2017-11-16 10:39:00', NULL, NULL); DROP TABLE IF EXISTS `wp_mailpoet_subscriber_custom_field`; CREATE TABLE `wp_mailpoet_subscriber_custom_field` ( diff --git a/tests/acceptance/FormsListingCest.php b/tests/acceptance/FormsListingCest.php new file mode 100644 index 0000000000..370d44048f --- /dev/null +++ b/tests/acceptance/FormsListingCest.php @@ -0,0 +1,14 @@ +wantTo('Open forms listings page'); + + $I->loginAsAdmin(); + $I->amOnMailpoetPage('Forms'); + + $I->waitForText('Test Form', 5, '[data-automation-id="listing_item_1"]'); + } +} \ No newline at end of file diff --git a/tests/acceptance/ListsListingCest.php b/tests/acceptance/ListsListingCest.php new file mode 100644 index 0000000000..e3edad4e09 --- /dev/null +++ b/tests/acceptance/ListsListingCest.php @@ -0,0 +1,15 @@ +wantTo('Open lists listings page'); + + $I->loginAsAdmin(); + $I->amOnMailpoetPage('Lists'); + + $I->waitForText('WordPress Users', 5, '[data-automation-id="listing_item_1"]'); + $I->see('My First List', '[data-automation-id="listing_item_2"]'); + } +} \ No newline at end of file diff --git a/tests/acceptance/NewsletterListingCest.php b/tests/acceptance/NewsletterListingCest.php deleted file mode 100644 index 55cd230d79..0000000000 --- a/tests/acceptance/NewsletterListingCest.php +++ /dev/null @@ -1,16 +0,0 @@ -wantTo('Open newsletters listings page'); - - $I->loginAsAdmin(); - $I->seeInCurrentUrl('/wp-admin/'); - - // Go to Status - $I->amOnMailpoetPage('Emails'); - $I->waitForElement('#newsletters_container', 3); - } -} \ No newline at end of file diff --git a/tests/acceptance/NewslettersListingCest.php b/tests/acceptance/NewslettersListingCest.php new file mode 100644 index 0000000000..84ce57da7c --- /dev/null +++ b/tests/acceptance/NewslettersListingCest.php @@ -0,0 +1,21 @@ +wantTo('Open newsletters listings page'); + + $I->loginAsAdmin(); + $I->amOnMailpoetPage('Emails'); + + // Standard newsletters is the default tab + $I->waitForText('Standard newsletter', 5, '[data-automation-id="listing_item_1"]'); + + $I->click('Welcome Emails', '[data-automation-id="newsletters_listing_tabs"]'); + $I->waitForText('Welcome email', 5, '[data-automation-id="listing_item_2"]'); + + $I->click('Post Notifications', '[data-automation-id="newsletters_listing_tabs"]'); + $I->waitForText('Post notification', 5, '[data-automation-id="listing_item_3"]'); + } +} \ No newline at end of file diff --git a/tests/acceptance/SubscribersListingCest.php b/tests/acceptance/SubscribersListingCest.php new file mode 100644 index 0000000000..42a7472893 --- /dev/null +++ b/tests/acceptance/SubscribersListingCest.php @@ -0,0 +1,15 @@ +wantTo('Open subscribers listings page'); + + $I->loginAsAdmin(); + $I->amOnMailpoetPage('Subscribers'); + + $I->waitForText('wp@example.com', 5, '[data-automation-id="listing_item_1"]'); + $I->see('subscriber@example.com', '[data-automation-id="listing_item_2"]'); + } +} \ No newline at end of file