http://www.mediawiki.org/wiki/Special:Code/MediaWiki/71778

Revision: 71778
Author:   mah
Date:     2010-08-27 01:38:09 +0000 (Fri, 27 Aug 2010)

Log Message:
-----------
Start of verbose option, fix url option

Modified Paths:
--------------
    trunk/phase3/maintenance/tests/RunSeleniumTests.php

Modified: trunk/phase3/maintenance/tests/RunSeleniumTests.php
===================================================================
--- trunk/phase3/maintenance/tests/RunSeleniumTests.php 2010-08-27 00:56:55 UTC 
(rev 71777)
+++ trunk/phase3/maintenance/tests/RunSeleniumTests.php 2010-08-27 01:38:09 UTC 
(rev 71778)
@@ -36,6 +36,7 @@
                $this->addOption( 'browser', 'The browser he used during 
testing' );
                $this->addOption( 'url', 'The Mediawiki installation to point 
to.' );
                $this->addOption( 'list-browsers', 'List the available 
browsers.' );
+               $this->addOption( 'verbose', 'Be noisier.' );
 
                $this->deleteOption( 'dbpass' );
                $this->deleteOption( 'dbuser' );
@@ -54,10 +55,12 @@
                echo $desc;
        }
 
-       protected function runTests() {
+       protected function runTests( $verbose = false ) {
                global $wgSeleniumLogger, $wgSeleniumTestSuites;
 
-               SeleniumLoader::load();
+               require_once( 'Testing/Selenium.php' );
+               require_once( 'PHPUnit/Framework.php' );
+               require_once( 'PHPUnit/Extensions/SeleniumTestCase.php' );
                $result = new PHPUnit_Framework_TestResult;
                $wgSeleniumLogger = new SeleniumTestConsoleLogger;
                $result->addListener( new SeleniumTestListener( 
$wgSeleniumLogger ) );
@@ -84,10 +87,10 @@
 
                $wgSeleniumServerPort = $this->getOption( 'port', 4444 );
                $wgSeleniumTestsSeleniumHost = $this->getOption( 'host', 
'localhost' );
-               $wgSeleniumTestsWikiUrl = $this->getOption( 'test-url', 
$wgServer . $wgScriptPath );
+               $wgSeleniumTestsWikiUrl = $this->getOption( 'url', $wgServer . 
$wgScriptPath );
                $wgSeleniumTestsUseBrowser = $this->getOption( 'browser', 
'firefox' );
 
-               $this->runTests();
+               $this->runTests( $this->hasOption( 'verbose' ) );
        }
 }
 



_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs

Reply via email to