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

6
tests/integration/Models/SettingTest.php
View File

@@ -63,13 +63,13 @@ class SettingTest extends \MailPoetTest {
}
function testSaveDefaultSenderIfNeededNotSaveEmptyValue() {
$settings_controller = new SettingsController();
$settings_controller = SettingsController::getInstance();
Setting::saveDefaultSenderIfNeeded('', null);
expect($settings_controller->get('sender'))->null();
}
function testSaveDefaultSenderIfNeededDoesntOverride() {
$settings_controller = new SettingsController();
$settings_controller = SettingsController::getInstance();
$settings_controller->set('sender', ['name' => 'sender1', 'address' => 'sender1address']);
Setting::saveDefaultSenderIfNeeded('sender2address', 'sender1');
$settings = $settings_controller->get('sender');
@@ -78,7 +78,7 @@ class SettingTest extends \MailPoetTest {
}
function testSaveDefaultSenderIfNeeded() {
$settings_controller = new SettingsController();
$settings_controller = SettingsController::getInstance();
Setting::saveDefaultSenderIfNeeded('senderAddress', 'sender');
$settings = $settings_controller->get('sender');
expect($settings['name'])->equals('sender');