diff options
author | Benaka <diosmosis@users.noreply.github.com> | 2015-05-26 20:39:37 +0300 |
---|---|---|
committer | Benaka <diosmosis@users.noreply.github.com> | 2015-05-26 20:39:37 +0300 |
commit | 05eec309d84db98b93ec06b11e63c6157471647f (patch) | |
tree | c9339010f034ddfde73fd5c0bce431aed27f45ed /plugins/TestRunner | |
parent | d7558bb22d9280d4f9f1cfccb7fadb8980a67a20 (diff) | |
parent | 80a0463fa9a905c2a552cd64c6e097c2581ea25d (diff) |
Merge pull request #7957 from piwik/test_env_di_3
Adding Config instance to DI and move all Config related test setup code from Config.php and TestingEnvironment.php to TestConfig class. Introduced completely internal EnvironmentManipulator concept so tests can change paths of local/global/common INI config file.
Diffstat (limited to 'plugins/TestRunner')
-rw-r--r-- | plugins/TestRunner/Commands/TestsSetupFixture.php | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/plugins/TestRunner/Commands/TestsSetupFixture.php b/plugins/TestRunner/Commands/TestsSetupFixture.php index f659eae71f..2591cdcdaa 100644 --- a/plugins/TestRunner/Commands/TestsSetupFixture.php +++ b/plugins/TestRunner/Commands/TestsSetupFixture.php @@ -124,7 +124,6 @@ class TestsSetupFixture extends ConsoleCommand // perform setup and/or teardown if ($input->getOption('teardown')) { - exit; $fixture->getTestEnvironment()->save(); $fixture->performTearDown(); } else { @@ -225,12 +224,6 @@ class TestsSetupFixture extends ConsoleCommand $fixture->extraPluginsToLoad = explode(',', $extraPluginsToLoad); } - if ($fixture->createConfig) { - Config::getInstance()->setTestEnvironment($pathLocal = null, $pathGlobal = null, $pathCommon = null, $allowSave); - } - - $fixture->createConfig = false; - return $fixture; } |