explo new storm with more volatile

tests/library/Class/NewsletterMailingTest.php

@@ -286,30 +286,24 @@ class NewsletterMailingAnimationsSendMailTest extends NewsletterMailingTestCase
 
 
 
-class NewsletterMailingAnimationsSendWithProfilMailTest extends NewsletterMailingTestCase {
+
+class NewsletterMailingWithProfilUnsubscribeLinkTest extends NewsletterMailingTestCase {
   protected function _prepareFixtures() {
-    $this->fixture('Class_AdminVar',
-                   ['id' => 'NEWSLETTER_ID_PROFIL',
-                    'valeur' => '45']);
+    Class_AdminVar::set('NEWSLETTER_ID_PROFIL', '45');
   }
 
 
   /** @test */
   public function bodyTextShouldContainsUnsubscribeLinks() {
-    $this->assertContains('/newsletter/unsubscribe/newsletter/1/id_profil/45/user/2/hash/'
-                          . Class_Newsletter_Template::hashForUser(1,Class_Users::find(2)->getMail()),
+    $this->assertContains('/newsletter/unsubscribe/newsletter/1/id_profil/45/user/2',
                           quoted_printable_decode($this->mails[0]->getBodyText(true)));
-
   }
 
 
   /** @test */
   public function bodyHTMLShouldContainsUnsubscribeLinks() {
-    $this->assertContains(Class_Url::absolute('/newsletter/unsubscribe/newsletter/1/id_profil/45/user/2/hash/'
-                          . Class_Newsletter_Template::hashForUser(1,
-                                                                   Class_Users::find(2)->getMail())),
+    $this->assertContains('/newsletter/unsubscribe/newsletter/1/id_profil/45/user/2',
                           quoted_printable_decode($this->mails[0]->getBodyHTML(true)));
-
   }
 }
 
@@ -437,13 +431,18 @@ class NewsletterMailingConcertsPanierHtmlTest extends NewsletterMailingTestCase
 /** @see http://forge.afi-sa.fr/issues/18661 */
 class NewsletterMailingDedupTest extends ModelTestCase {
   protected
-    $_storm_default_to_volatile = true,
     $_fetch_users_calls = 0,
     $_letter;
 
   public function setUp() {
     parent::setUp();
 
+    Zend_Registry::set('sql',
+                       $this->mock()
+                       ->whenCalled('fetchAllByColumn')
+                       ->with('select distinct(bib_admin_users.mail) from bib_admin_users where disable_newsletter=1 and mail<>"" and mail is not null')
+                       ->answers([]));
+
     $this->mock_transport = new MockMailTransport();
     Zend_Mail::setDefaultTransport($this->mock_transport);
 
@@ -456,19 +455,19 @@ class NewsletterMailingDedupTest extends ModelTestCase {
                                          ->beStrict());
     Class_UserGroup::setMemoryCleaner(function() {});
 
-    $this->alcor = $this->fixture('Class_Users',
+    $this->alcor = $this->fixture(Class_Users::class,
                                   ['id' => 120,
                                    'login' => 'alc',
                                    'password' => 'or',
                                    'mail' => 'procyon@centre-de-recherche.fr']);
 
-    $this->actarus = $this->fixture('Class_Users',
+    $this->actarus = $this->fixture(Class_Users::class,
                                     ['id' => 121,
                                      'login' => 'acta',
                                      'password' => 'rus',
                                      'mail' => 'procyon@centre-de-recherche.fr']);
 
-    $this->_letter = $this->fixture('Class_Newsletter',
+    $this->_letter = $this->fixture(Class_Newsletter::class,
                                     ['id' => 23,
                                      'titre' => 'Alerte vega',
                                      'mail_subject' => 'Attention',
@@ -552,6 +551,12 @@ class NewsletterMailingRecordAbsoluteUrlTest extends ModelTestCase {
   public function setUp() {
     parent::setUp();
 
+    Zend_Registry::set('sql',
+                       $this->mock()
+                       ->whenCalled('fetchAllByColumn')
+                       ->with('select distinct(bib_admin_users.mail) from bib_admin_users where disable_newsletter=1 and mail<>"" and mail is not null')
+                       ->answers([]));
+
     $this->_xpath = new Storm_Test_XPath();
 
     $time_source = new TimeSourceForTest('2014-05-23 14:30:00');