Permalink
Browse files

- Merge [3845].

  • Loading branch information...
1 parent 3deb428 commit 0b190e3debcdc017e98d0d48938edb426d079e60 @sebastianbergmann committed Oct 15, 2008
Showing with 10 additions and 8 deletions.
  1. +10 −1 PHPUnit/TextUI/Command.php
  2. +0 −7 PHPUnit/TextUI/TestRunner.php
View
@@ -543,11 +543,20 @@ protected static function handleArguments()
$arguments['configuration'] = realpath('phpunit.xml');
}
- if (!isset($arguments['test']) && isset($arguments['configuration'])) {
+ if (isset($arguments['configuration'])) {
$configuration = new PHPUnit_Util_Configuration(
$arguments['configuration']
);
+ $browsers = $configuration->getSeleniumBrowserConfiguration();
+
+ if (!empty($browsers)) {
+ require_once 'PHPUnit/Extensions/SeleniumTestCase.php';
+ PHPUnit_Extensions_SeleniumTestCase::$browsers = $browsers;
+ }
+ }
+
+ if (!isset($arguments['test']) && isset($configuration)) {
$configuration->handlePHPConfiguration();
$testSuite = $configuration->getTestSuiteConfiguration();
@@ -751,13 +751,6 @@ protected function handleConfiguration(array &$arguments)
if (isset($loggingConfiguration['testdox-text']) && !isset($arguments['testdoxTextFile'])) {
$arguments['testdoxTextFile'] = $loggingConfiguration['testdox-text'];
}
-
- $browsers = $arguments['configuration']->getSeleniumBrowserConfiguration();
-
- if (!empty($browsers)) {
- require_once 'PHPUnit/Extensions/SeleniumTestCase.php';
- PHPUnit_Extensions_SeleniumTestCase::$browsers = $browsers;
- }
}
$arguments['cpdMinLines'] = isset($arguments['cpdMinLines']) ? $arguments['cpdMinLines'] : 5;

0 comments on commit 0b190e3

Please sign in to comment.