From 0f7b5ea1f44ed0d17a489b126f8860331a48ce51 Mon Sep 17 00:00:00 2001
From: Taras Machyshyn <taras@espocrm.com>
Date: Fri, 16 Nov 2018 11:14:38 +0200
Subject: [PATCH] Tests: bug fixes

---
 tests/integration/Core/Tester.php | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/tests/integration/Core/Tester.php b/tests/integration/Core/Tester.php
index c5bdf3b72a..255357849e 100644
--- a/tests/integration/Core/Tester.php
+++ b/tests/integration/Core/Tester.php
@@ -218,7 +218,7 @@ class Tester
 
         if (!empty($this->params['pathToFiles'])) {
             $this->getDataLoader()->loadFiles($this->params['pathToFiles']);
-            $applyChanges = true;
+            $this->getApplication(true, true)->runRebuild();
         }
 
         if (!empty($this->params['dataFile'])) {
@@ -232,17 +232,14 @@ class Tester
         }
 
         if ($applyChanges) {
-            $this->clearVars();
-            $this->getApplication()->runRebuild();
+            $this->getApplication(true, true)->runRebuild();
         }
     }
 
     public function setData(array $data)
     {
         $this->getDataLoader()->setData($data);
-
-        $this->clearVars();
-        $this->getApplication()->runRebuild();
+        $this->getApplication(true, true)->runRebuild();
     }
 
     public function clearCache()