From 0d0b5c0c4193d06879a6b49d75b9e8d87f56731b 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 4fec36633c9b6..d7654a4642066 100644 --- a/dev/tests/integration/framework/Magento/TestFramework/Application.php +++ b/dev/tests/integration/framework/Magento/TestFramework/Application.php @@ -498,6 +498,7 @@ public function install($cleanup) $this->_ensureDirExists($this->_initParams[$dirs][DirectoryList::VAR_DIR][DirectoryList::PATH]); $this->copyAppConfigFiles(); + $this->copyGlobalConfigFile(); $installParams = $this->getInstallCliParams(); @@ -557,6 +558,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 81076e1de7b28ca888b32121d3586fad5ec8f38c 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 d7654a4642066..bd73689453a9b 100644 --- a/dev/tests/integration/framework/Magento/TestFramework/Application.php +++ b/dev/tests/integration/framework/Magento/TestFramework/Application.php @@ -498,7 +498,7 @@ public function install($cleanup) $this->_ensureDirExists($this->_initParams[$dirs][DirectoryList::VAR_DIR][DirectoryList::PATH]); $this->copyAppConfigFiles(); - $this->copyGlobalConfigFile(); + //$this->copyGlobalConfigFile(); $installParams = $this->getInstallCliParams(); From 421ba0b59b1eb424fbd4b2fd5ddca35ba5e6a525 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 bd73689453a9b..52fc0144dcacd 100644 --- a/dev/tests/integration/framework/Magento/TestFramework/Application.php +++ b/dev/tests/integration/framework/Magento/TestFramework/Application.php @@ -564,11 +564,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 c0cb405be141de7fb462e1dcaf9ae4ff90239153 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 52fc0144dcacd..d7654a4642066 100644 --- a/dev/tests/integration/framework/Magento/TestFramework/Application.php +++ b/dev/tests/integration/framework/Magento/TestFramework/Application.php @@ -498,7 +498,7 @@ public function install($cleanup) $this->_ensureDirExists($this->_initParams[$dirs][DirectoryList::VAR_DIR][DirectoryList::PATH]); $this->copyAppConfigFiles(); - //$this->copyGlobalConfigFile(); + $this->copyGlobalConfigFile(); $installParams = $this->getInstallCliParams(); @@ -564,11 +564,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 99b1ca79f01ff854f3afadfd2fa066c9ae41ec5a 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 d7654a4642066..1bfc928f2916a 100644 --- a/dev/tests/integration/framework/Magento/TestFramework/Application.php +++ b/dev/tests/integration/framework/Magento/TestFramework/Application.php @@ -566,7 +566,7 @@ private function copyAppConfigFiles() */ private function copyGlobalConfigFile() { - $targetFile = $this->_configDir . '/config.php'; + $targetFile = $this->_configDir . '/config.local.php'; copy($this->globalConfigFile, $targetFile); }