From 73d6987c5ac3f18a6e00f63f4388cb280b73a170 Mon Sep 17 00:00:00 2001
From: adiouf <adiouf@afi-sa.fr>
Date: Wed, 3 May 2017 16:40:05 +0200
Subject: [PATCH] =?UTF-8?q?dev=20#59639=20Multimedia=5Fsupprimer=5Fbesoin?=
=?UTF-8?q?=5Fauth:=20Correction=20tests=20mofication=20des=20utilisateurs?=
=?UTF-8?q?=20afim=20pushe=20dans=20bokeh=20et=20rendre=20optionnel=20le?=
=?UTF-8?q?=20site=20dans=20le=20webservice=20de=20recup=C3=A9ration=20des?=
=?UTF-8?q?=20r=C3=A9sercations=20de=20postes=20sur=20un=20intervalle=20de?=
=?UTF-8?q?=20temps?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
library/Class/Multimedia/HoldRequest.php | 3 +--
library/Class/Multimedia/Users.php | 2 +-
.../modules/opac/controllers/MultimediaControllerTest.php | 2 +-
.../modules/push/controllers/MultimediaControllerTest.php | 6 ++++--
4 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/library/Class/Multimedia/HoldRequest.php b/library/Class/Multimedia/HoldRequest.php
index 6c8570b1203..dcb8fa89e53 100644
--- a/library/Class/Multimedia/HoldRequest.php
+++ b/library/Class/Multimedia/HoldRequest.php
@@ -144,8 +144,7 @@ class Class_Multimedia_HoldRequest extends Class_Multimedia_AbstractRequest{
|| !($to = $request->getParam('to')))
return $this->_error('MissingParameter');
- if($this->_controleLocationRequest($request))
- return $this;
+ $this->_controleLocationRequest($request);
$condition_location = '';
if($this->_location){
diff --git a/library/Class/Multimedia/Users.php b/library/Class/Multimedia/Users.php
index 38f6db3e9d4..6caac6da0f8 100644
--- a/library/Class/Multimedia/Users.php
+++ b/library/Class/Multimedia/Users.php
@@ -77,7 +77,7 @@ class Class_Multimedia_Users {
$user = Class_Users::findFirstBy(['login'=>$infoUser->login]);
if(!isset($user))
- return 'USER_NOT_FOUND'; //$this->createUser(array($infoUser));
+ return 'USER_NOT_FOUND';
if($user->isAbonneInviteInGroupMultimedia()){
$user->setNom($infoUser->nom)
diff --git a/tests/application/modules/opac/controllers/MultimediaControllerTest.php b/tests/application/modules/opac/controllers/MultimediaControllerTest.php
index a35acd19db7..72e44dd543e 100644
--- a/tests/application/modules/opac/controllers/MultimediaControllerTest.php
+++ b/tests/application/modules/opac/controllers/MultimediaControllerTest.php
@@ -424,7 +424,7 @@ class MultimediaControllerGetAllHoldForNoDefiniedLocation extends MultimediaCont
/** @test */
public function shouldHaveErrorMissingParameter() {
- $this->assertEquals('MissingParameter', $this->_json->error);
+ $this->assertEquals('NotHaveHoldForTime', $this->_json->error);
}
}
diff --git a/tests/application/modules/push/controllers/MultimediaControllerTest.php b/tests/application/modules/push/controllers/MultimediaControllerTest.php
index 803c321ffd4..a58a32d8b51 100644
--- a/tests/application/modules/push/controllers/MultimediaControllerTest.php
+++ b/tests/application/modules/push/controllers/MultimediaControllerTest.php
@@ -654,7 +654,9 @@ class ModifyBorrowerMultimediaNoPresentControllerReturnedMessageTest extends Bor
public function setUp() {
parent::setUp();
-
+ $multimedia = Class_Multimedia::getInstance();
+ $multimedia->setLog(new Zend_Log(new Zend_Log_Writer_Mock()));
+// Class_Multimedia::setInstance($multimedia);
Storm_Test_ObjectWrapper::onLoaderOfModel('Class_Users')
->whenCalled('findFirstBy')
->with(['login'=> 'invite'])
@@ -689,7 +691,7 @@ class ModifyBorrowerMultimediaNoPresentControllerReturnedMessageTest extends Bor
/** @test */
public function shouldReturnedMessageIsAddNewUserOk() {
- $this->assertEquals('ADD_NEW_USER_OK', $this->_resp);
+ $this->assertEquals('USER_NOT_FOUND', $this->_resp);
}
}
--
GitLab