Merge branch '5.2' into 5

2024-10-22 08:05:56 +02:00 · 2024-07-21 05:29:42 +00:00 · 2024-07-21 05:29:42 +00:00 · a282afcf5d
commit a282afcf5d
parent 7e10f29817 c56e9db860
13 changed files with 13 additions and 3 deletions
--- a/tests/behat/features/apply-formatting.feature
+++ b/tests/behat/features/apply-formatting.feature
@ -1,3 +1,4 @@
+@retry @job1
 Feature: Apply rich formatting to content
  As a cms author
  I want to work with content in the way I'm used to from word processing software
--- a/tests/behat/features/create-a-page.feature
+++ b/tests/behat/features/create-a-page.feature
@ -1,3 +1,4 @@
+@retry @job1
 Feature: Create a page
  As an author
  I want to create a page in the CMS
--- a/tests/behat/features/duplicate-a-page.feature
+++ b/tests/behat/features/duplicate-a-page.feature
@ -1,3 +1,4 @@
+@retry @job1
 Feature: Duplicate a page
 	As an author
 	I want to duplicate a page in the CMS
--- a/tests/behat/features/edit-a-page.feature
+++ b/tests/behat/features/edit-a-page.feature
@ -1,3 +1,4 @@
+@retry @job1
 Feature: Edit a page
  As an author
  I want to edit a page in the CMS
--- a/tests/behat/features/insert-a-link.feature
+++ b/tests/behat/features/insert-a-link.feature
@ -1,4 +1,4 @@
-@assets @retry
+@assets @retry @job1
 Feature: Insert links into a page
 As a cms author
 I want to insert a link into my content
--- a/tests/behat/features/insert-anchor-link.feature
+++ b/tests/behat/features/insert-anchor-link.feature
@ -1,4 +1,4 @@
-@retry
+@retry @job2
 Feature: Insert links into a page
 As a cms author
 I want to insert a link into my content
--- a/tests/behat/features/manage-page-permissions.feature
+++ b/tests/behat/features/manage-page-permissions.feature
@ -1,3 +1,4 @@
+@retry @job2
 Feature: Manage page permissions
  As an administrator
  I want to manage view and edit permissions on pages
--- a/tests/behat/features/preview-a-page.feature
+++ b/tests/behat/features/preview-a-page.feature
@ -1,3 +1,4 @@
+@retry @job2
 Feature: Preview a page
  As an author
  I want to preview the page I'm editing in the CMS
--- a/tests/behat/features/publish-a-page.feature
+++ b/tests/behat/features/publish-a-page.feature
@ -1,3 +1,4 @@
+@retry @job2
 Feature: Publish a page
  As a site owner
  I want content to go to a draft site before being published
--- a/tests/behat/features/redirector-page.feature
+++ b/tests/behat/features/redirector-page.feature
@ -1,3 +1,4 @@
+@retry @job3
 Feature: Redirector Pages
  As an author
  I want to redirect to a different location
--- a/tests/behat/features/search-for-a-page.feature
+++ b/tests/behat/features/search-for-a-page.feature
@ -1,4 +1,4 @@
-@retry
+@retry @job3
 Feature: Search for a page
  As an author
  I want to search for a page in the CMS
--- a/tests/behat/features/sitetree.feature
+++ b/tests/behat/features/sitetree.feature
@ -1,3 +1,4 @@
+@retry @job3
 Feature: Sitetree
  As an author
  I want to operate the sitetree
--- a/tests/behat/features/view-reports.feature
+++ b/tests/behat/features/view-reports.feature
@ -1,3 +1,4 @@
+@retry @job3
 Feature: View Reports
  As an author
  I want to review aggregate reports on pages