Merge branch 'stable' into 'hotline#30747_cms_categories_with_same_id_and_parent_id'

Stable

See merge request !1153

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

@@ -16,7 +16,7 @@
  *
  * You should have received a copy of the GNU AFFERO GENERAL PUBLIC LICENSE
  * along with BOKEH; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA 
+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA
  */
 require_once 'AdminAbstractControllerTestCase.php';
 
@@ -94,7 +94,7 @@ class Admin_OaiControllerAddActionTest extends Admin_OaiControllerTestCase  {
     $this->dispatch('/admin/oai/add');
   }
 
-  
+
   /** @test */
   public function pageShouldRenderEntrepotForm() {
     $this->assertXPath('//input[@name="libelle"]');
@@ -110,7 +110,7 @@ class Admin_OaiControllerEditActionTest extends Admin_OaiControllerTestCase  {
     $this->dispatch('/admin/oai/edit/id/4');
   }
 
-  
+
   /** @test */
   public function pageShouldRenderEntrepotForm() {
     $this->assertXPath('//input[@name="libelle"][@value="Gallica"]');
@@ -150,7 +150,7 @@ class Admin_OaiControllerBrowseGallicaActionTest extends Admin_OaiControllerTest
 
 class Admin_OaiControllerImportIsaacAsimovFoundationTest extends Admin_OaiControllerTestCase  {
   protected $_new_album;
-  
+
   public function setUp() {
     parent::setUp();
     Storm_Test_ObjectWrapper::onLoaderOfModel('Class_AlbumCategorie')
@@ -211,7 +211,7 @@ class Admin_OaiControllerImportIsaacAsimovFoundationTest extends Admin_OaiContro
 
   /** @test */
   public function idOrigineShouldBeArk() {
-    $this->assertEquals('http://gallica.bnf.fr/ark:/12148/bpt6k86704c', 
+    $this->assertEquals('http://gallica.bnf.fr/ark:/12148/bpt6k86704c',
                         $this->_new_album->getIdOrigine());
   }
 
@@ -263,7 +263,7 @@ class Admin_OaiControllerIndexWithSearchActionTest extends Admin_OaiControllerSe
       ->answers(1)
 
       ->whenCalled('fetchAll')
-      ->with("select id from oai_notices where MATCH(recherche) AGAINST('+(POMME POMMES POM)' IN BOOLEAN MODE) order by alpha_titre LIMIT 0,10",
+      ->with("select id from oai_notices where MATCH(recherche) AGAINST('+(POMME POMMES POM)' IN BOOLEAN MODE) order by alpha_titre LIMIT 0,100",
              false)
       ->answers(array(array('id' => 2)));