From c8a2ca87ba1d1490d33839dcac8e2e4b7aa47b8d Mon Sep 17 00:00:00 2001
From: Taras Machyshyn <taras@espocrm.com>
Date: Wed, 2 Sep 2020 13:26:13 +0300
Subject: [PATCH] Fixed Integration tests

---
 tests/integration/Core/Tester.php | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/tests/integration/Core/Tester.php b/tests/integration/Core/Tester.php
index 3465ff2ddf..6ef41e7802 100644
--- a/tests/integration/Core/Tester.php
+++ b/tests/integration/Core/Tester.php
@@ -229,16 +229,22 @@ class Tester
 
     protected function install()
     {
-        $mainApplication = new \Espo\Core\Application();
-        $fileManager = $mainApplication->getContainer()->get('fileManager');
+        $fileManager = new \Espo\Core\Utils\File\Manager();
 
         $latestEspoDir = Utils::getLatestBuildedPath($this->buildedPath);
-
         $configData = $this->getTestConfigData();
 
+        if (!isset($configData['siteUrl'])) {
+            $mainConfigData = include('data/config.php');
 
-        $configData['siteUrl'] = $mainApplication->getContainer()->get('config')->get('siteUrl') . '/' . $this->installPath;
-        $this->params['siteUrl'] = $configData['siteUrl'];
+            if (isset($mainConfigData['siteUrl'])) {
+                $configData['siteUrl'] = $mainConfigData['siteUrl'] . '/' . $this->installPath;
+            }
+        }
+
+        if (isset($configData['siteUrl'])) {
+            $this->params['siteUrl'] = $configData['siteUrl'];
+        }
 
         if (!file_exists($this->installPath)) {
             $fileManager->mkdir($this->installPath);