From c4a8ac0e1876a4028b90cfe70303630195587e39 Mon Sep 17 00:00:00 2001
From: Ghislain Loas <ghislo@sandbox.pergame.net>
Date: Thu, 18 Dec 2014 14:43:48 +0100
Subject: [PATCH] hotline #18393 fix tests failures + version

---
 ...oltine_#18393_corrections_boite_2_colonnes |  4 ++
 .../opac/controllers/CmsControllerTest.php    | 43 +++----------------
 2 files changed, 11 insertions(+), 36 deletions(-)
 create mode 100644 VERSIONS_HOTLINE/holtine_#18393_corrections_boite_2_colonnes

diff --git a/VERSIONS_HOTLINE/holtine_#18393_corrections_boite_2_colonnes b/VERSIONS_HOTLINE/holtine_#18393_corrections_boite_2_colonnes
new file mode 100644
index 00000000000..94bd2eabd68
--- /dev/null
+++ b/VERSIONS_HOTLINE/holtine_#18393_corrections_boite_2_colonnes
@@ -0,0 +1,4 @@
+ - ticket: hotline #18393
+   - Boîtes 2 colonnes
+     - Correction d'un effet de bord lors de la configuration en front des boîtes dans les colonnes avec la boîtes qui se trouvent
+       dans la bannière
\ No newline at end of file
diff --git a/tests/application/modules/opac/controllers/CmsControllerTest.php b/tests/application/modules/opac/controllers/CmsControllerTest.php
index 0caca0329c2..30545e04696 100644
--- a/tests/application/modules/opac/controllers/CmsControllerTest.php
+++ b/tests/application/modules/opac/controllers/CmsControllerTest.php
@@ -1199,21 +1199,6 @@ abstract class CmsControllerListTestCase extends AbstractControllerTestCase {
 
 		$this->_dispatchHook();
 	}
-}
-
-
-
-
-class CmsControllerArticleViewRecentTest extends CmsControllerListTestCase {
-	public function setUp() {
-		parent::setUp();
-	}
-
-
-	protected function _dispatchHook() {
-		$this->dispatch('/cms/articleviewrecent/nb/2');
-	}
-
 
 	/** @test */
 	public function feteDeLaFriteShouldBePresent() {
@@ -1231,38 +1216,23 @@ class CmsControllerArticleViewRecentTest extends CmsControllerListTestCase {
 			Class_Article::getLoader()->methodHasBeenCalled('filterByLocaleAndWorkflow')
 			);
 	}
-
 }
 
 
 
 
-class CmsControllerViewSummaryTest extends CmsControllerListTestCase {
-	public function setUp() {
-		parent::setUp();
-	}
-
-
+class CmsControllerArticleViewRecentTest extends CmsControllerListTestCase {
 	protected function _dispatchHook() {
-		$this->dispatch('/cms/viewsummary');
+		$this->dispatch('/cms/articleviewrecent/nb/2');
 	}
+}
 
 
-	/** @test */
-	public function feteDeLaFriteShouldBePresent() {
-		$this->assertXpathContentContains('//h1', 'La fête de la frite');
-	}
 
-	/** @test */
-	public function dedicaceMatsumotoShouldBePresent() {
-		$this->assertXpathContentContains('//h1', 'Dédicaces de Leiji Matsumoto sama');
-	}
 
-	/** @test */
-	public function workflowAndTranslationFilterShouldBeCalled() {
-		$this->assertTrue(
-			Class_Article::getLoader()->methodHasBeenCalled('filterByLocaleAndWorkflow')
-			);
+class CmsControllerViewSummaryTest extends CmsControllerListTestCase {
+	protected function _dispatchHook() {
+		$this->dispatch('/cms/viewsummary');
 	}
 }
 
@@ -1299,6 +1269,7 @@ class CmsControllerArticleViewSelectionFromHorizontalMenuBoxTest extends Abstrac
 	public function setUp() {
 		parent::setUp();
 
+
 		$cfg_menus = ['H' => ['libelle' => 'Menu horizontal',
 													'picto' => 'vide.gif',
 													'menus' => [['type_menu' => 'MENU',
-- 
GitLab