Merge branch '5.2' into 5

silverstripe · Jul 22, 2024 · f17b61c · f17b61c
2 parents 97d9b3d + b6430c7
commit f17b61c
Show file tree

Hide file tree

Showing 18 changed files with 18 additions and 13 deletions.
diff --git a/tests/Behat/features/add-block-element-to-data-object.feature b/tests/Behat/features/add-block-element-to-data-object.feature
@@ -1,4 +1,4 @@
-@javascript
+@javascript @retry @job1
 Feature: Add elements in the CMS DataObject
   As a CMS user
   I want to add elements in the CMS DataObject

diff --git a/tests/Behat/features/add-block-element.feature b/tests/Behat/features/add-block-element.feature
@@ -1,4 +1,4 @@
-@javascript
+@javascript @retry @job1
 Feature: Add elements in the CMS
   As a CMS user
   I want to add elements in the CMS

diff --git a/tests/Behat/features/add-link-to-anchor.feature b/tests/Behat/features/add-link-to-anchor.feature
@@ -1,3 +1,4 @@
+@retry @job1
 Feature: Link to anchors in elements
 As a cms author
 I want to link to anchors in my content

diff --git a/tests/Behat/features/archive-block-element.feature b/tests/Behat/features/archive-block-element.feature
@@ -1,4 +1,4 @@
-@javascript
+@javascript @retry @job1
 Feature: Archive elements in the CMS
   As a CMS user
   I want to archive elements in the CMS

diff --git a/tests/Behat/features/broken-element.feature b/tests/Behat/features/broken-element.feature
@@ -1,4 +1,4 @@
-@javascript
+@javascript @retry @job2
 Feature: Broken element in CMS
   As a CMS user
   I want elemental areas to function correctly even with a broken block

diff --git a/tests/Behat/features/content-blocks-in-use-report.feature b/tests/Behat/features/content-blocks-in-use-report.feature
@@ -1,3 +1,4 @@
+@retry @job2
 Feature: View the report for content blocks in use
   As a CMS user
   I want to view a report of all created content blocks

diff --git a/tests/Behat/features/edit-block-element.feature b/tests/Behat/features/edit-block-element.feature
@@ -1,4 +1,4 @@
-@javascript
+@javascript @retry @job3
 Feature: Edit elements in the CMS
   As a CMS user
   I want to edit elements in the CMS

diff --git a/tests/Behat/features/element-editor.feature b/tests/Behat/features/element-editor.feature
@@ -1,4 +1,4 @@
-@javascript
+@javascript @retry @job4
 Feature: View types of elements in an area on a page
   As a CMS user
   I want to view a list of elements that I have on a page

diff --git a/tests/Behat/features/elemental-reports.feature b/tests/Behat/features/elemental-reports.feature
@@ -1,3 +1,4 @@
+@retry @job5
 Feature: View types of elements in a report
   As a CMS user
   I want to view a report of element types in the CMS

diff --git a/tests/Behat/features/empty-element-list.feature b/tests/Behat/features/empty-element-list.feature
@@ -1,4 +1,4 @@
-@javascript
+@javascript @retry @job5
 Feature: View an elemental area with no blocks on a page
   As a CMS user
   I want to be visually alerted in case there are not yet any blocks on my  page

diff --git a/tests/Behat/features/multiple-wysiwyg-configs.feature b/tests/Behat/features/multiple-wysiwyg-configs.feature
@@ -1,3 +1,4 @@
+@retry @job5
 Feature: multiple elemental blocks with different HTMLEditorConfig instances
   As a developer
   I want my elemental blocks to have different HTMLEditorConfig instances

diff --git a/tests/Behat/features/preview-a-block.feature b/tests/Behat/features/preview-a-block.feature
@@ -1,3 +1,4 @@
+@retry @job5
 Feature: Preview a non-inline-editable block
   As an author
   I want to preview the parent page of the non-inline-editable block I'm editing in the CMS

diff --git a/tests/Behat/features/publish-block-element.feature b/tests/Behat/features/publish-block-element.feature
@@ -1,4 +1,4 @@
-@javascript
+@javascript @retry @job5
 Feature: Publish elements in the CMS
   As a CMS user
   I want to publish elements in the CMS

diff --git a/tests/Behat/features/restore-archived-element.feature b/tests/Behat/features/restore-archived-element.feature
@@ -1,4 +1,4 @@
-@javascript
+@javascript @retry @job6
 Feature: Restore to draft
   As a CMS author
   I want to restore archived element to draft version

diff --git a/tests/Behat/features/searchable-dropdown-fields.feature b/tests/Behat/features/searchable-dropdown-fields.feature
@@ -1,4 +1,4 @@
-@javascript
+@javascript @retry @job6
 Feature: Searchable fields
   As a CMS user
   I want searchable dropdown fields to function when used in a content block

diff --git a/tests/Behat/features/unpublish-block-element.feature b/tests/Behat/features/unpublish-block-element.feature
@@ -1,4 +1,4 @@
-@javascript
+@javascript @retry @job6
 Feature: Unpublish elements in the CMS
   As a CMS user
   I want to unpublish elements in the CMS

diff --git a/tests/Behat/features/validation-failure.feature b/tests/Behat/features/validation-failure.feature
@@ -1,4 +1,4 @@
-@javascript
+@javascript @retry @job6
 Feature: Don't lose content when page or block is invalid
   As a CMS user
   I want to retain my unsaved content when a validation error occurs

diff --git a/tests/Behat/features/versioned-status-block-element.feature b/tests/Behat/features/versioned-status-block-element.feature
@@ -1,4 +1,4 @@
-@javascript
+@javascript @retry @job6
 Feature: Add elements in the CMS and see currunt status of elements
   As a CMS user
   I want to see versined status of Element blocks