diff options
| author | diosmosis <diosmosis@users.noreply.github.com> | 2018-09-06 01:51:44 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-06 01:51:44 +0300 |
| commit | 5e71b34bbc05376a729a454d4f421dbfb9d26e39 (patch) | |
| tree | 7fe8f891098cbb95995562b69c5af9f19f7e6ad2 /plugins/TestRunner | |
| parent | d679c5571ece625b9863c63ad9b99d09f28ce63f (diff) | |
Couple test related changes for tests that load multiple other plugins (#13319)
* In tests:setup-fixture do not overwrite a Fixtures existing extra plugins to load.
* Only uninstall plugins in test if dropDatabaseInTeardown is false.
* Load fixture extra plugins in testing environment manipulator.
* Handle test case fixture too.
Diffstat (limited to 'plugins/TestRunner')
| -rw-r--r-- | plugins/TestRunner/Commands/TestsSetupFixture.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/plugins/TestRunner/Commands/TestsSetupFixture.php b/plugins/TestRunner/Commands/TestsSetupFixture.php index 9675a6d8be..35b19eb983 100644 --- a/plugins/TestRunner/Commands/TestsSetupFixture.php +++ b/plugins/TestRunner/Commands/TestsSetupFixture.php @@ -240,7 +240,8 @@ class TestsSetupFixture extends ConsoleCommand $extraPluginsToLoad = $input->getOption('plugins'); if ($extraPluginsToLoad) { - $fixture->extraPluginsToLoad = explode(',', $extraPluginsToLoad); + $fixture->extraPluginsToLoad = array_merge($fixture->extraPluginsToLoad, explode(',', $extraPluginsToLoad)); + $fixture->extraPluginsToLoad = array_unique($fixture->extraPluginsToLoad); } $fixture->extraDiEnvironments = array('ui-test'); |