Fix tests so that they can work with Configure extension or some other special config

diff --git a/t/inc/Database.t b/t/inc/Database.t
index 6355c2f..4367fcd 100644 (file)
--- a/t/inc/Database.t
+++ b/t/inc/Database.t
@@ -5,14 +5,12 @@ define( 'MEDIAWIKI', true );
 require 't/Test.php';
 
 require 'includes/Defines.php';
+require 'StartProfiler.php';
+require 'includes/AutoLoader.php';
 require 'LocalSettings.php';
+require 'includes/Setup.php';
 
-plan( 13 );
-
-require_ok( 'includes/ProfilerStub.php' );
-require_ok( 'includes/GlobalFunctions.php' );
-require_ok( 'includes/Exception.php' );
-require_ok( 'includes/db/Database.php' );
+plan( 9 );
 
 $db = new Database( $wgDBserver, $wgDBuser, $wgDBpassword );
 

diff --git a/t/inc/Global.t b/t/inc/Global.t
index 9675993..7b2994e 100644 (file)
--- a/t/inc/Global.t
+++ b/t/inc/Global.t
@@ -5,12 +5,12 @@ define( 'MEDIAWIKI', true );
 require 't/Test.php';
 
 require 'includes/Defines.php';
+require 'StartProfiler.php';
+require 'includes/AutoLoader.php';
 require 'LocalSettings.php';
+require 'includes/Setup.php';
 
-plan( 48 );
-
-require_ok( 'includes/ProfilerStub.php' );
-require_ok( 'includes/GlobalFunctions.php' );
+plan( 46 );
 
 $wgReadOnly = null;
 $wgReadOnlyFile = tempnam(wfTempDir(), "mwtest_readonly");