From fc5ea47e8210f30ffb51b679458e2a0d464feeed Mon Sep 17 00:00:00 2001
From: llaffont <llaffont@afi-sa.fr>
Date: Fri, 27 Jun 2014 11:37:13 +0200
Subject: [PATCH] dev #12992 #14706 custom fields
Fix failing tests
---
.../admin/controllers/CmsControllerTest.php | 6 ------
.../controllers/CustomFieldsControllerTest.php | 16 ++++++++--------
.../CustomFieldsMetaControllerTest.php | 2 +-
3 files changed, 9 insertions(+), 15 deletions(-)
diff --git a/tests/application/modules/admin/controllers/CmsControllerTest.php b/tests/application/modules/admin/controllers/CmsControllerTest.php
index f898759a446..00f14be96b8 100644
--- a/tests/application/modules/admin/controllers/CmsControllerTest.php
+++ b/tests/application/modules/admin/controllers/CmsControllerTest.php
@@ -349,12 +349,6 @@ class CmsControllerArticleConcertAsAdminPortailEditActionTest extends CmsControl
public function boutonValiderClickShouldNotBeAjax() {
$this->assertNotXPath('//td//div[contains(@onclick, "initializeAjaxFormSubmit")]');
}
-
-
- /** @test */
- public function customFieldsLinkShouldBePresent() {
- $this->assertXPathContentContains('//table//td/a[@href="/admin/custom-fields/form/model/article/id/4"]', 'Champs personnalisés');
- }
}
diff --git a/tests/application/modules/admin/controllers/CustomFieldsControllerTest.php b/tests/application/modules/admin/controllers/CustomFieldsControllerTest.php
index 49b90a3eeac..7fd83a7c20b 100644
--- a/tests/application/modules/admin/controllers/CustomFieldsControllerTest.php
+++ b/tests/application/modules/admin/controllers/CustomFieldsControllerTest.php
@@ -358,14 +358,14 @@ class CustomFieldsControllerUpDownActionTest extends CustomFieldControllerTestCa
public function updownForFieldExpectedOrder() {
// at start we have: Address, Age, Status
return [
- ['down', 3, ['Age', 'Address', 'Status']],
- ['down', 4, ['Address', 'Status', 'Age']],
- ['down', 5, ['Address', 'Age', 'Status']],
- ['down', 0, ['Address', 'Age', 'Status']],
-
- ['up', 0, ['Address', 'Age', 'Status']],
- ['up', 4, ['Age', 'Address', 'Status']],
- ['up', 5, ['Address', 'Status', 'Age']]
+ ['down', 3, ['Age', 'Address', 'Status', 'Zip code']],
+ ['down', 4, ['Address', 'Status', 'Age', 'Zip code']],
+ ['down', 6, ['Address', 'Age', 'Status', 'Zip code']],
+ ['down', 0, ['Address', 'Age', 'Status', 'Zip code']],
+
+ ['up', 0, ['Address', 'Age', 'Status', 'Zip code']],
+ ['up', 4, ['Age', 'Address', 'Status', 'Zip code']],
+ ['up', 5, ['Address', 'Status', 'Age', 'Zip code']]
];
}
diff --git a/tests/application/modules/admin/controllers/CustomFieldsMetaControllerTest.php b/tests/application/modules/admin/controllers/CustomFieldsMetaControllerTest.php
index 7d432cab5f7..5b80cf02bcf 100644
--- a/tests/application/modules/admin/controllers/CustomFieldsMetaControllerTest.php
+++ b/tests/application/modules/admin/controllers/CustomFieldsMetaControllerTest.php
@@ -107,7 +107,7 @@ class CustomFieldsMetaControllerEditActionTest extends CustomFieldsMetaControlle
/** @test */
public function fieldTypeShouldBeText() {
- $this->assertXPath('//select/option[@value="TEXT_INPUT"][@selected="selected"]');
+ $this->assertXPath('//select/option[@value="text"][@selected="selected"]');
}
}
--
GitLab