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>2015-06-20 09:56:00 +0300
committerdiosmosis <benaka@piwik.pro>2015-06-20 09:57:55 +0300
commitb0f80b763e44a1ddac77cf522019b56358fbf4ce (patch)
treebf05db967f524ba9ac5ad659f8c2b6801b26dd87 /tests/PHPUnit/Framework/TestCase
parent064bba0aed207bdf81aba3414ddac09423e4f1ff (diff)
Do not add static::provideContainerConfigBeforeClass() to Fixture::$extraDefinitions in SystemTestCase since they are applied by TestingEnvironmentManipulator.
Diffstat (limited to 'tests/PHPUnit/Framework/TestCase')
-rwxr-xr-xtests/PHPUnit/Framework/TestCase/SystemTestCase.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/PHPUnit/Framework/TestCase/SystemTestCase.php b/tests/PHPUnit/Framework/TestCase/SystemTestCase.php
index 76aba05e87..9d87b1a45d 100755
--- a/tests/PHPUnit/Framework/TestCase/SystemTestCase.php
+++ b/tests/PHPUnit/Framework/TestCase/SystemTestCase.php
@@ -66,7 +66,7 @@ abstract class SystemTestCase extends PHPUnit_Framework_TestCase
$fixture->testCaseClass = get_called_class();
$fixture->extraDefinitions = array_merge(
array('test.vars.loadRealTranslations' => true), // load real translations for system tests
- static::provideContainerConfigBeforeClass()
+ $fixture->extraDefinitions
);
try {