Refactor tests [MAILOET-1677]

This commit is contained in:
Amine Ben hammou
2019-03-18 23:23:59 +01:00
committed by M. Shull
parent 4fc53d2b36
commit de3d3331b0
3 changed files with 19 additions and 23 deletions

View File

@@ -31,12 +31,6 @@ class AccessControlTest extends \MailPoetTest {
return array('custom_manage_settings_role'); return array('custom_manage_settings_role');
} }
); );
$wp->addFilter(
'mailpoet_permission_manage_user_flags',
function() {
return array('custom_manage_user_flags_role');
}
);
$wp->addFilter( $wp->addFilter(
'mailpoet_permission_manage_emails', 'mailpoet_permission_manage_emails',
function() { function() {
@@ -70,9 +64,6 @@ class AccessControlTest extends \MailPoetTest {
AccessControl::PERMISSION_MANAGE_SETTINGS => array( AccessControl::PERMISSION_MANAGE_SETTINGS => array(
'custom_manage_settings_role' 'custom_manage_settings_role'
), ),
AccessControl::PERMISSION_MANAGE_USER_FLAGS => array(
'custom_manage_user_flags_role'
),
AccessControl::PERMISSION_MANAGE_EMAILS => array( AccessControl::PERMISSION_MANAGE_EMAILS => array(
'custom_manage_emails_role' 'custom_manage_emails_role'
), ),

View File

@@ -8,7 +8,7 @@ use MailPoet\Config\Menu;
use MailPoet\Config\Renderer; use MailPoet\Config\Renderer;
use MailPoet\Config\ServicesChecker; use MailPoet\Config\ServicesChecker;
use MailPoet\Settings\SettingsController; use MailPoet\Settings\SettingsController;
use MailPoet\Settings\UserFlags; use MailPoet\Settings\UserFlagsController;
use MailPoet\WooCommerce\Helper as WooCommerceHelper; use MailPoet\WooCommerce\Helper as WooCommerceHelper;
use MailPoet\WP\Functions; use MailPoet\WP\Functions;
@@ -44,7 +44,7 @@ class MenuTest extends \MailPoetTest {
function testItChecksMailpoetAPIKey() { function testItChecksMailpoetAPIKey() {
$renderer = Stub::make(new Renderer()); $renderer = Stub::make(new Renderer());
$menu = new Menu($renderer, new AccessControl(new Functions()), new SettingsController(), new Functions(), new WooCommerceHelper, new ServicesChecker, new UserFlags); $menu = new Menu($renderer, new AccessControl(new Functions()), new SettingsController(), new Functions(), new WooCommerceHelper, new ServicesChecker, new UserFlagsController);
$_REQUEST['page'] = 'mailpoet-newsletters'; $_REQUEST['page'] = 'mailpoet-newsletters';
$checker = Stub::make( $checker = Stub::make(
@@ -66,7 +66,7 @@ class MenuTest extends \MailPoetTest {
function testItChecksPremiumKey() { function testItChecksPremiumKey() {
$renderer = Stub::make(new Renderer()); $renderer = Stub::make(new Renderer());
$menu = new Menu($renderer, new AccessControl(new Functions()), new SettingsController(), new Functions(), new WooCommerceHelper, new ServicesChecker, new UserFlags); $menu = new Menu($renderer, new AccessControl(new Functions()), new SettingsController(), new Functions(), new WooCommerceHelper, new ServicesChecker, new UserFlagsController);
$_REQUEST['page'] = 'mailpoet-newsletters'; $_REQUEST['page'] = 'mailpoet-newsletters';
$checker = Stub::make( $checker = Stub::make(

View File

@@ -5,7 +5,7 @@ use MailPoet\Models\UserFlag;
class UserFlagTest extends \MailPoetTest { class UserFlagTest extends \MailPoetTest {
function testItCanCreateOrUpdate() { function testCreateOrUpdateCreatesNewFlags() {
expect(UserFlag::count())->equals(0); expect(UserFlag::count())->equals(0);
$created_flag = UserFlag::createOrUpdate([ $created_flag = UserFlag::createOrUpdate([
@@ -13,10 +13,23 @@ class UserFlagTest extends \MailPoetTest {
'name' => 'first_flag', 'name' => 'first_flag',
'value' => 'foo' 'value' => 'foo'
]); ]);
$other_flag = UserFlag::createOrUpdate([
'user_id' => 3,
'name' => 'second_flag',
'value' => 'bar'
]);
expect($created_flag->id > 0)->true(); expect($created_flag->id > 0)->true();
expect($created_flag->getErrors())->false(); expect($created_flag->getErrors())->false();
expect(UserFlag::count())->equals(1); expect($other_flag->id != $created_flag->id)->true();
expect(UserFlag::count())->equals(2);
}
function testCreateOrUpdateUpdatesExistingFlags() {
$created_flag = UserFlag::createOrUpdate([
'user_id' => 3,
'name' => 'first_flag',
'value' => 'foo'
]);
$updated_flag = UserFlag::createOrUpdate([ $updated_flag = UserFlag::createOrUpdate([
'user_id' => 3, 'user_id' => 3,
'name' => 'first_flag', 'name' => 'first_flag',
@@ -25,14 +38,6 @@ class UserFlagTest extends \MailPoetTest {
expect($updated_flag->id)->equals($created_flag->id); expect($updated_flag->id)->equals($created_flag->id);
expect($updated_flag->value)->equals('bar'); expect($updated_flag->value)->equals('bar');
expect(UserFlag::count())->equals(1); expect(UserFlag::count())->equals(1);
$other_flag = UserFlag::createOrUpdate([
'user_id' => 3,
'name' => 'second_flag',
'value' => 'bar'
]);
expect($other_flag->id != $created_flag)->true();
expect(UserFlag::count())->equals(2);
} }
function _after() { function _after() {