hotline #47505 test fix

library/Class/WebService/SIGB/CdScript.php

@@ -24,8 +24,7 @@ class Class_WebService_SIGB_CdScript {
   protected static $service;
 
   public static function getService($params){
-
-    if (!isset(static::$service)) {
+    if (!static::$service) {
       $instance = new static();
       $classname = get_called_class().'_Service';
       static::$service = $classname::getService($params['server_url'],
@@ -35,5 +34,9 @@ class Class_WebService_SIGB_CdScript {
     return static::$service;
   }
 
+
+  public static function resetService() {
+    static::$service = null;
+  }
 }
 ?>
\ No newline at end of file

tests/application/modules/opac/controllers/NoticeAjaxControllerCdScriptTest.php

@@ -27,6 +27,7 @@ abstract class NoticeAjaxControllerCdScriptRecordTestCase extends AbstractContro
   public function setUp() {
     parent::setUp();
 
+    ZendAfi_Auth::getInstance()->clearIdentity();
 
     $config = Class_Profil::getCurrentProfil()->getCfgNoticeAsArray();
     $config['exemplaires']['grouper'] = '1';
@@ -60,11 +61,34 @@ abstract class NoticeAjaxControllerCdScriptRecordTestCase extends AbstractContro
                                                 'remote_library_id' => 2])
       ->setTimeSource(new TimeSourceForTest('2015-10-28 09:00:00'));
   }
+
+
+  public function tearDown() {
+    Class_WebService_SIGB_CdScript::resetService();
+    parent::tearDown();
+  }
 }
 
 
 
 
+class NoticeAjaxControllerCdScriptRecordWithoutLoginTest extends NoticeAjaxControllerCdScriptRecordTestCase {
+  public function setUp() {
+    parent::setUp();
+    $this->dispatch('/opac/noticeajax/exemplaires/id_notice/2', true);
+  }
+
+
+  /** @test */
+  public function availabilityShouldContainsLinkToAjaxLogin() {
+    $this->assertXPathContentContains('//table//td/a[contains(@href, "auth/ajax-login")]',
+                                      'Description en ligne',
+                                      $this->_response->getBody());
+  }
+}
+
+
+
 class NoticeAjaxControllerCdScriptRecordAsPaulTest extends NoticeAjaxControllerCdScriptRecordTestCase {
   public function setUp() {
     parent::setUp();
@@ -106,23 +130,4 @@ class NoticeAjaxControllerCdScriptRecordAsPaulTest extends NoticeAjaxControllerC
     $this->assertXPathContentContains('//script', 'setupAnchorsTarget');
   }
 }
-
-
-
-
-class NoticeAjaxControllerCdScriptRecordWithoutLoginTest extends NoticeAjaxControllerCdScriptRecordTestCase {
-  public function setUp() {
-    parent::setUp();
-    ZendAfi_Auth::getInstance()->clearIdentity();
-
-    $this->dispatch('/opac/noticeajax/exemplaires/id_notice/2', true);
-  }
-
-
-  /** @test */
-  public function availabilityShouldContainsLinkToAjaxLogin() {
-    $this->assertXPathContentContains('//table//td/a[contains(@href, "auth/ajax-login")]',
-                                      'Description en ligne');
-  }
-}
 ?>
\ No newline at end of file