rel #33149 : fix tests failures

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

@@ -22,12 +22,14 @@ require_once 'AbstractControllerTestCase.php';
 include_once('tests/fixtures/RessourcesNumeriquesFixtures.php');
 
 class ModulesControllerLoginRequiredTest extends AbstractControllerTestCase {
+  protected $_storm_default_to_volatile = true;
+
   public function datas() {
     return [
-            ['CVS', 'cvs', ''],
-            ['Vodeclic', 'vodeclic', ''],
-            ['ToutApprendre', 'toutapprendre', ''],
-            ['LeKiosk', 'lekiosk', ROOT_URL . BASE_URL . '/modules/lekiosk']
+            ['CVS', 'cvs'],
+            ['Vodeclic', 'vodeclic'],
+            ['ToutApprendre', 'toutapprendre'],
+            ['LeKiosk', 'lekiosk']
     ];
   }
 
@@ -36,18 +38,35 @@ class ModulesControllerLoginRequiredTest extends AbstractControllerTestCase {
    * @test
    * @dataProvider datas
    */
-  public function withoutLoginShouldRedirectToLogin($type, $action, $redirect) {
+  public function withoutLoginShouldRedirectToLogin($type, $action) {
     call_user_func(['RessourcesNumeriquesFixtures', 'activate' . $type]);
 
     $_SERVER['HTTP_REFERER'] = '/opac/cms/articleview/id/23';
-    if (!$redirect)
-      $redirect = $_SERVER['HTTP_REFERER'];
-
     ZendAfi_Auth::getInstance()->clearIdentity();
 
     $this->dispatch('/opac/modules/' . $action);
 
-    $this->assertContains('/auth/login?redirect='.urlencode($redirect),
+    $this->assertContains('/auth/login?redirect='.urlencode($_SERVER['HTTP_REFERER']),
+                          $this->_response->getBody());
+  }
+}
+
+
+
+class ModulesControllerLoginRequiredLeKioskCasTest extends AbstractControllerTestCase {
+  protected $_storm_default_to_volatile = true;
+
+  /** @test */
+  public function shouldRedirectToLogin() {
+    RessourcesNumeriquesFixtures::activateLeKiosk();
+
+    Class_AdminVar::set('LEKIOSK_SSO_MODE', 'CAS');
+    $_SERVER['HTTP_REFERER'] = '/opac/cms/articleview/id/23';
+    ZendAfi_Auth::getInstance()->clearIdentity();
+
+    $this->dispatch('/opac/modules/lekiosk');
+
+    $this->assertContains('/auth/login?redirect='.urlencode(ROOT_URL . BASE_URL . '/modules/lekiosk'),
                           $this->_response->getBody());
   }
 }

tests/library/Class/LeKioskLinkTest.php

@@ -81,9 +81,9 @@ class LeKioskLinkModeSSOTest extends LeKioskLinkModeLinkTestCase {
   /** @test */
   public function linkShouldBeCasUrlWithLeKioskId() {
     $url = 'https://pro.lekiosk.com/AutentificationCas.aspx?'
-      .'cas_fournisseur=' . urlencode('http://localhost' . BASE_URL . '/cas-server-v10')
+      .'cas_fournisseur=' . urlencode(ROOT_URL . BASE_URL . '/cas-server-v10')
       .'&id=29'
-      .'&ReturnUrl=' . urlencode('http://localhost/view/notice');
+      .'&ReturnUrl=';
 
     $this->assertEquals($url,
                         Class_LeKiosk_Link::newFor('')->url());