Merge branch 'develop' into web-server-rewrites

Author: tomreece

docs/commands/mftf.md

@@ -39,13 +39,13 @@ vendor/bin/mftf generate:tests
 ### Generate tests by test name
 
 ```bash
-vendor/bin/mftf generate:tests AdminLoginTest StorefrontPersistedCustomerLoginTest
+vendor/bin/mftf generate:tests AdminLoginSuccessfulTest StorefrontPersistedCustomerLoginTest
 ```
 
 ### Generate test by test and suite name
 
 ```bash
-vendor/bin/mftf generate:tests LoginSuite:AdminLoginTest
+vendor/bin/mftf generate:tests LoginSuite:AdminLoginSuccessfulTest
 ```
 
 ### Generate and run the tests for a specified group
@@ -59,18 +59,18 @@ This command cleans up the previously generated tests; generates and runs tests
 ### Generate and run particular tests
 
 ```bash
-vendor/bin/mftf run:test AdminLoginTest StorefrontPersistedCustomerLoginTest -r
+vendor/bin/mftf run:test AdminLoginSuccessfulTest StorefrontPersistedCustomerLoginTest -r
 ```
 
 This command cleans up the previously generated tests; generates and runs the `LoginAsAdminTest` and `LoginAsCustomerTest` tests.
 
 ### Generate and run particular test in a specific suite's context
 
 ```bash
-vendor/bin/mftf run:test LoginSuite:AdminLoginTest -r
+vendor/bin/mftf run:test LoginSuite:AdminLoginSuccessfulTest -r
 ```
 
-This command cleans up previously generated tests; generates and run `AdminLoginTest` within the context of the `LoginSuite`.
+This command cleans up previously generated tests; generates and run `AdminLoginSuccessfulTest` within the context of the `LoginSuite`.
 
 ### Generate and run a testManifest.txt file
 
@@ -362,7 +362,7 @@ vendor/bin/mftf run:manifest path/to/your/testManifest.txt
 Each line should contain either: one test path or one group (-g) reference.
 
 ```
-tests/functional/tests/MFTF/_generated/default/AdminLoginTestCest.php
+tests/functional/tests/MFTF/_generated/default/AdminLoginSuccessfulTestCest.php
 -g PaypalTestSuite
 tests/functional/tests/MFTF/_generated/default/SomeOtherTestCest.php
 tests/functional/tests/MFTF/_generated/default/ThirdTestCest.php

docs/test/annotations.md

@@ -112,18 +112,28 @@ Attribute|Type|Use
 
 ### severity
 
-The `<return>` element is an implementation of a [`@Severity`] Allure tag; Metadata for report.
+The `<severity>` element is an implementation of the [`@Severity`] Allure annotation, which is used to prioritise tests by severity.
 
 Attribute|Type|Use|Acceptable values
 ---|---|---|---
-`value`|string|required|`MINOR`, `AVERAGE`, `MAJOR`, `BLOCKER`, `CRITICAL`
+`value`|string|required|`MINOR`, `AVERAGE`, `MAJOR`, `CRITICAL`, `BLOCKER`
 
 #### Example
 
 ```xml
 <severity value="CRITICAL"/>
 ```
 
+#### Usage guidelines
+
+Severity Level|Usage
+---|---
+`BLOCKER`|If this test fails, the customer is completely blocked from purchasing a product.
+`CRITICAL`|This is a serious problem impacting conversion, or affecting the operation of the store.
+`MAJOR`|Store conversion rate is reduced owing to this issue. For example, something is broken or missing that impacts checkout frequency or cart volume.
+`AVERAGE`|A fault on the storefront that can negatively impact conversion rate (like UI errors or omissions), or problems with Magento admin functionality.
+`MINOR`|An application or configuration fault that has no impact on conversion rate.
+
 ### skip
 
 Use the `<skip>` element to skip a test.
@@ -213,14 +223,14 @@ Attribute|Type|Use
 
 <!-- Link definitions -->
 
-[`@Description`]: https://devhub.io/zh/repos/allure-framework-allure-phpunit#extended-test-class-or-test-method-description
-[`@Features`]: https://devhub.io/zh/repos/allure-framework-allure-phpunit#map-test-classes-and-test-methods-to-features-and-stories
+[`@Description`]: https://github.com/allure-framework/allure-phpunit#extended-test-class-or-test-method-description
+[`@Features`]: https://github.com/allure-framework/allure-phpunit#map-test-classes-and-test-methods-to-features-and-stories
 [`@group`]: http://codeception.com/docs/07-AdvancedUsage#Groups
 [`@return`]: http://codeception.com/docs/07-AdvancedUsage#Examples
-[`@Severity`]: https://devhub.io/zh/repos/allure-framework-allure-phpunit#set-test-severity
-[`@Stories`]: https://devhub.io/zh/repos/allure-framework-allure-phpunit#map-test-classes-and-test-methods-to-features-and-stories
+[`@Severity`]: https://github.com/allure-framework/allure-phpunit#set-test-severity
+[`@Stories`]: https://github.com/allure-framework/allure-phpunit#map-test-classes-and-test-methods-to-features-and-stories
 [`@TestCaseId`]: https://github.com/allure-framework/allure1/wiki/Test-Case-ID
-[`@Title`]: https://devhub.io/zh/repos/allure-framework-allure-phpunit#human-readable-test-class-or-test-method-title
+[`@Title`]: https://github.com/allure-framework/allure-phpunit#human-readable-test-class-or-test-method-title
 [description]: #description
 [features]: #features
 [group]: #group