Allow extra environments to be specified through testing environment variables, add a new one for UI tests call ui-test.php, use to remove port from localhost in UI tests, and fix a bug in ContainerFactory (config/config.php should be applied after environment files).

1 files changed, 2 insertions, 0 deletions

diff --git a/tests/PHPUnit/Framework/Fixture.php b/tests/PHPUnit/Framework/Fixture.php
index f0a2f1978f..04c52371da 100644
--- a/tests/PHPUnit/Framework/Fixture.php
+++ b/tests/PHPUnit/Framework/Fixture.php
@@ -107,6 +107,7 @@ class Fixture extends \PHPUnit_Framework_Assert
 
     public $testCaseClass = false;
     public $extraPluginsToLoad = array();
+    public $extraDiEnvironments = array();
 
     public $testEnvironment = null;
 
@@ -201,6 +202,7 @@ class Fixture extends \PHPUnit_Framework_Assert
         $testEnv->testCaseClass = $this->testCaseClass;
         $testEnv->fixtureClass = get_class($this);
         $testEnv->dbName = $this->dbName;
+        $testEnv->extraDiEnvironments = $this->extraDiEnvironments;
 
         foreach ($this->extraTestEnvVars as $name => $value) {
             $testEnv->$name = $value;