Test fixes

diff --git a/karma.conf.js b/karma.conf.js
index 2915dc7814fe5020a03f613abe5ce5eaf923edc5..1710c33fdc590a2ebc269766c99e930cde51ba5f 100644 (file)
--- a/karma.conf.js
+++ b/karma.conf.js
@@ -21,6 +21,7 @@ module.exports = function(config) {
     autoWatch: true,
     browsers: ['PhantomJS'],
     exclude: [
+      'ang/api4Explorer/Explorer.js'
     ],
     files: [
       'bower_components/phantomjs-polyfill/bind-polyfill.js',

diff --git a/tools/scripts/phpunit b/tools/scripts/phpunit
index 671c4d7440d1db693bf3cf10e732649efd912a69..2e682bc0db51253824050b4d71b2a6a467c760d8 100755 (executable)
--- a/tools/scripts/phpunit
+++ b/tools/scripts/phpunit
@@ -50,7 +50,7 @@ array_shift($argv);
 // Convert class names to file names
 $CIVICRM_UF = 'UnitTests';
 foreach ($argv as $k => $v) {
-  if (preg_match('/^(CRM_|api_v3_|EnvTest|WebTest_|E2E_)/', $v)) {
+  if (preg_match('/^(CRM_|api_v3_|api_v4_|EnvTest|WebTest_|E2E_)/', $v)) {
     $argv[$k] = 'tests/phpunit/' . strtr($v, '_', '/') . '.php';
   }
   elseif (preg_match('/^Civi\\\\/', $v)) {