Merge branch '2.2' into 2

silverstripe · Jul 22, 2024 · 92d0b9b · 92d0b9b
2 parents bea2d5c + 43413e9
commit 92d0b9b
Show file tree

Hide file tree

Showing 18 changed files with 18 additions and 18 deletions.
diff --git a/tests/behat/features/gridfield-import.feature b/tests/behat/features/gridfield-import.feature
@@ -1,4 +1,4 @@
-@retry
+@retry @job1
 Feature: Import in GridField
   As a site owner
   I want confidence that only users with permission can import records

diff --git a/tests/behat/features/gridfield-navigation.feature b/tests/behat/features/gridfield-navigation.feature
@@ -1,4 +1,4 @@
-@retry
+@retry @job1
 Feature: Search in GridField
   As an author
   I want to navigate through the filtered and sorted GridField list

diff --git a/tests/behat/features/gridfield-search.feature b/tests/behat/features/gridfield-search.feature
@@ -1,4 +1,4 @@
-@retry
+@retry @job1
 Feature: Search in GridField
   As an author
   I want to search an item in the CMS

diff --git a/tests/behat/features/gridfield-toast-messages.feature b/tests/behat/features/gridfield-toast-messages.feature
@@ -1,4 +1,4 @@
-@retry
+@retry @job1
 Feature: Show toast messages
   As an author
   I want to see toast message in the CMS when I create, edit, delete, publish, unpublish, archive a record

diff --git a/tests/behat/features/gridfield-with-arbitrarydata.feature b/tests/behat/features/gridfield-with-arbitrarydata.feature
@@ -1,4 +1,4 @@
-@retry
+@retry @job2
 Feature: Use Gridfield with arbitrary data
   As a developer
   I want to be able to view and edit data from some arbitrary source

diff --git a/tests/behat/features/gridfield-with-arraydata.feature b/tests/behat/features/gridfield-with-arraydata.feature
@@ -1,4 +1,4 @@
-@retry
+@retry @job2
 Feature: Use Gridfield with ArrayData
   As a developer
   I want to be able to view read-only data from some arbitrary source

diff --git a/tests/behat/features/login.feature b/tests/behat/features/login.feature
@@ -1,4 +1,4 @@
-@retry
+@retry @job2
 Feature: Log in
   As an site owner
   I want to access to the CMS to be secure

diff --git a/tests/behat/features/lostpassword.feature b/tests/behat/features/lostpassword.feature
@@ -1,4 +1,4 @@
-@retry
+@retry @job2
 Feature: Lost Password
   As a site owner
   I want to be able to reset my password

diff --git a/tests/behat/features/manage-groups.feature b/tests/behat/features/manage-groups.feature
@@ -1,4 +1,4 @@
-@javascript @retry
+@javascript @retry @job2
 Feature: Manage groups
   As a site administrator
   I want to create and manage user groups on my site

diff --git a/tests/behat/features/manage-roles.feature b/tests/behat/features/manage-roles.feature
@@ -1,4 +1,4 @@
-@javascript @retry
+@javascript @retry @job2
 Feature: Manage Roles
   As a site administrator
   I want to create and manage group roles on my site

diff --git a/tests/behat/features/manage-users.feature b/tests/behat/features/manage-users.feature
@@ -1,4 +1,4 @@
-@javascript @retry
+@javascript @retry @job3
 Feature: Manage users
   As a site administrator
   I want to create and manage user accounts on my site

diff --git a/tests/behat/features/multitab-validation.feature b/tests/behat/features/multitab-validation.feature
@@ -1,4 +1,4 @@
-@retry
+@retry @job2
 Feature: Multi-tab page validation icons
   As a content author
   I want to see which tabs have form fields that failed validation

diff --git a/tests/behat/features/notfound.feature b/tests/behat/features/notfound.feature
@@ -1,4 +1,4 @@
-@retry
+@retry @job3
 Feature: Not found
   As a site owner
   I want error messages to be displayed in the context of the admin section

diff --git a/tests/behat/features/profile.feature b/tests/behat/features/profile.feature
@@ -1,4 +1,4 @@
-@retry
+@retry @job3
 Feature: Manage my own settings
   As a CMS user
   I want to be able to change personal settings

diff --git a/tests/behat/features/reauthenticate.feature b/tests/behat/features/reauthenticate.feature
@@ -1,4 +1,4 @@
-@modal @retry
+@modal @retry @job3
 Feature: Reauthenticate
   As a content editor
   I want to be able to log in through a CMS popup when my session expires

diff --git a/tests/behat/features/security-permissions.feature b/tests/behat/features/security-permissions.feature
@@ -1,4 +1,4 @@
-@javascript @retry
+@javascript @retry @job3
 Feature: Manage Security Permissions for Groups
   As a site administrator
   I want to control my user's security permissions in an intuitive way

diff --git a/tests/behat/features/site-settings.feature b/tests/behat/features/site-settings.feature
@@ -1,4 +1,4 @@
-@retry
+@retry @job3
 Feature: Site settings
   As a site owner
   I want to be able to change site settings

diff --git a/tests/behat/features/validation.feature b/tests/behat/features/validation.feature
@@ -1,4 +1,4 @@
-@retry
+@retry @job3
 Feature: Form validation
   As a content author
   I want form validation to work in the CMS