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

Replace "new SettingsController()" with fetch from DI container

Browse Source 
[MAILPOET-2436]
This commit is contained in:
Jan Jakeš
2019-10-24 10:48:58 +02:00
committed by Jack Kitterhing
parent c91cd1255a
commit d970dda637
79 changed files with 132 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -45,7 +45,7 @@ class ViewInBrowserTest extends \MailPoetTest {
'preview' => false,
];
// instantiate class
$this->view_in_browser = new ViewInBrowser(new AccessControl(new Functions()), new SettingsController(), new LinkTokens(), new Emoji());
$this->view_in_browser = new ViewInBrowser(new AccessControl(new Functions()), SettingsController::getInstance(), new LinkTokens(), new Emoji());
}
function testItAbortsWhenBrowserPreviewDataIsMissing() {
@ -155,12 +155,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()), new SettingsController(), new LinkTokens(), new Emoji());
$view_in_browser = new ViewInBrowser(new AccessControl(new Functions()), 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()), new SettingsController(), new LinkTokens(), new Emoji());
$view_in_browser = new ViewInBrowser(new AccessControl(new Functions()), SettingsController::getInstance(), new LinkTokens(), new Emoji());
expect($view_in_browser->_validateBrowserPreviewData($data))->equals($data);
}
@ -176,7 +176,7 @@ class ViewInBrowserTest extends \MailPoetTest {
);
$data->preview = true;
wp_set_current_user(1);
$view_in_browser = new ViewInBrowser(new AccessControl(new Functions()), new SettingsController(), new LinkTokens(), new Emoji());
$view_in_browser = new ViewInBrowser(new AccessControl(new Functions()), SettingsController::getInstance(), new LinkTokens(), new Emoji());
$result = $view_in_browser->_validateBrowserPreviewData($data);
expect($result->subscriber->id)->equals(1);
}
@ -211,7 +211,7 @@ class ViewInBrowserTest extends \MailPoetTest {
$view_in_browser = Stub::make($this->view_in_browser, [
'link_tokens' => new LinkTokens,
'_displayNewsletter' => Expected::exactly(1),
'settings' => new SettingsController(),
'settings' => SettingsController::getInstance(),
'emoji' => new Emoji(),
], $this);
$view_in_browser->view($this->browser_preview_data);