Merge branch 'master' into PHRAS-2739-incorporate-subdefwebhook

tests/Alchemy/Tests/Phrasea/Command/Plugin/AddPluginTest.php

@@ -69,7 +69,7 @@ class AddPluginTest extends PluginCommandTestCase
         // the plugin is checked when updating config files
         self::$DI['cli']['plugins.plugins-validator']->expects($this->at(0))
             ->method('validatePlugin')
-            ->with('tempdir')
+            ->with('TestPlugin')
             ->will($this->returnValue($manifest));
 
         self::$DI['cli']['plugins.plugins-validator']->expects($this->at(1))

tests/Alchemy/Tests/Phrasea/Controller/Prod/ExportTest.php

@@ -169,7 +169,8 @@ class ExportTest extends \PhraseanetAuthenticatedWebTestCase
      */
     public function testExportMail()
     {
-        $this->mockNotificationDeliverer('Alchemy\Phrasea\Notification\Mail\MailRecordsExport');
+        //  deliver method removed in the listener
+//        $this->mockNotificationDeliverer('Alchemy\Phrasea\Notification\Mail\MailRecordsExport');
 
         $this->getClient()->request('POST', '/prod/export/mail/', [
             'lst'        => $this->getRecord1()->getId(),