Redo commits on 2.next branch

This commit is contained in:
Joe 2017-05-12 02:02:36 -04:00
parent 68432f77de
commit 70ead28a1d
31 changed files with 72 additions and 51 deletions

View file

@ -153,7 +153,7 @@ class CakeEmailTest extends CakeTestCase {
parent::setUp();
$this->_configFileExists = true;
$emailConfig = new File(APP . 'Config' . DS . 'email.php');
$emailConfig = new File(CONFIG . 'email.php');
if (!$emailConfig->exists()) {
$this->_configFileExists = false;
$emailConfig->create();
@ -176,7 +176,7 @@ class CakeEmailTest extends CakeTestCase {
App::build();
if (!$this->_configFileExists) {
unlink(APP . 'Config' . DS . 'email.php');
unlink(CONFIG . 'email.php');
}
}