Fixed issue #16692: Clear process after test script is failing

Cache was not properly cleared in between tests neither after survey deletion
LimeSurvey · Oct 1, 2020 · d99f229 · d99f229
1 parent 6c4108e
commit d99f229
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
@@ -297,6 +297,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
@@ -78,6 +78,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 {