diff --git a/library/ZendAfi/Form/Album.php b/library/ZendAfi/Form/Album.php index a2bcb44c164c15299c1c7053daad135c6a781f1d..d9b773f596ea1b95578cf7ba2a97c42ac9726bc9 100644 --- a/library/ZendAfi/Form/Album.php +++ b/library/ZendAfi/Form/Album.php @@ -47,8 +47,7 @@ class ZendAfi_Form_Album extends ZendAfi_Form { 'album_desc', ['legend' => $form->_('Description')]) - ->addDisplayGroup(['authors', - 'auteur'], + ->addDisplayGroup(['authors'], 'authors_editors', ['legend' => $form->_('Auteurs')]) @@ -131,9 +130,6 @@ class ZendAfi_Form_Album extends ZendAfi_Form { ->addElement('checkbox', 'visible', ['label' => 'Visible']) - ->addElement('text', 'auteur', ['label' => 'Auteur', - 'size' => 75]) - ->addElement('ckeditor', 'description') ->addElement('text', 'annee', ['label' => "Année d'édition", diff --git a/tests/application/modules/admin/controllers/AlbumControllerTest.php b/tests/application/modules/admin/controllers/AlbumControllerTest.php index f2684eb64332fd72a3bceaaff903fb975d022c03..c582eb8b491482fefbfbb741547d680a19237462 100644 --- a/tests/application/modules/admin/controllers/AlbumControllerTest.php +++ b/tests/application/modules/admin/controllers/AlbumControllerTest.php @@ -69,7 +69,6 @@ abstract class Admin_AlbumControllerTestCase extends Admin_AbstractControllerTes 'notes' => 'a:3:{s:5:"305$a";s:12:"XIIe siècle";s:5:"200$b";s:9:"Parchemin";s:5:"316$a";s:12:"Reliure bois";}']) ->setTitre('Mes BD') - ->setAuteur('Laurent') ->setTags('bd;dessin') ->setDescription('Les préférées') ->setAnnee(1978) @@ -610,12 +609,6 @@ class Admin_AlbumControllerAddAlbumToPatrimoineTest extends Admin_AlbumControlle } - /** @test */ - public function fieldForAuthorShouldBePresent() { - $this->assertXPath("//form[@id='album']//input[@type='text'][@name='auteur']"); - } - - /** @test */ public function fieldForRightsShouldBePresent() { $this->assertXPath("//form[@id='album']//input[@type='radio'][@name='droits']"); @@ -932,11 +925,6 @@ class Admin_AlbumControllerEditAlbumMesBDTest extends Admin_AlbumControllerTestC $this->assertXPathContentContains("//form//select[@name='cat_id']/option[2][@value=6]", 'Favoris>Adulte'); } - /** @test */ - public function formShouldHaveATextFieldForAuteur() { - $this->assertXPath("//form[@id='album']//input[@type='text'][@name='auteur'][@value='Laurent']"); - } - /** @test */ public function formShouldHaveATextFieldForAnnee() { @@ -1159,7 +1147,6 @@ class Admin_AlbumControllerPostEditAlbumMesBDTest extends Admin_AlbumControllerT ['titre' => 'Mes BD', 'description' => "Les préférées de l'année", 'tags' => 'selection', - 'auteur' => 'Pat', 'type_doc_id' => 201, 'annee' => 1998, 'matiere' => '5;6', @@ -1190,18 +1177,6 @@ class Admin_AlbumControllerPostEditAlbumMesBDTest extends Admin_AlbumControllerT } - /** @test */ - function auteurShouldBePat() { - $this->assertEquals('Pat', $this->bd->getAuteur()); - } - - - /** @test */ - function auteurPatShouldBeHaveBeenCreatedOnTheFly() { - $this->assertEquals('Pat', Class_CodifAuteur::findFirstBy(['libelle'=>'Pat'])->getLibelle()); - } - - /** @test */ function anneeShouldBe1998() { $this->assertSame('1998', $this->bd->getAnnee());