Skip to content
Extraits de code Groupes Projets
Valider dd642bc8 rédigé par diosmosis's avatar diosmosis
Parcourir les fichiers

Make sure setup-fixture command does not overwrite config on normal UI tests run.

parent 12ab1411
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
...@@ -111,7 +111,7 @@ class TestsSetupFixture extends ConsoleCommand ...@@ -111,7 +111,7 @@ class TestsSetupFixture extends ConsoleCommand
} }
} }
$fixture = $this->createFixture($input); $fixture = $this->createFixture($input, $allowSave = !empty($configDomainToSave));
$this->setupDatabaseOverrides($input, $fixture); $this->setupDatabaseOverrides($input, $fixture);
...@@ -188,7 +188,7 @@ class TestsSetupFixture extends ConsoleCommand ...@@ -188,7 +188,7 @@ class TestsSetupFixture extends ConsoleCommand
} }
} }
private function createFixture(InputInterface $input) private function createFixture(InputInterface $input, $allowSave)
{ {
$fixtureClass = $input->getArgument('fixture'); $fixtureClass = $input->getArgument('fixture');
if (class_exists("Piwik\\Tests\\Fixtures\\" . $fixtureClass)) { if (class_exists("Piwik\\Tests\\Fixtures\\" . $fixtureClass)) {
...@@ -221,7 +221,7 @@ class TestsSetupFixture extends ConsoleCommand ...@@ -221,7 +221,7 @@ class TestsSetupFixture extends ConsoleCommand
} }
if ($fixture->createConfig) { if ($fixture->createConfig) {
Config::getInstance()->setTestEnvironment($pathLocal = null, $pathGlobal = null, $pathCommon = null, $allowSaving = true); Config::getInstance()->setTestEnvironment($pathLocal = null, $pathGlobal = null, $pathCommon = null, $allowSave);
} }
$fixture->createConfig = false; $fixture->createConfig = false;
......
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Veuillez vous inscrire ou vous pour commenter