Merge pull request #18511 from totten/master-aff-test

Afform Tests - Fix extension tests when run via `civi-test-run`
civicrm · Sep 18, 2020 · d6ae26b · d6ae26b
2 parents fa90126 + 76b9562
commit d6ae26b
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 5 deletions.
diff --git a/Civi/Angular/Manager.php b/Civi/Angular/Manager.php
@@ -53,6 +53,20 @@ public function __construct($res, \CRM_Utils_Cache_Interface $cache = NULL) {
     $this->cache = $cache ? $cache : new \CRM_Utils_Cache_ArrayCache([]);
   }
 
+  /**
+   * Clear out any runtime-cached metadata.
+   *
+   * This is useful if, eg, you have recently added or destroyed Angular modules.
+   *
+   * @return static
+   */
+  public function clear() {
+    $this->cache->clear();
+    $this->modules = NULL;
+    $this->changeSets = NULL;
+    return $this;
+  }
+
   /**
    * Get a list of AngularJS modules which should be autoloaded.
    *

diff --git a/Civi/Core/Container.php b/Civi/Core/Container.php
@@ -56,7 +56,7 @@ public function loadContainer() {
     $cacheMode = defined('CIVICRM_CONTAINER_CACHE') ? CIVICRM_CONTAINER_CACHE : 'auto';
 
     // In pre-installation environments, don't bother with caching.
-    if (!defined('CIVICRM_DSN') || $cacheMode === 'never' || \CRM_Utils_System::isInUpgradeMode()) {
+    if (!defined('CIVICRM_DSN') || defined('CIVICRM_TEST') || CIVICRM_UF === 'UnitTests' || $cacheMode === 'never' || \CRM_Utils_System::isInUpgradeMode()) {
       $containerBuilder = $this->createContainer();
       $containerBuilder->compile();
       return $containerBuilder;

diff --git a/ext/afform/core/afform.php b/ext/afform/core/afform.php
@@ -514,10 +514,7 @@ function afform_civicrm_permission_check($permission, &$granted, $contactId) {
 function _afform_clear() {
   $container = \Civi::container();
   $container->get('afform_scanner')->clear();
-
-  // Civi\Angular\Manager doesn't currently have a way to clear its in-memory
-  // data, so we just reset the whole object.
-  $container->set('angular', NULL);
+  $container->get('angular')->clear();
 }
 
 /**