hotline #23465 add loader default to volatile

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

@@ -23,7 +23,7 @@ require_once 'AbstractControllerTestCase.php';
 abstract class ZoneControllerTestCase extends AbstractControllerTestCase {
 	public function setUp() {
 		parent::setUp();
-
+		Storm_Model_Loader::defaultToVolatile();
 		$this->zone_annecy = $this->fixture('Class_Zone',
 																				['id' => 2,
 																				 'libelle' => 'Annecy',
@@ -37,6 +37,12 @@ abstract class ZoneControllerTestCase extends AbstractControllerTestCase {
 																				 'couleur' => '#456',
 																				 'image' => 'pringy.jpg']);
 	}
+
+
+	public function tearDown() {
+		Storm_Model_Loader::defaultToDb();
+		parent::tearDown();
+	}
 }
 
 
@@ -64,13 +70,20 @@ class ZoneControllerIndexActionTest extends ZoneControllerTestCase {
 class ZoneControllerPlacerBibsActionTest extends ZoneControllerTestCase {
 	public function setUp() {
 		parent::setUp();
+
+		$this->fixture('Class_Bib',
+									 ['id' => 1,
+										'libelle' => 'Annecy',
+										'id_zone' => 2,
+										'visibilite' => 1]);
+
 		$this->dispatch('admin/zone/placerbibs/id_zone/2', true);
 	}
 
 
 	/** @test */
 	public function titreShouldBePlacementDesBibSurLaCarte() {
-		$this->assertXPathContentContains('//h1', 'Placement des bibliothèques sur la carte', $this->_response->getBody());
+		$this->assertXPathContentContains('//h1', 'Placement des bibliothèques sur la carte');
 	}
 }
 
@@ -103,18 +116,13 @@ class ZoneControllerPlacerBibsPostActionWithProfilTest extends ZoneControllerPla
 	public function setUp() {
 		parent::setUp();
 
-
-		$data = ['posX' => '25',
-						 'posY' => '65',
-						 'posPoint' => 'above',
-						 'profilID' => '1'];
-
-		$aff_zone = ZendAfi_Filters_Serialize::serialize($data);
+		$aff_zone = ZendAfi_Filters_Serialize::serialize(['posX' => '25',
+																											'posY' => '65',
+																											'posPoint' => 'above',
+																											'profilID' => '1']);
 
 		Class_Bib::find(1)->setAffZone($aff_zone)->save();
 
-
-
 		$this->postDispatch('admin/zone/placerbibs/id_zone/2', ['posX_1' => '50',
 																														'posY_1' => '150',
 																														'posPoint_1' => 'left',