Merge pull request #25416 from totten/master-scan-fix

CaseActivityTest - Fix quiet regressions
civicrm · Jan 25, 2023 · 4502008 · 4502008
2 parents 7439108 + 4c9783f
commit 4502008
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/tests/phpunit/CRM/Case/WorkflowMessage/CaseActivityTest.php b/tests/phpunit/CRM/Case/WorkflowMessage/CaseActivityTest.php
@@ -71,7 +71,7 @@ public function testExampleGet() {
       ->execute()
       ->single();
     $this->assertEquals($name, $get['name']);
-    $this->assertEquals(100, $get['data']['modelProps']['contact']['id']);
+    $this->assertEquals(0, $get['data']['modelProps']['contact']['id']);
     $this->assertEquals('myrole', $get['data']['modelProps']['contact']['role']);
   }
 

diff --git a/tests/phpunit/CiviTest/bootstrap.php b/tests/phpunit/CiviTest/bootstrap.php
@@ -17,8 +17,9 @@
 function civitest_civicrm_scanClasses(array &$classes): void {
   $phpunit = \Civi::paths()->getPath('[civicrm.root]/tests/phpunit');
   if (strpos(get_include_path(), $phpunit) !== FALSE) {
-    \Civi\Core\ClassScanner::scanFolders($classes, $phpunit, 'CRM/*/WorkflowMessage', '_');
-    \Civi\Core\ClassScanner::scanFolders($classes, $phpunit, 'Civi/*/WorkflowMessage', '\\');
+    \Civi\Core\ClassScanner::scanFolders($classes, $phpunit, 'CRM/*/WorkflowMessage', '_', '/Test$/');
+    \Civi\Core\ClassScanner::scanFolders($classes, $phpunit, 'Civi/*/WorkflowMessage', '\\', '/Test$/');
+    // Exclude all `*Test.php` files - if we load them, then phpunit gets confused.
   }
 }