From 930e3d0b4b35b7e62e3106ebb431b9ecf7df7945 Mon Sep 17 00:00:00 2001 From: Guy Sartorelli <36352093+GuySartorelli@users.noreply.github.com> Date: Tue, 23 Jul 2024 09:58:58 +1200 Subject: [PATCH 1/2] MNT Add behat features to numbered CI jobs (#1224) --- tests/Behat/features/inline-block-validation.feature | 2 +- tests/Behat/features/non-inline-block-validation.feature | 6 +++--- tests/Behat/features/page-save-validation.feature | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/Behat/features/inline-block-validation.feature b/tests/Behat/features/inline-block-validation.feature index 9eed13a8..894a8bd8 100644 --- a/tests/Behat/features/inline-block-validation.feature +++ b/tests/Behat/features/inline-block-validation.feature @@ -1,4 +1,4 @@ -@retry +@retry @job7 Feature: Blocks are validated when inline saving individual blocks As a CMS user I want to blocks have be validating when individual saving them diff --git a/tests/Behat/features/non-inline-block-validation.feature b/tests/Behat/features/non-inline-block-validation.feature index 03565415..b198642e 100644 --- a/tests/Behat/features/non-inline-block-validation.feature +++ b/tests/Behat/features/non-inline-block-validation.feature @@ -1,4 +1,4 @@ -@retry +@retry @job7 Feature: Blocks are validated when non-inline saving blocks As a CMS user I want to blocks have be validating when non-inline saving them @@ -19,7 +19,7 @@ Feature: Blocks are validated when non-inline saving blocks And I click on the caret button for block 1 Scenario: Non-inline block validation - + # Related has_one RequiredFields with ID suffix (MyPageID) When I press the "Save" button Then I should see "\"My page\" is required" in the "#message-Form_ItemEditForm_MyPageID" element @@ -38,7 +38,7 @@ Feature: Blocks are validated when non-inline saving blocks And I press the "Save" button Then I should see "\"Title\" is required" in the "#message-Form_ItemEditForm_Title" element And I fill in "Title" with "My title" - + # FormField::validate() When I fill in "My Int" with "1" And I press the "Save" button diff --git a/tests/Behat/features/page-save-validation.feature b/tests/Behat/features/page-save-validation.feature index e1d2718a..9c1a55f7 100644 --- a/tests/Behat/features/page-save-validation.feature +++ b/tests/Behat/features/page-save-validation.feature @@ -1,4 +1,4 @@ -@retry +@retry @job1 Feature: Blocks are validated when page saving blocks As a CMS user I want to blocks be validated when page saving blocks From 63066182f45628fec2a11cc3826b9f066c4b9b96 Mon Sep 17 00:00:00 2001 From: Guy Sartorelli <36352093+GuySartorelli@users.noreply.github.com> Date: Tue, 23 Jul 2024 14:16:18 +1200 Subject: [PATCH 2/2] DEP Update minimum dependencies (#1223) --- composer.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/composer.json b/composer.json index 7557b2e7..7d85d9fd 100644 --- a/composer.json +++ b/composer.json @@ -19,7 +19,7 @@ "prefer-stable": true, "require": { "php": "^8.1", - "silverstripe/framework": "^5", + "silverstripe/framework": "^5.2", "silverstripe/cms": "^5", "silverstripe/admin": "^2.0.1", "silverstripe/versioned": "^2",