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

Fix constructors [MAILPOET-2488]

Browse Source
This commit is contained in:
wxa
2019-12-20 09:36:15 +03:00
committed by amine-mp
parent 1d757e1374
commit ce719433e8
13 changed files with 27 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
tests/integration/API/JSON/APITest.php
View File

@ -207,7 +207,7 @@ class APITest extends \MailPoetTest {
'data' => ['test' => 'data'],
];
$access_control = Stub::make(
new AccessControl(new WPFunctions()),
new AccessControl(),
['validatePermission' => false]
);
@ -224,7 +224,7 @@ class APITest extends \MailPoetTest {
];
$access_control = Stub::make(
new AccessControl(new WPFunctions()),
new AccessControl(),
[
'validatePermission' => Expected::once(function($cap) {
expect($cap)->equals(AccessControl::PERMISSION_MANAGE_SETTINGS);
@ -237,7 +237,7 @@ class APITest extends \MailPoetTest {
expect($api->validatePermissions(null, $permissions))->false();
$access_control = Stub::make(
new AccessControl(new WPFunctions()),
new AccessControl(),
[
'validatePermission' => Expected::once(function($cap) {
expect($cap)->equals(AccessControl::PERMISSION_MANAGE_SETTINGS);
@ -258,7 +258,7 @@ class APITest extends \MailPoetTest {
];
$access_control = Stub::make(
new AccessControl(new WPFunctions()),
new AccessControl(),
[
'validatePermission' => Expected::once(function($cap) {
expect($cap)->equals(AccessControl::PERMISSION_MANAGE_SETTINGS);
@ -271,7 +271,7 @@ class APITest extends \MailPoetTest {
expect($api->validatePermissions('test', $permissions))->false();
$access_control = Stub::make(
new AccessControl(new WPFunctions()),
new AccessControl(),
[
'validatePermission' => Expected::once(function($cap) {
expect($cap)->equals(AccessControl::PERMISSION_MANAGE_SETTINGS);

6
tests/integration/Cron/Workers/BounceTest.php
View File

@ -34,9 +34,9 @@ class BounceTest extends \MailPoetTest {
]);
}
$this->worker = new Bounce($this->di_container->get(SettingsController::class), microtime(true));
$this->worker = new Bounce($this->di_container->get(SettingsController::class));
$this->worker->api = new MockAPI('key');
$this->worker->api = new MockAPI();
}
public function testItDefinesConstants() {
@ -45,7 +45,7 @@ class BounceTest extends \MailPoetTest {
public function testItCanInitializeBridgeAPI() {
$this->setMailPoetSendingMethod();
$worker = new Bounce($this->di_container->get(SettingsController::class), microtime(true));
$worker = new Bounce($this->di_container->get(SettingsController::class));
$worker->init();
expect($worker->api instanceof API)->true();
}

2
tests/integration/Cron/Workers/KeyCheck/PremiumKeyCheckTest.php
View File

@ -19,7 +19,7 @@ class PremiumKeyCheckTest extends \MailPoetTest {
parent::_before();
$this->settings = SettingsController::getInstance();
$this->premium_key = '123457890abcdef';
$this->worker = new PremiumKeyCheck($this->settings, microtime(true));
$this->worker = new PremiumKeyCheck($this->settings);
}
public function testItRequiresPremiumKeyToBeSpecified() {

2
tests/integration/Cron/Workers/KeyCheck/SendingServiceKeyCheckTest.php
View File

@ -16,7 +16,7 @@ class SendingServiceKeyCheckTest extends \MailPoetTest {
public function _before() {
parent::_before();
$this->mss_key = 'some_key';
$this->worker = new SendingServiceKeyCheck($this->di_container->get(SettingsController::class), microtime(true));
$this->worker = new SendingServiceKeyCheck($this->di_container->get(SettingsController::class));
}
public function testItRequiresMailPoetMethodToBeSetUp() {

2
tests/integration/Cron/Workers/SendingQueue/MigrationTest.php
View File

@ -48,7 +48,7 @@ class MigrationTest extends \MailPoetTest {
$this->queue_completed = $this->createSendingQueue(SendingQueue::STATUS_COMPLETED);
$this->queue_scheduled = $this->createSendingQueue(SendingQueue::STATUS_SCHEDULED);
$this->worker = new Migration(microtime(true));
$this->worker = new Migration();
}
public function testItDefinesConstants() {

2
tests/integration/Cron/Workers/SendingQueue/SendingQueueTest.php
View File

@ -58,7 +58,7 @@ class SendingQueueTest extends \MailPoetTest {
private $sending_error_handler;
/** @var SettingsController */
private $settings;
/** @var Scheduler */
/** @var StatsNotificationsScheduler */
private $stats_notifications_worker;
/** @var LoggerFactory */
private $logger_factory;

2
tests/integration/Cron/Workers/WooCommerceOrdersTest.php
View File

@ -31,7 +31,7 @@ class WooCommerceOrdersTest extends \MailPoetTest {
$this->woocommerce_helper = $this->createMock(WooCommerceHelper::class);
$this->woocommerce_purchases = $this->createMock(WooCommercePurchases::class);
$this->worker = new WooCommercePastOrders($this->woocommerce_helper, $this->woocommerce_purchases, microtime(true));
$this->worker = new WooCommercePastOrders($this->woocommerce_helper, $this->woocommerce_purchases);
$this->cron_worker_runner = Stub::copy($this->di_container->get(CronWorkerRunner::class), [
'timer' => microtime(true), // reset timer to avoid timeout during full test suite run
]);

2
tests/integration/Cron/Workers/WooCommerceSyncTest.php
View File

@ -16,7 +16,7 @@ class WooCommerceSyncTest extends \MailPoetTest {
public function _before() {
$this->woocommerce_segment = $this->createMock(WooCommerceSegment::class);
$this->woocommerce_helper = $this->createMock(WooCommerceHelper::class);
$this->worker = new WooCommerceSync($this->woocommerce_segment, $this->woocommerce_helper, microtime(true));
$this->worker = new WooCommerceSync($this->woocommerce_segment, $this->woocommerce_helper);
}
public function testItWillNotRunIfWooCommerceIsDisabled() {

2
tests/integration/DynamicSegments/Filters/WooCommerceCategoryTest.php
View File

@ -5,7 +5,7 @@ namespace MailPoet\DynamicSegments\Filters;
class WooCommerceCategoryTest extends \MailPoetTest {
public function testToArray() {
$filter = new WooCommerceCategory("5");
$filter = new WooCommerceCategory(5);
$data = $filter->toArray();
expect($data)->notEmpty();
expect($data['segmentType'])->same('woocommerce');

4
tests/integration/Mailer/WordPress/WordpressMailerTest.php
View File

@ -135,12 +135,12 @@ class WordpressMailerTest extends \MailPoetTest {
$mailer
->expects($this->once())
->method('send')
->willReturn(['response' => false, 'error' => new MailerError('send', 1, 'Error from primary mailer')]);
->willReturn(['response' => false, 'error' => new MailerError('send', MailerError::LEVEL_HARD, 'Error from primary mailer')]);
$fallback_mailer = $this->createMock(FallbackMailer::class);
$fallback_mailer
->expects($this->once())
->method('send')
->willReturn(['response' => false, 'error' => new MailerError('send', 1, 'Error from fallback mailer')]);
->willReturn(['response' => false, 'error' => new MailerError('send', MailerError::LEVEL_HARD, 'Error from fallback mailer')]);
$wpMailer = new WordPressMailer($mailer, $fallback_mailer, new MetaInfo, $this->subscribers_repository);
$wpMailer->addAddress('email@example.com');

8
tests/integration/Router/Endpoints/ViewInBrowserTest.php
View File

@ -51,7 +51,7 @@ class ViewInBrowserTest extends \MailPoetTest {
'preview' => false,
];
// instantiate class
$this->view_in_browser = new ViewInBrowser(new AccessControl(new Functions()), SettingsController::getInstance(), new LinkTokens(), new Emoji());
$this->view_in_browser = new ViewInBrowser(new AccessControl(), SettingsController::getInstance(), new LinkTokens(), new Emoji());
}
public function testItAbortsWhenBrowserPreviewDataIsMissing() {
@ -161,12 +161,12 @@ class ViewInBrowserTest extends \MailPoetTest {
$wp_user = wp_set_current_user(0);
// when WP user does not have 'manage options' permission, false should be returned
$wp_user->remove_role('administrator');
$view_in_browser = new ViewInBrowser(new AccessControl(new Functions()), SettingsController::getInstance(), new LinkTokens(), new Emoji());
$view_in_browser = new ViewInBrowser(new AccessControl(), SettingsController::getInstance(), new LinkTokens(), new Emoji());
expect($view_in_browser->_validateBrowserPreviewData($data))->false();
// when WP has 'manage options' permission, data should be returned
$wp_user->add_role('administrator');
$view_in_browser = new ViewInBrowser(new AccessControl(new Functions()), SettingsController::getInstance(), new LinkTokens(), new Emoji());
$view_in_browser = new ViewInBrowser(new AccessControl(), SettingsController::getInstance(), new LinkTokens(), new Emoji());
expect($view_in_browser->_validateBrowserPreviewData($data))->equals($data);
}
@ -182,7 +182,7 @@ class ViewInBrowserTest extends \MailPoetTest {
);
$data->preview = true;
wp_set_current_user(1);
$view_in_browser = new ViewInBrowser(new AccessControl(new Functions()), SettingsController::getInstance(), new LinkTokens(), new Emoji());
$view_in_browser = new ViewInBrowser(new AccessControl(), SettingsController::getInstance(), new LinkTokens(), new Emoji());
$result = $view_in_browser->_validateBrowserPreviewData($data);
expect($result->subscriber->id)->equals(1);
}

10
tests/integration/Router/RouterTest.php
View File

@ -29,7 +29,7 @@ class RouterTest extends \MailPoetTest {
'action' => 'test',
'data' => base64_encode(json_encode(['data' => 'dummy data'])),
];
$this->access_control = new AccessControl(new WPFunctions());
$this->access_control = new AccessControl();
$container_factory = new ContainerFactory(new ContainerConfigurator());
$this->container = $container_factory->getConfiguredContainer();
$this->container->register(RouterTestMockEndpoint::class)->setPublic(true);
@ -115,7 +115,7 @@ class RouterTest extends \MailPoetTest {
'global' => AccessControl::PERMISSION_MANAGE_SETTINGS,
];
$access_control = Stub::make(
new AccessControl(new WPFunctions()),
new AccessControl(),
[
'validatePermission' => Expected::once(function($cap) {
expect($cap)->equals(AccessControl::PERMISSION_MANAGE_SETTINGS);
@ -127,7 +127,7 @@ class RouterTest extends \MailPoetTest {
expect($router->validatePermissions(null, $permissions))->false();
$access_control = Stub::make(
new AccessControl(new WPFunctions()),
new AccessControl(),
[
'validatePermission' => Expected::once(function($cap) {
expect($cap)->equals(AccessControl::PERMISSION_MANAGE_SETTINGS);
@ -150,7 +150,7 @@ class RouterTest extends \MailPoetTest {
];
$access_control = Stub::make(
new AccessControl(new WPFunctions()),
new AccessControl(),
[
'validatePermission' => Expected::once(function($cap) {
expect($cap)->equals(AccessControl::PERMISSION_MANAGE_SETTINGS);
@ -162,7 +162,7 @@ class RouterTest extends \MailPoetTest {
expect($router->validatePermissions('test', $permissions))->false();
$access_control = Stub::make(
new AccessControl(new WPFunctions()),
new AccessControl(),
[
'validatePermission' => Expected::once(function($cap) {
expect($cap)->equals(AccessControl::PERMISSION_MANAGE_SETTINGS);

1
tests/integration/Services/BridgeTestMockAPI.php
View File

@ -8,6 +8,7 @@ class BridgeTestMockAPI extends API {
public $api_key;
public function __construct($api_key) {
parent::__construct($api_key);
$this->setKey($api_key);
}