Merge branch '2.2' into 2

silverstripe · Jul 22, 2024 · dca4bb0 · dca4bb0
2 parents dac10e1 + 9193b06
commit dca4bb0
Show file tree

Hide file tree

Showing 14 changed files with 14 additions and 14 deletions.
diff --git a/tests/behat/features/change-sort-order.feature b/tests/behat/features/change-sort-order.feature
@@ -1,4 +1,4 @@
-@assets @retry
+@assets @retry @job1
 Feature: Change view for asset admin
   As a cms author
   I want to change the way I'm viewing files

diff --git a/tests/behat/features/file-details.feature b/tests/behat/features/file-details.feature
@@ -1,4 +1,4 @@
-@retry
+@retry @job1
 Feature: File details
   As a cms author
   I want to see file details

diff --git a/tests/behat/features/file-history.feature b/tests/behat/features/file-history.feature
@@ -1,4 +1,4 @@
-@assets @retry
+@assets @retry @job1
 Feature: View File History
   As a cms author
   I want to view the history of a file

diff --git a/tests/behat/features/file-status-icons.feature b/tests/behat/features/file-status-icons.feature
@@ -1,4 +1,4 @@
-@javascript @assets @retry
+@javascript @assets @retry @job1
 Feature: Manage file permissions
   As a cms author
   I want to see file status icons

diff --git a/tests/behat/features/file-upload-state.feature b/tests/behat/features/file-upload-state.feature
@@ -1,4 +1,4 @@
-@javascript @assets @retry
+@javascript @assets @retry @job1
 Feature: Upload file state
   As a cms author
   I want the file state to work correctly

diff --git a/tests/behat/features/insert-an-image.feature b/tests/behat/features/insert-an-image.feature
@@ -1,4 +1,4 @@
-@assets @retry @in-modal
+@assets @retry @in-modal @job1
 Feature: Insert an image into a page
   As a cms author
   I want to insert an image into a page

diff --git a/tests/behat/features/manage-file-permissions.feature b/tests/behat/features/manage-file-permissions.feature
@@ -1,4 +1,4 @@
-@javascript @assets @retry
+@javascript @assets @retry @job2
 Feature: Manage file permissions
   As a cms author
   I want to set permissions on files

diff --git a/tests/behat/features/manage-files.feature b/tests/behat/features/manage-files.feature
@@ -1,4 +1,4 @@
-@javascript @assets @retry
+@javascript @assets @retry @job2
 Feature: Manage files
   As a cms author
   I want to upload and manage files within the CMS

diff --git a/tests/behat/features/multi-file-upload-field.feature b/tests/behat/features/multi-file-upload-field.feature
@@ -1,4 +1,4 @@
-@assets @retry
+@assets @retry @job2
 Feature: Multi file Upload field
   As a cms author
   I want to interact with the upload field to select files

diff --git a/tests/behat/features/replace-file.feature b/tests/behat/features/replace-file.feature
@@ -1,4 +1,4 @@
-@assets @retry
+@assets @retry @job3
 Feature: Replace a file with a new file
   As a cms author
   I want to upload a new file that will replace an existing file

diff --git a/tests/behat/features/single-file-upload-field.feature b/tests/behat/features/single-file-upload-field.feature
@@ -1,4 +1,4 @@
-@assets @retry
+@assets @retry @job3
 Feature: Single file Upload field
   As a cms author
   I want to interact with the upload field to select a file

diff --git a/tests/behat/features/table-view.feature b/tests/behat/features/table-view.feature
@@ -1,4 +1,4 @@
-@assets @retry
+@assets @retry @job3
 Feature: Change view for asset admin
   As a cms author
   I want to change the way I'm viewing files

diff --git a/tests/behat/features/wysiwyg-embed-toolbar.feature b/tests/behat/features/wysiwyg-embed-toolbar.feature
@@ -1,4 +1,4 @@
-@assets @retry
+@assets @retry @job3
 Feature: Use the WYSIWYG embed toolbar
   As a cms author
   I want to edit and delete embeds using the context toolbar

diff --git a/tests/behat/features/wysiwyg-image-toolbar.feature b/tests/behat/features/wysiwyg-image-toolbar.feature
@@ -1,4 +1,4 @@
-@assets @retry
+@assets @retry @job3
 Feature: Use the WYSIWYG image toolbar
   As a cms author
   I want to edit and delete images using the context toolbar