From b6fbebeb8871d0e09da57f70afded860ccc70ef7 Mon Sep 17 00:00:00 2001
From: gloas <gloas@afi-sa.fr>
Date: Tue, 14 Mar 2017 18:17:20 +0100
Subject: [PATCH] fix tests failures
---
.../ZendAfi/View/Helper/Redmine/Header.php | 4 ++--
.../controllers/AccueilControllerCmsTest.php | 2 +-
.../controllers/AdminIndexControllerTest.php | 2 +-
.../AlbumControllerListViewModeTest.php | 2 +-
.../admin/controllers/AlbumControllerTest.php | 7 +++---
.../admin/controllers/BatchControllerTest.php | 2 +-
.../admin/controllers/BibControllerTest.php | 8 +------
.../controllers/CatalogueControllerTest.php | 24 +++----------------
.../controllers/CmsCategoryControllerTest.php | 2 +-
.../controllers/CmsControllerListModeTest.php | 2 +-
.../admin/controllers/CmsControllerTest.php | 8 +++----
.../CustomFieldsControllerTest.php | 2 +-
.../CustomFieldsMetaControllerTest.php | 4 ++--
.../CustomFieldsReportControllerTest.php | 2 +-
.../controllers/FrbrLinkControllerTest.php | 4 ++--
.../FrbrLinktypeControllerTest.php | 12 +++++-----
.../admin/controllers/LieuControllerTest.php | 4 ++--
.../controllers/NewsletterControllerTest.php | 2 +-
.../admin/controllers/OpdsControllerTest.php | 2 +-
.../controllers/ProfilControllerIndexTest.php | 2 +-
.../controllers/RedmineControllerTest.php | 4 ++--
.../controllers/UserGroupControllerTest.php | 4 ++--
.../admin/controllers/UsersControllerTest.php | 2 +-
.../AbonneControllerNewslettersTest.php | 2 +-
.../AbonneControllerTagNoticeTest.php | 2 +-
.../ExternalAgendas/ExternalAgendasTest.php | 4 ++--
26 files changed, 45 insertions(+), 70 deletions(-)
diff --git a/library/ZendAfi/View/Helper/Redmine/Header.php b/library/ZendAfi/View/Helper/Redmine/Header.php
index ac61af22f15..ab8abaa2e86 100644
--- a/library/ZendAfi/View/Helper/Redmine/Header.php
+++ b/library/ZendAfi/View/Helper/Redmine/Header.php
@@ -106,8 +106,8 @@ class ZendAfi_View_Helper_Redmine_Header extends ZendAfi_View_Helper_BaseHelper
->setUrl($this->view->url(['module' => 'admin',
'controller' => 'bib',
'action' => 'edit',
- 'backUrl' => $this->view->url(),
- 'id' => $library->getId()], null ,true) . '#fieldset-redmine')
+ 'id' => $library->getId(),
+ 'backUrl' => $this->view->url()], null ,true) . '#fieldset-redmine')
->setAttribs(['class' => 'library_redmine_account',
'title' => $title]));
}
diff --git a/tests/application/modules/admin/controllers/AccueilControllerCmsTest.php b/tests/application/modules/admin/controllers/AccueilControllerCmsTest.php
index f6c23dd0fe0..0d432078836 100644
--- a/tests/application/modules/admin/controllers/AccueilControllerCmsTest.php
+++ b/tests/application/modules/admin/controllers/AccueilControllerCmsTest.php
@@ -245,7 +245,7 @@ class Admin_AccueilControllerCmsDispatchWithConfigAdminTest extends Admin_Abstra
/** @test */
public function backButtonShouldContainsOnclickGoToIndex() {
- $this->assertXPathContentContains('//div//button[@class="admin-button back"][@data-url="/admin/accueil"][contains(@onclick, "/admin/accueil")]', 'Retour');
+ $this->assertXPathContentContains('//div//button[@class="back admin-button"][@data-url="/admin/accueil"][contains(@onclick, "/admin/accueil")]', 'Retour');
}
}
diff --git a/tests/application/modules/admin/controllers/AdminIndexControllerTest.php b/tests/application/modules/admin/controllers/AdminIndexControllerTest.php
index 912ecabd81a..dbf321caf11 100644
--- a/tests/application/modules/admin/controllers/AdminIndexControllerTest.php
+++ b/tests/application/modules/admin/controllers/AdminIndexControllerTest.php
@@ -608,7 +608,7 @@ class AdminIndexControllerAdminVarEditDilicomPnbIpAdressesTest extends AdminInde
/** @test */
public function backUrlShouldBeAdminVar() {
- $this->assertXPath('//div//button[@class="admin-button back"][contains(@onclick, "/admin/index/adminvar")]');
+ $this->assertXPath('//div//button[@class="back admin-button"][contains(@onclick, "/admin/index/adminvar")]');
}
}
diff --git a/tests/application/modules/admin/controllers/AlbumControllerListViewModeTest.php b/tests/application/modules/admin/controllers/AlbumControllerListViewModeTest.php
index df46e35688d..7c240522056 100644
--- a/tests/application/modules/admin/controllers/AlbumControllerListViewModeTest.php
+++ b/tests/application/modules/admin/controllers/AlbumControllerListViewModeTest.php
@@ -292,7 +292,7 @@ class AlbumControllerListModeEditWithPaginationTest
/** @test */
public function backShouldContainsPage34() {
- $this->assertXPathContentContains('//div//button[@class="admin-button back"][contains(@onclick, "/page/34")][contains(@data-url, "/page/34")]', 'Retour');
+ $this->assertXPathContentContains('//div//button[@class="back admin-button"][contains(@onclick, "/page/34")][contains(@data-url, "/page/34")]', 'Retour');
}
}
diff --git a/tests/application/modules/admin/controllers/AlbumControllerTest.php b/tests/application/modules/admin/controllers/AlbumControllerTest.php
index c882b834fa4..50728d4d771 100644
--- a/tests/application/modules/admin/controllers/AlbumControllerTest.php
+++ b/tests/application/modules/admin/controllers/AlbumControllerTest.php
@@ -373,7 +373,7 @@ class Admin_AlbumControllerAddCategorieToFavorisTest extends Admin_AlbumControll
/** @test */
public function shouldHaveBackButton() {
- $this->assertXPathContentContains('//div//button[@class="admin-button back"][contains(@onclick, "admin/album/index/id/2/cat_id/2")]', "Retour");
+ $this->assertXPathContentContains('//div//button[@class="back admin-button"][contains(@onclick, "admin/album/index/id/2/cat_id/2")]', "Retour");
}
}
@@ -533,7 +533,7 @@ class Admin_AlbumControllerEditCategorieFavorisTest extends Admin_AlbumControlle
/** @test */
public function backButtonShouldContainsCatId() {
- $this->assertXPath('//div//button[@class="admin-button back"][contains(@onclick, "admin/album/index/id/2/cat_id/2")]');
+ $this->assertXPath('//div//button[@class="back admin-button"][contains(@onclick, "admin/album/index/id/2/cat_id/2")]');
}
}
@@ -2614,9 +2614,8 @@ class Admin_AlbumControllerImportEADTest extends Admin_AlbumControllerTestCase {
/** @test */
public function pageShouldHaveLinkToExportEAD() {
- $this->assertXPathContentContains('//a[@href="/admin/album/export-ead"]',"Exporter en EAD",$this->_response->getBody());
+ $this->assertXPathContentContains('//button[contains(@onclick, "/admin/album/export-ead")]',"Exporter en EAD");
}
-
}
diff --git a/tests/application/modules/admin/controllers/BatchControllerTest.php b/tests/application/modules/admin/controllers/BatchControllerTest.php
index e39f42ff8ec..9c58db55981 100644
--- a/tests/application/modules/admin/controllers/BatchControllerTest.php
+++ b/tests/application/modules/admin/controllers/BatchControllerTest.php
@@ -75,7 +75,7 @@ class BatchControllerWithBatchInDb extends BatchControllerTestCase {
/** @test */
public function buttonShouldLinkToAdd() {
- $this->assertXPath('//div[contains(@onclick, "batch/add")]');
+ $this->assertXPath('//button[contains(@onclick, "batch/add")]');
}
diff --git a/tests/application/modules/admin/controllers/BibControllerTest.php b/tests/application/modules/admin/controllers/BibControllerTest.php
index bf0dd4dc2ed..734e4bd64b6 100644
--- a/tests/application/modules/admin/controllers/BibControllerTest.php
+++ b/tests/application/modules/admin/controllers/BibControllerTest.php
@@ -130,7 +130,7 @@ class BibControllerIndexWidthAdminPortailTest extends BibControllerTestCase {
/** @test */
public function pageShouldContainsAddLibraryLink() {
- $this->assertXPathContentContains('//div[contains(@onclick, "/admin/bib/add")]', 'Ajouter une bibliothèque');
+ $this->assertXPathContentContains('//button[contains(@onclick, "/admin/bib/add")]', 'Ajouter une bibliothèque');
}
@@ -1692,12 +1692,6 @@ class BibControllerWithRemineAPITest extends BibControllerWithRedmineAPITestCase
public function redmineApiKeyShouldBeEmpty() {
$this->assertXPath('//table//tr//td//input[@name="redmine_api_key"][@value=""][@type="password"]', $this->_response->getBody());
}
-
-
- /** @test */
- public function anchorRedmineShouldBePresent() {
- $this->assertXPath('//form//a[@name="redmine"]');
- }
}
diff --git a/tests/application/modules/admin/controllers/CatalogueControllerTest.php b/tests/application/modules/admin/controllers/CatalogueControllerTest.php
index c17fc5b08b4..69b382168da 100644
--- a/tests/application/modules/admin/controllers/CatalogueControllerTest.php
+++ b/tests/application/modules/admin/controllers/CatalogueControllerTest.php
@@ -532,7 +532,7 @@ class CatalogueControllerWithAModoBibWithRightAccesDomainesIndexTest extends Adm
/** @test */
public function pageShouldContainsButtonAdd() {
- $this->assertXPath('//div[contains(@onclick, "catalogue/add")]');
+ $this->assertXPath('//button[contains(@onclick, "catalogue/add")]');
}
@@ -618,7 +618,7 @@ class CatalogueControllerActionTesterTest extends AbstractControllerTestCase {
/** @test */
public function modifyLinkShouldContainsSlashes() {
- $this->assertXPathContentContains('//a[contains(@href, "/admin/catalogue/edit/id_catalogue/6")]', "Modifier la définition du catalogue");
+ $this->assertXPathContentContains('//button[contains(@onclick, "/admin/catalogue/edit/id_catalogue/6")]', "Modifier le catalogue");
}
}
@@ -680,12 +680,6 @@ class CatalogueControllerEditCatalogueTest extends AdminCatalogueControllerTestC
}
- /** @test **/
- public function scriptControlMajShouldBePresent() {
- $this->assertXPath('//script[contains(@src,"/admin/js/controle_maj")]');
- }
-
-
/** @test */
public function inputLibelleShouldContainsAdultes() {
$this->assertXPath('//input[@name="libelle"][@value="Adultes"]');
@@ -816,7 +810,7 @@ class CatalogueControllerEditCatalogueInPopupTest extends AdminCatalogueControll
public function boutonRetourShouldCloseThePopup() {
$xpath = new Storm_Test_XPath();
$xpath->assertXPath($this->_json->content,
- '//div[@class="bouton"][contains(@onclick, "opacDialogClose")][not(contains(@onclick, "window.replace"))]');
+ '//button[contains(@onclick, "opacDialogClose")][not(contains(@onclick, "window.replace"))]');
}
}
@@ -1014,12 +1008,6 @@ class CatalogueControllerAddCatalogueTest extends AdminCatalogueControllerTestCa
}
- /** @test **/
- public function scriptControlMajShouldBePresent() {
- $this->assertXPath('//script[contains(@src,"/admin/js/controle_maj")]');
- }
-
-
/** @test */
public function inputLibelleShouldContainsNouveauCatalogue() {
$this->assertXPath('//input[@name="libelle"][@value="** nouveau domaine **"]');
@@ -1039,12 +1027,6 @@ class CatalogueControllerAddCatalogueTest extends AdminCatalogueControllerTestCa
public function formActionShouldBeAdminCatalogueAddIdCatalogue100() {
$this->assertXPath('//form[contains(@action, "/admin/catalogue/add/id_catalogue/100")]');
}
-
-
- /** @test */
- public function catalogueAddFormShouldContainsJsControleMaj() {
- $this->assertXPath('//script[contains(@src,"controle_maj")]');
- }
}
diff --git a/tests/application/modules/admin/controllers/CmsCategoryControllerTest.php b/tests/application/modules/admin/controllers/CmsCategoryControllerTest.php
index 0637a87a360..1a91728791c 100644
--- a/tests/application/modules/admin/controllers/CmsCategoryControllerTest.php
+++ b/tests/application/modules/admin/controllers/CmsCategoryControllerTest.php
@@ -354,7 +354,7 @@ class CmsCategoryControllerEditActionPermissionsTest extends CmsCategoryControll
/** @test */
public function permissionsSubmitButtonShouldBePresent() {
- $this->assertXPath('//form[contains(@action, "cms-category/permissions/id/23")]//div[@id="menu_itemperms23"]');
+ $this->assertXPath('//form[contains(@action, "cms-category/permissions/id/23")]//button[@type="submit"]');
}
diff --git a/tests/application/modules/admin/controllers/CmsControllerListModeTest.php b/tests/application/modules/admin/controllers/CmsControllerListModeTest.php
index 46c2b363b20..c7264ffd430 100644
--- a/tests/application/modules/admin/controllers/CmsControllerListModeTest.php
+++ b/tests/application/modules/admin/controllers/CmsControllerListModeTest.php
@@ -388,7 +388,7 @@ class CmsControllerListModeEditWithPaginationTest
/** @test */
public function backShouldContainPage34() {
- $this->assertXPath('//div//button[@class="admin-button back"][contains(@onclick, "/page/34")]');
+ $this->assertXPath('//div//button[@class="back admin-button"][contains(@onclick, "/page/34")]');
}
}
diff --git a/tests/application/modules/admin/controllers/CmsControllerTest.php b/tests/application/modules/admin/controllers/CmsControllerTest.php
index 82e23040c6a..5ac1329b80b 100644
--- a/tests/application/modules/admin/controllers/CmsControllerTest.php
+++ b/tests/application/modules/admin/controllers/CmsControllerTest.php
@@ -795,7 +795,7 @@ class CmsControllerArticleConcertEditRenderPopupActionTest extends CmsController
/** @test */
public function boutonRetourShouldCloseThePopup() {
$this->_xpath->assertXPath($this->_json->content,
- '//div//button[@class="admin-button back"][contains(@onclick, "opacDialogClose")][not(contains(@onclick, "window.replace"))][text()="Fermer"]');
+ '//div//button[@class="back admin-button"][contains(@onclick, "opacDialogClose")][not(contains(@onclick, "window.replace"))][text()="Fermer"]');
}
@@ -836,7 +836,7 @@ class CmsControllerArticleConcertEditRenderPopupActionTest extends CmsController
/** @test */
public function boutonValiderShouldSubmitFormUsingAjax() {
$this->_xpath->assertXPath($this->_json->content,
- '//div//button[@class="admin-button validate"][contains(@onclick, "initializeAjaxFormSubmit")]');
+ '//div//button[@class="validate admin-button"][contains(@onclick, "initializeAjaxFormSubmit")]');
}
@@ -1242,14 +1242,14 @@ class CmsControllerArticleConcertEditActionPostWithWrongDataRenderPopupTest exte
/** @test */
public function boutonValiderShouldSubmitFormUsingAjax() {
$this->_xpath->assertXPath($this->_json->content,
- '//div//button[@class="admin-button validate"][contains(@onclick, "initializeAjaxFormSubmit")]');
+ '//div//button[@class="validate admin-button"][contains(@onclick, "initializeAjaxFormSubmit")]');
}
/** @test */
public function cancelButtonShouldReloadPopup() {
$this->_xpath->assertXPath($this->_json->content,
- '//div//button[@class="admin-button undo"][@data-popup="true"][not(contains(@onclick, "/admin/cms/edit/id/4"))][not(contains(@onclick, "render/popup"))][@data-url= "/admin/cms/edit/id/4"]');
+ '//div//button[@class="undo admin-button"][@data-popup="true"][not(contains(@onclick, "/admin/cms/edit/id/4"))][not(contains(@onclick, "render/popup"))][@data-url= "/admin/cms/edit/id/4"]');
}
diff --git a/tests/application/modules/admin/controllers/CustomFieldsControllerTest.php b/tests/application/modules/admin/controllers/CustomFieldsControllerTest.php
index dfcce54a74c..a5e16fce672 100644
--- a/tests/application/modules/admin/controllers/CustomFieldsControllerTest.php
+++ b/tests/application/modules/admin/controllers/CustomFieldsControllerTest.php
@@ -175,7 +175,7 @@ class CustomFieldsControllerIndexTest extends CustomFieldControllerTestCase {
/** @test */
public function linkToManageCustomFieldsShouldBePresent() {
- $this->assertXPathContentContains('//div[contains(@onclick, "/admin/custom-fields-meta")]//td', 'Types de champs personnalisés');
+ $this->assertXPathContentContains('//button[contains(@onclick, "/admin/custom-fields-meta")]', 'Types de champs personnalisés');
}
diff --git a/tests/application/modules/admin/controllers/CustomFieldsMetaControllerTest.php b/tests/application/modules/admin/controllers/CustomFieldsMetaControllerTest.php
index f38a7ea32e0..db2b793fb6c 100644
--- a/tests/application/modules/admin/controllers/CustomFieldsMetaControllerTest.php
+++ b/tests/application/modules/admin/controllers/CustomFieldsMetaControllerTest.php
@@ -116,14 +116,14 @@ class CustomFieldsMetaControllerIndexActionTest extends CustomFieldsMetaControll
/** @test */
public function linkToAddNewShouldBePresent() {
- $this->assertXPathContentContains('//div[contains(@onclick, "/admin/custom-fields-meta/add")]//td',
+ $this->assertXPathContentContains('//button[contains(@onclick, "/admin/custom-fields-meta/add")]',
'Nouveau type de champ');
}
/** @test */
public function backToCustomFieldsLinkShouldBePresent() {
- $this->assertXPathContentContains('//div[contains(@onclick, "/admin/custom-fields\'")]',
+ $this->assertXPathContentContains('//button[contains(@onclick, "/admin/custom-fields\'")]',
'Retour à la liste');
}
}
diff --git a/tests/application/modules/admin/controllers/CustomFieldsReportControllerTest.php b/tests/application/modules/admin/controllers/CustomFieldsReportControllerTest.php
index 0cf9b21cbc2..5f0503bb5cd 100644
--- a/tests/application/modules/admin/controllers/CustomFieldsReportControllerTest.php
+++ b/tests/application/modules/admin/controllers/CustomFieldsReportControllerTest.php
@@ -43,7 +43,7 @@ class CustomFieldsReportControllerAddTest extends AbstractControllerTestCase {
/** @test */
public function pageShouldContainsGenerateReportButton() {
- $this->assertXPathContentContains('//div[@id="menu_itemgenerate"]//td', 'Générer');
+ $this->assertXPathContentContains('//button', 'Générer');
}
diff --git a/tests/application/modules/admin/controllers/FrbrLinkControllerTest.php b/tests/application/modules/admin/controllers/FrbrLinkControllerTest.php
index 4d0e0277a09..dd0dfbd029e 100644
--- a/tests/application/modules/admin/controllers/FrbrLinkControllerTest.php
+++ b/tests/application/modules/admin/controllers/FrbrLinkControllerTest.php
@@ -151,13 +151,13 @@ class Admin_FrbrLinkControllerIndexTest extends Admin_FrbrLinkControllerTestCase
/** @test */
public function linkToAddNewShouldBePresent() {
- $this->assertXPath('//div[contains(@onclick, "frbr-link/add")]');
+ $this->assertXPath('//button[contains(@onclick, "frbr-link/add")]');
}
/** @test */
public function linkToManageTypesShouldBePresent() {
- $this->assertXPath('//div[contains(@onclick, "frbr-linktype")]');
+ $this->assertXPath('//button[contains(@onclick, "frbr-linktype")]');
}
}
diff --git a/tests/application/modules/admin/controllers/FrbrLinktypeControllerTest.php b/tests/application/modules/admin/controllers/FrbrLinktypeControllerTest.php
index 07a2f80d153..a3d61aa2e2e 100644
--- a/tests/application/modules/admin/controllers/FrbrLinktypeControllerTest.php
+++ b/tests/application/modules/admin/controllers/FrbrLinktypeControllerTest.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';
@@ -58,7 +58,7 @@ class Admin_FrbrLinktypeControllerIndexTest extends Admin_FrbrLinktypeController
/** @test */
public function firstRowTDShouldContainsVousAimerezAussi() {
- $this->assertXPathContentContains('//tbody//tr[1]//td', 'Vous aimerez aussi',$this->response->getBody());
+ $this->assertXPathContentContains('//tbody//tr[1]//td', 'Vous aimerez aussi',$this->response->getBody());
}
@@ -70,7 +70,7 @@ class Admin_FrbrLinktypeControllerIndexTest extends Admin_FrbrLinktypeController
/** @test */
public function firstRowTDShouldContainsVousAimerezAussiB() {
- $this->assertXPathContentContains('//tbody//tr[1]//td', 'vous aimerez aussi B');
+ $this->assertXPathContentContains('//tbody//tr[1]//td', 'vous aimerez aussi B');
}
@@ -94,13 +94,13 @@ class Admin_FrbrLinktypeControllerIndexTest extends Admin_FrbrLinktypeController
/** @test */
public function linkToAddNewShouldBePresent() {
- $this->assertXPath('//div[contains(@onclick, "frbr-linktype/add")]');
+ $this->assertXPath('//button[contains(@onclick, "frbr-linktype/add")]');
}
/** @test */
public function linkToManageLinksShouldBePresent() {
- $this->assertXPath('//div[contains(@onclick, "frbr-link\')")]');
+ $this->assertXPath('//button[contains(@onclick, "admin/frbr-link")]');
}
}
@@ -136,7 +136,7 @@ class Admin_FrbrLinktypeControllerEditSuiteTest extends Admin_FrbrLinktypeContro
public function labelForFromBToAInputShouldBeFromBToA() {
$this->assertXPathContentContains('//label[@for="from_target"]', 'de l\'objet B vers l\'objet A');
}
-
+
}
diff --git a/tests/application/modules/admin/controllers/LieuControllerTest.php b/tests/application/modules/admin/controllers/LieuControllerTest.php
index 64d3da1b900..6991c1767fd 100644
--- a/tests/application/modules/admin/controllers/LieuControllerTest.php
+++ b/tests/application/modules/admin/controllers/LieuControllerTest.php
@@ -63,7 +63,7 @@ class LieuControllerListTest extends LieuControllerTestCase {
/** @test */
public function linktoUpdateCoordinatesShouldBePresent() {
- $this->assertXPath('//div[contains(@onclick, "/admin/lieu/update-coordinates")]');
+ $this->assertXPath('//button[contains(@onclick, "/admin/lieu/update-coordinates")]');
}
@@ -99,7 +99,7 @@ class LieuControllerListTest extends LieuControllerTestCase {
/** @test */
public function pageShouldContainsButtonToCreateLieu() {
- $this->assertXPathContentContains('//div[contains(@onclick, "lieu/add")]//td', 'Déclarer un nouveau lieu');
+ $this->assertXPathContentContains('//button[contains(@onclick, "lieu/add")]', 'Créer un lieu');
}
diff --git a/tests/application/modules/admin/controllers/NewsletterControllerTest.php b/tests/application/modules/admin/controllers/NewsletterControllerTest.php
index 9a3a12ba1c1..74fe8a9ba4c 100644
--- a/tests/application/modules/admin/controllers/NewsletterControllerTest.php
+++ b/tests/application/modules/admin/controllers/NewsletterControllerTest.php
@@ -204,7 +204,7 @@ class Admin_NewsletterControllerIndexActionTest extends Admin_NewsletterControll
public function testAddLink() {
- $this->assertXPath("//div[contains(@onclick, '/admin/newsletter/add')]");
+ $this->assertXPath("//button[contains(@onclick, '/admin/newsletter/add')]");
}
}
diff --git a/tests/application/modules/admin/controllers/OpdsControllerTest.php b/tests/application/modules/admin/controllers/OpdsControllerTest.php
index 91a91791a82..115f950335f 100644
--- a/tests/application/modules/admin/controllers/OpdsControllerTest.php
+++ b/tests/application/modules/admin/controllers/OpdsControllerTest.php
@@ -97,7 +97,7 @@ class Admin_OpdsControllerIndexActionTest extends Admin_OpdsControllerTestCase {
/** @test */
public function shouldHaveAddCatalogButton() {
- $this->assertXPath('//div[contains(@onclick, "opds/add")]');
+ $this->assertXPath('//button[contains(@onclick, "opds/add")]');
}
diff --git a/tests/application/modules/admin/controllers/ProfilControllerIndexTest.php b/tests/application/modules/admin/controllers/ProfilControllerIndexTest.php
index 7db9b423250..756218ec411 100644
--- a/tests/application/modules/admin/controllers/ProfilControllerIndexTest.php
+++ b/tests/application/modules/admin/controllers/ProfilControllerIndexTest.php
@@ -156,7 +156,7 @@ class Admin_ProfilControllerWithAdminPortailIndexTest extends Admin_ProfilContro
/** @test */
public function buttonAjouterProfilShouldBeVisible() {
- $this->assertXPathContentContains("//div[contains(@onclick, 'profil/add')]",
+ $this->assertXPathContentContains("//button[contains(@onclick, 'profil/add')]",
"Ajouter un profil");
}
diff --git a/tests/application/modules/admin/controllers/RedmineControllerTest.php b/tests/application/modules/admin/controllers/RedmineControllerTest.php
index c9d7845fb8a..73044bcc5fd 100644
--- a/tests/application/modules/admin/controllers/RedmineControllerTest.php
+++ b/tests/application/modules/admin/controllers/RedmineControllerTest.php
@@ -294,7 +294,7 @@ class Admin_RedmineControllerIndexTest extends Admin_RedmineControllerWithApiTes
/** @test */
public function anchorToEditBibsShouldBePresent() {
- $this->assertXPath('//div[@class="modules"]//a[contains(@href, "admin/bib/edit/id/1")]');
+ $this->assertXPath('//div[@class="modules"]//button[contains(@onclick, "admin/bib/edit/id/1/backUrl/")]');
}
@@ -375,7 +375,7 @@ class Admin_RedmineControllerIndexActionWithModoBibTest extends Admin_RedmineCon
/** @test */
public function noAccountHaveBeenSetMessageShouldBePresent() {
- $this->assertXPathContentContains('//div[@class="modules"]//a[contains(@href, "admin/bib/edit/id/1")]', 'Modifier le compte d\'assistance', $this->_response->getBody());
+ $this->assertXPathContentContains('//div[@class="modules"]//button[contains(@onclick, "admin/bib/edit/id/1")]', 'Modifier le compte d\'assistance');
}
}
diff --git a/tests/application/modules/admin/controllers/UserGroupControllerTest.php b/tests/application/modules/admin/controllers/UserGroupControllerTest.php
index eaa2073355b..7f5a9195d14 100644
--- a/tests/application/modules/admin/controllers/UserGroupControllerTest.php
+++ b/tests/application/modules/admin/controllers/UserGroupControllerTest.php
@@ -554,7 +554,7 @@ class Admin_UserGroupControllerEditMembersGroupAbonnesSIGBTest
/** @test */
public function backButtonShouldLinkToUsergroupController() {
- $this->assertXPath('//div[contains(@onclick, "/admin/usergroup")]');
+ $this->assertXPath('//button[contains(@onclick, "/admin/usergroup")]');
}
}
@@ -576,7 +576,7 @@ class Admin_UserGroupControllerEditMembersGroupAbonnesSIGBFromNewsletterTest
/** @test */
public function backButtonShouldLinkToNewsletterController() {
- $this->assertXPath('//div[contains(@onclick, "/admin/newsletter/edit-subscribers/id/43")]');
+ $this->assertXPath('//button[contains(@onclick, "/admin/newsletter/edit-subscribers/id/43")]');
}
}
diff --git a/tests/application/modules/admin/controllers/UsersControllerTest.php b/tests/application/modules/admin/controllers/UsersControllerTest.php
index ebe8a4becd4..87d25244d1f 100644
--- a/tests/application/modules/admin/controllers/UsersControllerTest.php
+++ b/tests/application/modules/admin/controllers/UsersControllerTest.php
@@ -153,7 +153,7 @@ class UsersControllerIndexTest extends UsersControllerWithMarcusTestCase {
/** @test */
public function addUserButtonShouldBePresent() {
- $this->assertXPath('//div[contains(@onclick, "admin/users/add")]');
+ $this->assertXPath('//button[contains(@onclick, "admin/users/add")]');
}
diff --git a/tests/application/modules/opac/controllers/AbonneControllerNewslettersTest.php b/tests/application/modules/opac/controllers/AbonneControllerNewslettersTest.php
index f5d2e07e877..b83784d68c7 100644
--- a/tests/application/modules/opac/controllers/AbonneControllerNewslettersTest.php
+++ b/tests/application/modules/opac/controllers/AbonneControllerNewslettersTest.php
@@ -268,7 +268,7 @@ class AbonneControllerNewslettersEditActionTest extends AbonneControllerWithTwoN
}
public function testBackButton() {
- $this->assertXPath("//div//button[@class='bouton back'][@data-url='/abonne'][contains(@onclick, 'window.location =')][contains(@onclick, '/abonne')]");
+ $this->assertXPath("//div//button[@class='bouton back'][@data-url='/abonne'][contains(@onclick, 'window.location.href =')][contains(@onclick, '/abonne')]");
}
/** @test */
diff --git a/tests/application/modules/opac/controllers/AbonneControllerTagNoticeTest.php b/tests/application/modules/opac/controllers/AbonneControllerTagNoticeTest.php
index 64822bb4c73..236d689ef29 100644
--- a/tests/application/modules/opac/controllers/AbonneControllerTagNoticeTest.php
+++ b/tests/application/modules/opac/controllers/AbonneControllerTagNoticeTest.php
@@ -47,7 +47,7 @@ class AbonneControllerTagNoticeAddTagPopupTest extends AbonneControllerTagNotice
$this->dispatch('/noticeajax/add-tag/id/23', true);
$json = json_decode($this->_response->getBody());
- $this->assertContains('a name="login_form"',
+ $this->assertContains('input type="text" name="username"',
$json->content);
}
}
diff --git a/tests/scenarios/ExternalAgendas/ExternalAgendasTest.php b/tests/scenarios/ExternalAgendas/ExternalAgendasTest.php
index fc6a057b2b2..f3e099e97f8 100644
--- a/tests/scenarios/ExternalAgendas/ExternalAgendasTest.php
+++ b/tests/scenarios/ExternalAgendas/ExternalAgendasTest.php
@@ -93,7 +93,7 @@ class ExternalAgendasAdminIndexTest extends ExternalAgendasAdminTestCase {
/** @test */
public function pageShouldContainsButtonAddAgenda() {
- $this->assertXPathContentContains('//div[contains(@onclick, "admin/external-agendas/add")]',
+ $this->assertXPathContentContains('//button[contains(@onclick, "admin/external-agendas/add")]',
'Ajouter un agenda');
}
@@ -489,7 +489,7 @@ class ExternalAgendasAdminImportTest extends ExternalAgendasAdminTestCase {
/** @test */
public function pageShouldContainsABackButton() {
- $this->assertXPathContentContains('//div[contains(@onclick, "replace(\'/admin/external-agendas\')")]//td',
+ $this->assertXPathContentContains('//button[contains(@onclick, "/admin/external-agendas")]',
'Retour à la liste des agendas');
}
--
GitLab