Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordiosmosis <benaka@piwik.pro>2014-10-30 06:35:57 +0300
committerdiosmosis <benaka@piwik.pro>2014-10-30 06:42:03 +0300
commitdd642bc8af1372d7dfeab7728c0e0f6b926f29e4 (patch)
tree2789f4e3f9469d4ec1932fce03816c7bae83f360 /plugins/TestRunner/Commands/TestsSetupFixture.php
parent12ab14111ac067e576cb88ad8f2f40c8fd21f945 (diff)
Make sure setup-fixture command does not overwrite config on normal UI tests run.
Diffstat (limited to 'plugins/TestRunner/Commands/TestsSetupFixture.php')
-rw-r--r--plugins/TestRunner/Commands/TestsSetupFixture.php6
1 files changed, 3 insertions, 3 deletions
diff --git a/plugins/TestRunner/Commands/TestsSetupFixture.php b/plugins/TestRunner/Commands/TestsSetupFixture.php
index 7e95fc1d37..8c053b1711 100644
--- a/plugins/TestRunner/Commands/TestsSetupFixture.php
+++ b/plugins/TestRunner/Commands/TestsSetupFixture.php
@@ -111,7 +111,7 @@ class TestsSetupFixture extends ConsoleCommand
}
}
- $fixture = $this->createFixture($input);
+ $fixture = $this->createFixture($input, $allowSave = !empty($configDomainToSave));
$this->setupDatabaseOverrides($input, $fixture);
@@ -188,7 +188,7 @@ class TestsSetupFixture extends ConsoleCommand
}
}
- private function createFixture(InputInterface $input)
+ private function createFixture(InputInterface $input, $allowSave)
{
$fixtureClass = $input->getArgument('fixture');
if (class_exists("Piwik\\Tests\\Fixtures\\" . $fixtureClass)) {
@@ -221,7 +221,7 @@ class TestsSetupFixture extends ConsoleCommand
}
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;