From 1655c7138708fa20afa0e11cbc19319a3e364971 Mon Sep 17 00:00:00 2001
From: Ghislain Loas <ghislo@sandbox.pergame.net>
Date: Thu, 28 Aug 2014 16:14:23 +0200
Subject: [PATCH] dev #15525 upgrade test to fix failure
---
.../Class/NewsletterSubscriptionTest.php | 31 ++++++++++---------
1 file changed, 17 insertions(+), 14 deletions(-)
diff --git a/tests/library/Class/NewsletterSubscriptionTest.php b/tests/library/Class/NewsletterSubscriptionTest.php
index 5f7a4cc9c2e..b0cbd240169 100644
--- a/tests/library/Class/NewsletterSubscriptionTest.php
+++ b/tests/library/Class/NewsletterSubscriptionTest.php
@@ -16,7 +16,7 @@
*
* You should have received a copy of the GNU AFFERO GENERAL PUBLIC LICENSE
* along with AFI-OPAC 2.0; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
*/
require_once 'Class/Newsletter.php';
require_once 'Class/NewsletterSubscription.php';
@@ -214,7 +214,7 @@ class UserWithOneSubscriptionTest extends Storm_Test_ModelTestCase {
->whenCalled('save')->answers(true)
->whenCalled('delete')->answers(true);
-
+
Storm_Test_ObjectWrapper::onLoaderOfModel('Class_Users')
->whenCalled('delete')
->answers(true)
@@ -313,17 +313,20 @@ class UserWithOneSubscriptionTest extends Storm_Test_ModelTestCase {
/** @test **/
public function createUserMarcusWithAutoSubscribeCheckedOnConcertShouldAddMarcusToSubscriber() {
- $this->concerts->setAutoSubscribe(true);
+ Class_NewsletterSubscription::beVolatile();
- Storm_Test_ObjectWrapper::onLoaderOfModel('Class_Newsletter');
- Class_Newsletter::whenCalled('findAllBy')
- ->with(['auto_subscribe'=>true])
- ->answers([$this->concerts]);
-
- $marcus = Class_Users::newInstance(['login'=>'Marcus',
- 'password'=>'vue']);
- $marcus->save();
- $this->assertContains($this->concerts, $marcus->getNewsletters());
+ $news = $this->fixture('Class_Newsletter',
+ ['id' => 1,
+ 'titre' => 'News']);
+ $news->setAutoSubscribe(true)->save();
+
+ $marcus = $this->fixture('Class_Users',
+ ['id' => null,
+ 'login' => 'Marcus',
+ 'password' => 'pwd',
+ 'role_level' => ZendAfi_Acl_AdminControllerRoles::ADMIN_PORTAIL]);
+
+ $this->assertContains($news, $marcus->getNewsletters());
}
@@ -337,7 +340,7 @@ class UserWithOneSubscriptionTest extends Storm_Test_ModelTestCase {
Class_Newsletter::whenCalled('findAllBy')
->with(['auto_subscribe'=>true])
->answers([]);
-
+
$marcus = Class_Users::newInstance(['login'=>'Marcus',
'password'=>'vue']);
$marcus->save();
@@ -355,7 +358,7 @@ class UserWithOneSubscriptionTest extends Storm_Test_ModelTestCase {
Class_Newsletter::whenCalled('findAllBy')
->with(['auto_subscribe'=>true])
->never();
-
+
$marcus = Class_Users::newInstanceWithId(2,['login'=>'Marcus',
'password'=>'vue']);
$marcus->save();
--
GitLab