Correction selection catalogue dans les newsletters

library/Class/Catalogue.php

@@ -705,8 +705,10 @@ class Class_Catalogue extends Storm_Model_Abstract {
 	// liste des catalogues pour une combo
 	//-------------------------------------------------------------------------------
 	static function getCataloguesForCombo()	{
+		if (!$catalogues = Class_Catalogue::findTopCatalogues())
+			return [];
+
 		$liste = [''];
-		$catalogues = Class_Catalogue::findTopCatalogues();
 		foreach($catalogues as $catalogue) {
 			self::addCataloguePathAndChildrenTo($catalogue, $liste);
 		}

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

@@ -140,13 +140,9 @@ class Admin_NewsletterControllerAddActionTest extends Admin_NewsletterController
 	public function setUp() {
 		parent::setUp();
 
-		$this->mock_sql = $this->getSqlMock();
-		$this->mock_sql
-			->expects($this->any())
-			->method('fetchAll')
-			->with("select * from catalogue order by libelle")
-			->will($this->returnValue(false));
-
+		Storm_Test_ObjectWrapper::onLoaderOfModel('Class_Catalogue')
+			->whenCalled('findTopCatalogues')
+			->answers([]);
 
 		$this->dispatch('/admin/newsletter/add');		
 	}
@@ -154,7 +150,7 @@ class Admin_NewsletterControllerAddActionTest extends Admin_NewsletterController
 
 	/** @test */
 	function catalogueComboShouldBeEmpty() {
-		$this->assertNotXPath("//select[@id='id_catalogue']/option");
+		$this->assertNotXPath("//select[@id='id_catalogue']/option", $this->_response->getBody());
 	}
 
 	public function testAddActionFound() {