Fix failing tests

Author: Jamie Snape

modules/api/controllers/IndexController.php

@@ -185,8 +185,8 @@ function jsonAction()
     }
 
   /** Allows components to call redirect */
-  function redirect($url)
+  function redirect($url, array $options = array())
     {
-    $this->_redirect($url);
+    $this->_redirect($url, $options);
     }
   } // end class

tests/PHPUnitMySQL.php

@@ -63,15 +63,12 @@
 
 copy($base_path . '/tests/configs/mysql.ini', $base_path . '/tests/configs/lock.mysql.ini');
 
-require_once 'PHP/CodeCoverage/Filter.php';
-PHP_CodeCoverage_Filter::getInstance()->addFileToBlacklist(__FILE__, 'PHPUNIT');
+define('PHPUnit_MAIN_METHOD', 'PHPUnit_TextUI_Command::main');
 
 if (strpos('@php_bin@', '@php_bin') === 0) {
     set_include_path(dirname(__FILE__) . PATH_SEPARATOR . get_include_path());
 }
 
 require_once 'PHPUnit/Autoload.php';
 
-define('PHPUnit_MAIN_METHOD', 'PHPUnit_TextUI_Command::main');
-
 PHPUnit_TextUI_Command::main();

tests/PHPUnitPgSQL.php

@@ -63,15 +63,12 @@
 
 copy($base_path . '/tests/configs/pgsql.ini', $base_path . '/tests/configs/lock.pgsql.ini');
 
-require_once 'PHP/CodeCoverage/Filter.php';
-PHP_CodeCoverage_Filter::getInstance()->addFileToBlacklist(__FILE__, 'PHPUNIT');
+define('PHPUnit_MAIN_METHOD', 'PHPUnit_TextUI_Command::main');
 
 if (strpos('@php_bin@', '@php_bin') === 0) {
     set_include_path(dirname(__FILE__) . PATH_SEPARATOR . get_include_path());
 }
 
 require_once 'PHPUnit/Autoload.php';
 
-define('PHPUnit_MAIN_METHOD', 'PHPUnit_TextUI_Command::main');
-
 PHPUnit_TextUI_Command::main();