Skip to content
Extraits de code Groupes Projets
Valider 9d8ada8e rédigé par diosmosis's avatar diosmosis
Parcourir les fichiers

Set TestingEnvironment Mail::send() hook in Fixture.php.

parent dfd35739
Aucune branche associée trouvée
Aucune étiquette associée trouvée
Aucune requête de fusion associée trouvée
...@@ -178,6 +178,7 @@ class Fixture extends PHPUnit_Framework_Assert ...@@ -178,6 +178,7 @@ class Fixture extends PHPUnit_Framework_Assert
$this->getTestEnvironment()->save(); $this->getTestEnvironment()->save();
$this->getTestEnvironment()->executeSetupTestEnvHook(); $this->getTestEnvironment()->executeSetupTestEnvHook();
Piwik_TestingEnvironment::addSendMailHook();
if ($this->overwriteExisting if ($this->overwriteExisting
|| !$this->isFixtureSetUp() || !$this->isFixtureSetUp()
......
...@@ -158,8 +158,29 @@ class Piwik_TestingEnvironment ...@@ -158,8 +158,29 @@ class Piwik_TestingEnvironment
Piwik::addAction('AssetManager.getJavaScriptFiles', function(&$jsFiles) { Piwik::addAction('AssetManager.getJavaScriptFiles', function(&$jsFiles) {
$jsFiles[] = 'tests/resources/screenshot-override/override.js'; $jsFiles[] = 'tests/resources/screenshot-override/override.js';
}); });
self::addSendMailHook();
Piwik::addAction('Updater.checkForUpdates', function () {
try {
@\Piwik\Filesystem::deleteAllCacheOnUpdate();
} catch (Exception $ex) {
// pass
}
});
$testingEnvironment->logVariables();
$testingEnvironment->executeSetupTestEnvHook();
}
public static function addSendMailHook()
{
static $added = false;
if ($added) {
return;
}
$added = true;
Piwik::addAction('Test.Mail.send', function($mail) { Piwik::addAction('Test.Mail.send', function($mail) {
$outputFile = PIWIK_INCLUDE_PATH . 'tmp/' . Common::getRequestVar('module') . '.' . Common::getRequestVar('action') . '.mail.json'; $outputFile = PIWIK_INCLUDE_PATH . '/tmp/' . Common::getRequestVar('module', '') . '.' . Common::getRequestVar('action', '') . '.mail.json';
$outputContent = str_replace("=\n", "", $mail->getBodyText($textOnly = true)); $outputContent = str_replace("=\n", "", $mail->getBodyText($textOnly = true));
$outputContent = str_replace("=0A", "\n", $outputContent); $outputContent = str_replace("=0A", "\n", $outputContent);
...@@ -174,16 +195,6 @@ class Piwik_TestingEnvironment ...@@ -174,16 +195,6 @@ class Piwik_TestingEnvironment
file_put_contents($outputFile, Common::json_encode($outputContents)); file_put_contents($outputFile, Common::json_encode($outputContents));
}); });
Piwik::addAction('Updater.checkForUpdates', function () {
try {
@\Piwik\Filesystem::deleteAllCacheOnUpdate();
} catch (Exception $ex) {
// pass
}
});
$testingEnvironment->logVariables();
$testingEnvironment->executeSetupTestEnvHook();
} }
public function arrayMergeRecursiveDistinct(array $array1, array $array2) public function arrayMergeRecursiveDistinct(array $array1, array $array2)
......
0% Chargement en cours ou .
You are about to add 0 people to the discussion. Proceed with caution.
Terminez d'abord l'édition de ce message.
Veuillez vous inscrire ou vous pour commenter