Merge branch 'hotline#139037_gestion_des_cookies' into 'hotline'

hotline #139037 : allow reading everywhere userfiles/js/tarteaucitron-config.js

See merge request !4199

VERSIONS_HOTLINE/139037

+ - ticket #139037 : Gestion des cookies : prendre en compte la personnalisation de tarteaucitron-config.js en mode déconnecté
\ No newline at end of file

library/Class/Cookies/TarteAuCitron.php

@@ -32,6 +32,7 @@ class Class_Cookies_TarteAuCitron extends Class_Cookies_Base {
     $customize_js_url = Class_Url::absolute("/public/tarteaucitron-config.js");
     $bokeh_js_url = Class_Url::absolute("/public/tarteaucitron-bokeh.js");
 
+    Class_FileManager::beOpenBar();
     if ($file = Class_FileManager::file(USERFILES.'/js/tarteaucitron-config.js'))
       $customize_js_url = $file->getUrl();
 

tests/application/modules/admin/controllers/IndexControllerTest.php

@@ -92,11 +92,14 @@ class Admin_IndexControllerCookiesTest extends Admin_IndexControllerTestCase {
 
   /** @test */
   public function tarteAuCitronCustomJsShouldBeCallToUserfilesIfExists() {
-    $disk = $this->mock()
-                 ->whenCalled('fileAt')
-                 ->with('userfiles/js/tarteaucitron-config.js')
-                 ->answers($this->mock()->whenCalled('getUrl')->answers('/userfiles/js/tarteaucitron-config.js'));
-    Class_FileManager::setFileSystem($disk);
+    ZendAfi_Auth::getInstance()->clearIdentity();
+    $this->file_system = $this->mock()
+                              ->whenCalled('fileAt')
+                              ->with('userfiles/js/tarteaucitron-config.js')
+                              ->answers((new Class_FileManager)->setPath('/userfiles/js/tarteaucitron-config.js'))
+                              ->beStrict();
+
+    Class_FileManager::setFileSystem($this->file_system);
 
     $this->dispatch('/admin/index/index', true);
     $this->assertXPath('//script[contains(@src,"/public/tarteaucitron/tarteaucitron.js")]');