From 23f1c0a4e1615c8f1d57376044646bfb6761cdf2 Mon Sep 17 00:00:00 2001 From: Jisse Reitsma Date: Sat, 23 Jun 2018 19:49:50 +0200 Subject: [PATCH 1/5] Add copying of config-global.php --- .../framework/Magento/TestFramework/Application.php | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/dev/tests/integration/framework/Magento/TestFramework/Application.php b/dev/tests/integration/framework/Magento/TestFramework/Application.php index 2f4395b161a69..a17026c500dfb 100644 --- a/dev/tests/integration/framework/Magento/TestFramework/Application.php +++ b/dev/tests/integration/framework/Magento/TestFramework/Application.php @@ -449,6 +449,7 @@ public function install() $this->_ensureDirExists($this->_initParams[$dirs][DirectoryList::VAR_DIR][DirectoryList::PATH]); $this->copyAppConfigFiles(); + $this->copyGlobalConfigFile(); $installParams = $this->getInstallCliParams(); @@ -507,6 +508,17 @@ private function copyAppConfigFiles() } } } + + /** + * Copies global configuration file from the tests folder (see TESTS_GLOBAL_CONFIG_FILE) + * + * @return void + */ + private function copyGlobalConfigFile() + { + $targetFile = $this->_configDir . '/config.php'; + copy($this->globalConfigFile, $targetFile); + } /** * Gets a list of CLI params for installation From 43df1045e13d96b2957c9974e8bb2d643a2e4963 Mon Sep 17 00:00:00 2001 From: Jisse Reitsma Date: Thu, 28 Jun 2018 20:30:24 +0200 Subject: [PATCH 2/5] Update Application.php --- .../integration/framework/Magento/TestFramework/Application.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev/tests/integration/framework/Magento/TestFramework/Application.php b/dev/tests/integration/framework/Magento/TestFramework/Application.php index a17026c500dfb..817040a146f13 100644 --- a/dev/tests/integration/framework/Magento/TestFramework/Application.php +++ b/dev/tests/integration/framework/Magento/TestFramework/Application.php @@ -449,7 +449,7 @@ public function install() $this->_ensureDirExists($this->_initParams[$dirs][DirectoryList::VAR_DIR][DirectoryList::PATH]); $this->copyAppConfigFiles(); - $this->copyGlobalConfigFile(); + //$this->copyGlobalConfigFile(); $installParams = $this->getInstallCliParams(); From 244d480cb875a9e45f9fef0965d164b5c3c02e6a Mon Sep 17 00:00:00 2001 From: Jisse Reitsma Date: Thu, 28 Jun 2018 21:34:27 +0200 Subject: [PATCH 3/5] Update Application.php --- .../framework/Magento/TestFramework/Application.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dev/tests/integration/framework/Magento/TestFramework/Application.php b/dev/tests/integration/framework/Magento/TestFramework/Application.php index 817040a146f13..4beda37b19070 100644 --- a/dev/tests/integration/framework/Magento/TestFramework/Application.php +++ b/dev/tests/integration/framework/Magento/TestFramework/Application.php @@ -514,11 +514,11 @@ private function copyAppConfigFiles() * * @return void */ - private function copyGlobalConfigFile() + /*private function copyGlobalConfigFile() { $targetFile = $this->_configDir . '/config.php'; copy($this->globalConfigFile, $targetFile); - } + }*/ /** * Gets a list of CLI params for installation From bb5b50e37e5be4677da4c092dfcb966e111eb8c9 Mon Sep 17 00:00:00 2001 From: Jisse Reitsma Date: Fri, 29 Jun 2018 12:19:25 +0200 Subject: [PATCH 4/5] Update Application.php --- .../framework/Magento/TestFramework/Application.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dev/tests/integration/framework/Magento/TestFramework/Application.php b/dev/tests/integration/framework/Magento/TestFramework/Application.php index 4beda37b19070..a17026c500dfb 100644 --- a/dev/tests/integration/framework/Magento/TestFramework/Application.php +++ b/dev/tests/integration/framework/Magento/TestFramework/Application.php @@ -449,7 +449,7 @@ public function install() $this->_ensureDirExists($this->_initParams[$dirs][DirectoryList::VAR_DIR][DirectoryList::PATH]); $this->copyAppConfigFiles(); - //$this->copyGlobalConfigFile(); + $this->copyGlobalConfigFile(); $installParams = $this->getInstallCliParams(); @@ -514,11 +514,11 @@ private function copyAppConfigFiles() * * @return void */ - /*private function copyGlobalConfigFile() + private function copyGlobalConfigFile() { $targetFile = $this->_configDir . '/config.php'; copy($this->globalConfigFile, $targetFile); - }*/ + } /** * Gets a list of CLI params for installation From a77bdfc7e165ecdeda9d6cf8999d2f717fdd1cb2 Mon Sep 17 00:00:00 2001 From: Jisse Reitsma Date: Fri, 29 Jun 2018 16:25:27 +0200 Subject: [PATCH 5/5] Update Application.php --- .../integration/framework/Magento/TestFramework/Application.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev/tests/integration/framework/Magento/TestFramework/Application.php b/dev/tests/integration/framework/Magento/TestFramework/Application.php index a17026c500dfb..28dd8b33e9739 100644 --- a/dev/tests/integration/framework/Magento/TestFramework/Application.php +++ b/dev/tests/integration/framework/Magento/TestFramework/Application.php @@ -516,7 +516,7 @@ private function copyAppConfigFiles() */ private function copyGlobalConfigFile() { - $targetFile = $this->_configDir . '/config.php'; + $targetFile = $this->_configDir . '/config.local.php'; copy($this->globalConfigFile, $targetFile); }