Fixed issue #16714: Clear process after test script is failing (#1614)

Clear cache after test ends and also after a survye is deleted
LimeSurvey · Oct 12, 2020 · 3f9b19f · 3f9b19f
1 parent ee7a208
commit 3f9b19f
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 0 deletions.
diff --git a/application/models/Survey.php b/application/models/Survey.php
@@ -335,6 +335,12 @@ public function delete($recursive=true)
             // Delete all uploaded files.
             rmdirr(Yii::app()->getConfig('uploaddir').'/surveys/'.$this->sid);
         }
+
+        // Remove from cache
+        if (array_key_exists($this->sid, $this->findByPkCache)) {
+            unset ($this->findByPkCache[$this->sid]);
+        }
+
         return true;
     }
 

diff --git a/tests/TestBaseClass.php b/tests/TestBaseClass.php
@@ -80,6 +80,7 @@ protected static function importSurvey($fileName)
             null
         );
         if ($result) {
+            \Survey::model()->resetCache(); // Reset the cache so findByPk doesn't return a previously cached survey
             self::$testSurvey = \Survey::model()->findByPk($result['newsid']);
             self::$surveyId = $result['newsid'];
         } else {