mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-01 20:30:39 +02:00
Code Issues Releases Wiki Activity

Test environment consistency fixes

Browse Source 
git-clean in E107Base now runs first in _beforeSuite() so that tainted
files are not uploaded in Acceptance tests

E107Base::revokeLocalE107Config() now checks for file existence before
unlinking. XXX: Could remove this method if cleanVCS() proves reliable

Acceptance won't try to write an e107_config.php because the tests
themselves populate the configuration file
This commit is contained in:
Deltik
2018-02-20 14:36:24 -06:00
parent 5ce007e07b
commit 63386970d6
2 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tests/_support/Helper/Acceptance.php
View File

@@ -7,4 +7,10 @@ namespace Helper;
class Acceptance extends E107Base class Acceptance extends E107Base
{ {
protected $deployer_components = ['db', 'fs']; protected $deployer_components = ['db', 'fs'];
protected function writeLocalE107Config()
{
// Noop
// Acceptance tests will install the app themselves
}
} }

3
tests/_support/Helper/E107Base.php
View File

@@ -11,8 +11,8 @@ abstract class E107Base extends Base
public function _beforeSuite($settings = array()) public function _beforeSuite($settings = array())
{ {
parent::_beforeSuite($settings);
$this->cleanVCS(); $this->cleanVCS();
parent::_beforeSuite($settings);
$this->writeLocalE107Config(); $this->writeLocalE107Config();
} }
@@ -45,6 +45,7 @@ abstract class E107Base extends Base
protected function revokeLocalE107Config() protected function revokeLocalE107Config()
{ {
if (file_exists(self::APP_PATH_E107_CONFIG))
unlink(self::APP_PATH_E107_CONFIG); unlink(self::APP_PATH_E107_CONFIG);
} }