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

Refactor MailPoet\API to use new settings

Browse Source 
[MAILPOET-1757]
This commit is contained in:
Rostislav Wolny
2019-01-30 13:53:44 +01:00
parent 3aa0926fb9
commit 3b5962d36a
12 changed files with 130 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -13,6 +13,7 @@ use MailPoet\API\JSON\v1\APITestNamespacedEndpointStubV1;
use MailPoet\API\JSON\v2\APITestNamespacedEndpointStubV2;
use MailPoet\Config\AccessControl;
use MailPoet\DI\ContainerConfigurator;
use MailPoet\Settings\SettingsController;
use MailPoetVendor\Symfony\Component\DependencyInjection\Container;
use MailPoet\DI\ContainerFactory;
use MailPoet\WP\Functions as WPFunctions;
@@ -26,6 +27,9 @@ class APITest extends \MailPoetTest {
/** @var Container */
private $container;
/** @var SettingsController */
private $settings;
function _before() {
parent::_before();
// create WP user
@@ -42,7 +46,13 @@ class APITest extends \MailPoetTest {
$this->container->autowire(APITestNamespacedEndpointStubV1::class)->setPublic(true);
$this->container->autowire(APITestNamespacedEndpointStubV2::class)->setPublic(true);
$this->container->compile();
$this->api = new \MailPoet\API\JSON\API($this->container, $this->container->get(AccessControl::class), new WPFunctions);
$this->settings = $this->container->get(SettingsController::class);
$this->api = new \MailPoet\API\JSON\API(
$this->container,
$this->container->get(AccessControl::class),
$this->settings,
new WPFunctions
);
}
function testItCallsAPISetupAction() {
@@ -59,7 +69,8 @@ class APITest extends \MailPoetTest {
'setupAjax',
array(
'wp' => new WPFunctions,
'processRoute' => Stub::makeEmpty(new SuccessResponse)
'processRoute' => Stub::makeEmpty(new SuccessResponse),
'settings' => $this->container->get(SettingsController::class)
)
);
$api->setupAjax();
@@ -197,7 +208,8 @@ class APITest extends \MailPoetTest {
new AccessControl(),
array('validatePermission' => false)
);
$api = new JSONAPI($this->container, $access_control, new WPFunctions);
$api = new JSONAPI($this->container, $access_control, $this->settings, new WPFunctions);
$api->addEndpointNamespace($namespace['name'], $namespace['version']);
$api->setRequestData($data);
$response = $api->processRoute();
@@ -218,7 +230,8 @@ class APITest extends \MailPoetTest {
})
)
);
$api = new JSONAPI($this->container, $access_control, new WPFunctions);
$api = new JSONAPI($this->container, $access_control, $this->settings, new WPFunctions);
expect($api->validatePermissions(null, $permissions))->false();
$access_control = Stub::make(
@@ -230,7 +243,7 @@ class APITest extends \MailPoetTest {
})
)
);
$api = new JSONAPI($this->container, $access_control, new WPFunctions);
$api = new JSONAPI($this->container, $access_control, $this->settings, new WPFunctions);
expect($api->validatePermissions(null, $permissions))->true();
}
@@ -251,7 +264,8 @@ class APITest extends \MailPoetTest {
})
)
);
$api = new JSONAPI($this->container, $access_control, new WPFunctions);
$api = new JSONAPI($this->container, $access_control, $this->settings, new WPFunctions);
expect($api->validatePermissions('test', $permissions))->false();
$access_control = Stub::make(
@@ -263,7 +277,8 @@ class APITest extends \MailPoetTest {
})
)
);
$api = new JSONAPI($this->container, $access_control, new WPFunctions);
$api = new JSONAPI($this->container, $access_control, $this->settings, new WPFunctions);
expect($api->validatePermissions('test', $permissions))->true();
}