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

Remove free plan feature flag

Browse Source 
[MAILPOET-2098]
This commit is contained in:
Pavel Dohnal
2019-05-27 13:31:28 +02:00
committed by M. Shull
parent 480254cf68
commit 23973d8c73
3 changed files with 1 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
assets/js/src/newsletters/listings/heading.jsx
View File

@@ -5,10 +5,7 @@ import FreePlanAnnouncement from 'announcements/free_plan_announcement.jsx';
const ListingHeading = () => ( const ListingHeading = () => (
<div> <div>
{ <FreePlanAnnouncement />
MailPoet.FeaturesController.isSupported('new-free-plan')
&& <FreePlanAnnouncement />
}
<h1 className="title"> <h1 className="title">
{MailPoet.I18n.t('pageTitle')} {MailPoet.I18n.t('pageTitle')}

2
lib/Features/FeaturesController.php
View File

@@ -9,13 +9,11 @@ class FeaturesController {
// Define features below in the following form: // Define features below in the following form:
// const FEATURE_NAME_OF_FEATURE = 'name-of-feature'; // const FEATURE_NAME_OF_FEATURE = 'name-of-feature';
const FEATURE_DISPLAY_WOOCOMMERCE_REVENUES = 'display-woocommerce-revenues'; // may also have 'display_revenues' setting const FEATURE_DISPLAY_WOOCOMMERCE_REVENUES = 'display-woocommerce-revenues'; // may also have 'display_revenues' setting
const FEATURE_NEW_FREE_PLAN = 'new-free-plan';
// Define feature defaults in the array below in the following form: // Define feature defaults in the array below in the following form:
// self::FEATURE_NAME_OF_FEATURE => true, // self::FEATURE_NAME_OF_FEATURE => true,
private $defaults = [ private $defaults = [
self::FEATURE_DISPLAY_WOOCOMMERCE_REVENUES => false, self::FEATURE_DISPLAY_WOOCOMMERCE_REVENUES => false,
self::FEATURE_NEW_FREE_PLAN => false,
]; ];
/** @var array */ /** @var array */

1
tests/acceptance/FreePlanAnnouncementCest.php
View File

@@ -11,7 +11,6 @@ class FreePlanAnnouncementCest {
const NOTICE_SELECTOR = '[data-automation-id="free-plan-announcement"]'; const NOTICE_SELECTOR = '[data-automation-id="free-plan-announcement"]';
function showAndCloseNotice(\AcceptanceTester $I) { function showAndCloseNotice(\AcceptanceTester $I) {
(new Features())->withFeatureEnabled(FeaturesController::FEATURE_NEW_FREE_PLAN);
$I->wantTo('Show and close free plan announcement'); $I->wantTo('Show and close free plan announcement');
$I->login(); $I->login();
$I->amOnMailPoetPage('Emails'); $I->amOnMailPoetPage('Emails');