Merge branch '2016.11' into 2016.11-develop
authorPhilipp Schüle <p.schuele@metaways.de>
Tue, 27 Jun 2017 11:51:08 +0000 (13:51 +0200)
committerPhilipp Schüle <p.schuele@metaways.de>
Tue, 27 Jun 2017 11:51:08 +0000 (13:51 +0200)
Change-Id: I641c621404103b29fa939ab69eaa181b9254cc20

1  2 
tests/tine20/Felamimail/Frontend/JsonTest.php
tine20/Felamimail/Controller/Message/Send.php
tine20/Felamimail/js/MessageEditDialog.js

@@@ -1828,25 -1679,7 +1843,25 @@@ IbVx8ZTO7dJRKrg72aFmWTf0uNla7vicAhpiLWo
          // compare sieve scripts
          $this->assertContains($sieveScriptRules, $sieveScriptVacation, 'rule order changed');
      }
 -    
 +
 +    public function testSieveEmailNotification()
 +    {
 +        $this->_setTestScriptname();
 +
 +        $this->_account->sieve_notification_email = 'test@test.de';
 +        Felamimail_Controller_Account::getInstance()->update($this->_account);
 +
 +        $script = new Felamimail_Sieve_Backend_Sql($this->_account->getId());
 +        $scriptParts = $script->getScriptParts();
 +        static::assertEquals(1, $scriptParts->count());
 +        /** @var Felamimail_Model_Sieve_ScriptPart $scriptPart */
 +        $scriptPart = $scriptParts->getFirstRecord();
 +        static::assertTrue(count(array_intersect(array('"enotify"', '"variables"', '"copy"', '"body"'),
 +            $scriptPart->xprops(Felamimail_Model_Sieve_ScriptPart::XPROPS_REQUIRES))) === 4,
 +            print_r($scriptPart->xprops(Felamimail_Model_Sieve_ScriptPart::XPROPS_REQUIRES), true));
 +        static::assertContains('test@test.de', $script->getSieve());
 +    }
-     
++
      /**
       * use another name for test sieve script
       */