Skip to content

Commit d2a38ec

Browse files
Gavryshko, Ivan(igavryshko)Olga Kopylova
authored andcommitted
MAGETWO-33204: Add Suggestion to Run Update Tool After a Module(s) is Enabled - fixed issues according to CR.
1 parent cd9b1af commit d2a38ec

File tree

2 files changed

+39
-1
lines changed

2 files changed

+39
-1
lines changed

dev/tests/unit/testsuite/Magento/Setup/Controller/ConsoleControllerTest.php

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -340,6 +340,42 @@ public function moduleActionDataProvider()
340340
];
341341
}
342342

343+
/**
344+
* @param string $command
345+
* @param string $modules
346+
* @param bool $isForce
347+
* @param bool $expectedIsEnabled
348+
* @param string[] $expectedModules
349+
* @dataProvider moduleActionEnabledSuggestionMessageDataProvider
350+
*/
351+
public function testModuleActionEnabledSuggestionMessage($command, $modules, $isForce, $expectedIsEnabled, $expectedModules)
352+
{
353+
$status = $this->getModuleActionMocks($command, $modules, $isForce, false);
354+
$status->expects($this->once())->method('getModulesToChange')->willReturn($expectedModules);
355+
if (!$isForce) {
356+
$status->expects($this->once())->method('checkConstraints')->willReturn([]);
357+
}
358+
$status->expects($this->once())
359+
->method('setIsEnabled')
360+
->with($expectedIsEnabled, $expectedModules);
361+
$this->consoleLogger->expects($this->once())
362+
->method('log')
363+
->with($this->stringContains("To make sure that the enabled modules are properly registered, run 'update' command."));
364+
$this->controller->moduleAction();
365+
}
366+
367+
/**
368+
* @return array
369+
*/
370+
public function moduleActionEnabledSuggestionMessageDataProvider()
371+
{
372+
return [
373+
[ConsoleController::CMD_MODULE_ENABLE, 'Module_Foo,Module_Bar', false, true, ['Module_Foo', 'Module_Bar']],
374+
[ConsoleController::CMD_MODULE_ENABLE, 'Module_Foo,Module_Bar', true, true, ['Module_Foo', 'Module_Bar']],
375+
[ConsoleController::CMD_MODULE_ENABLE, 'Module_Foo,Module_Bar', false, true, ['Module_Foo']],
376+
];
377+
}
378+
343379
/**
344380
* @param string $command
345381
* @param string $modules

setup/src/Magento/Setup/Controller/ConsoleController.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -497,12 +497,14 @@ public function moduleAction()
497497
}
498498
}
499499
$status->setIsEnabled($isEnable, $modulesToChange);
500+
$updateAfterEnableMessage = '';
500501
if ($isEnable) {
501502
$message = 'The following modules have been enabled:';
503+
$updateAfterEnableMessage = "\nTo make sure that the enabled modules are properly registered, run 'update' command.";
502504
} else {
503505
$message = 'The following modules have been disabled:';
504506
}
505-
$message .= ' ' . implode(', ', $modulesToChange);
507+
$message .= ' ' . implode(', ', $modulesToChange) . $updateAfterEnableMessage;
506508
} else {
507509
$message = 'There have been no changes to any modules.';
508510
}

0 commit comments

Comments
 (0)