Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Forwardport] Allow usage of config-global.php when running Integration Tests #18201

Merged
merged 5 commits into from
Oct 3, 2018
Merged

[Forwardport] Allow usage of config-global.php when running Integration Tests #18201

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
0d0b5c0
Add copying of config-global.php
jissereitsma Jun 23, 2018
81076e1
Update Application.php
jissereitsma Jun 28, 2018
421ba0b
Update Application.php
jissereitsma Jun 28, 2018
c0cb405
Update Application.php
jissereitsma Jun 29, 2018
99b1ca7
Update Application.php
jissereitsma Jun 29, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions dev/tests/integration/framework/Magento/TestFramework/Application.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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();

Expand Down Expand Up @@ -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.local.php';
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think config.local.php is the correct file.

#27864

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

image
As far as I understand, it's no longer supported since 2.2

copy($this->globalConfigFile, $targetFile);
}

/**
* Gets a list of CLI params for installation
Expand Down