Merge branch 'develop' into MQE-1439

Author: tomreece

README.md

@@ -69,7 +69,7 @@ Each Magento source file included in this distribution is licensed under AGPL 3.
 See the license [here][] or contact [license@magentocommerce.com][] for a copy.
 
 <!-- Link Definitions -->
-[Getting Started]: https://devdocs.magento.com/mftf/getting-started.html
+[Getting Started]: docs/getting-started.md
 [Contribution Guidelines]: .github/CONTRIBUTING.html
 [DevDocs Contributing]: https://github.com/magento/devdocs/blob/master/.github/CONTRIBUTING.md
 [security@magento.com]: mailto:security@magento.com

docs/commands/codeception.md

@@ -12,27 +12,27 @@ To run the Codeception testing framework commands directly, change your director
 Run all the generated tests:
 
 ```bash
-../../../vendor/bin/codecept run functional -c dev/tests/acceptance/codeception.yml
+vendor/bin/codecept run functional -c dev/tests/acceptance/codeception.yml
 ```
 
 Run all tests without the `<group value="skip"/>` [annotation][]:
 
 ```bash
-../../../vendor/bin/codecept run functional --skip-group skip  -c dev/tests/acceptance/codeception.yml
+vendor/bin/codecept run functional --skip-group skip  -c dev/tests/acceptance/codeception.yml
 ```
 
 Run all tests with the `<group value="example"/>` [annotation][] but with no `<group value="skpip"/>`:
 
 ```bash
-../../../vendor/bin/codecept run functional --group example --skip-group skip -c dev/tests/acceptance/codeception.yml
+vendor/bin/codecept run functional --group example --skip-group skip -c dev/tests/acceptance/codeception.yml
 ```
 
 ## `codecept run`
 
 `codecept run` runs the test suites:
 
 ```bash
-../../../vendor/bin/codecept run
+vendor/bin/codecept run
 ```
 
 <div class="bs-callout bs-callout-info">
@@ -81,5 +81,5 @@ Options:
 
 <!-- Link definitions -->
 
-[mftf tool]: mftf.html
-[annotation]: ../test/annotations.html
+[mftf tool]: mftf.md
+[annotation]: ../test/annotations.md

docs/commands/mftf.md

@@ -384,11 +384,11 @@ vendor/bin/mftf upgrade:tests /Users/user/magento2/app/code/Magento/Catalog/Test
 
 <!-- LINK DEFINITIONS -->
 
-[configuration]: ../configuration.html
+[configuration]: ../configuration.md
 [Reference]: #reference
 [build]: #buildproject
 [setup]: #setupenv
-[Reporting]: ../reporting.html
+[Reporting]: ../reporting.md
 
 <!-- Abbreviations -->
 

docs/configuration.md

@@ -160,7 +160,7 @@ Example:
 MAGENTO_RESTAPI_SERVER_PORT=5000
 ```
 
-### *_BP
+### \*_BP
 
 Settings to override base paths for the framework.
 You can use it when the MFTF is applied as a separate tool.
@@ -254,6 +254,6 @@ BROWSER=firefox
 <!-- Link definitions -->
 
 [`MAGENTO_CLI_COMMAND_PATH`]: #magento_cli_command_path
-[generateDate]: test/actions.html#generatedate
-[mftf]: commands/mftf.html
+[generateDate]: test/actions.md#generatedate
+[mftf]: commands/mftf.md
 [timezones]: http://php.net/manual/en/timezones.php

docs/credentials.md

@@ -94,7 +94,7 @@ The decrypted values are only available in the `.credentials` file.
 The MFTF tests delivered with Magento application do not use credentials and do not cover external services, because of sensitivity of the data.</div>
 
 <!-- Link definitions -->
-[`fillField`]: test/actions.html#fillfield
-[data]: data.html
-[initial setup]: getting-started.html
-[test reports]: reporting.html
+[`fillField`]: test/actions.md#fillfield
+[data]: data.md
+[initial setup]: getting-started.md
+[test reports]: reporting.md

docs/data.md

@@ -74,7 +74,7 @@ This emphasizes the practice for the `stepKey` of `createData` to be descriptive
 
 ## Use data returned by test actions
 
-A test can also reference data that was returned as a result of [test actions](./test/actions.html#actions-returning-a-variable), like the action `<grabValueFrom selector="someSelector" stepKey="grabStepKey>`.
+A test can also reference data that was returned as a result of [test actions](./test/actions.md#actions-returning-a-variable), like the action `<grabValueFrom selector="someSelector" stepKey="grabStepKey>`.
 
 Further in the test, the data grabbed by the `someSelector` selector can be referenced using the `stepKey` value. In this case, it is `grabStepKey`.
 
@@ -89,7 +89,7 @@ The following example shows the usage of `grabValueFrom` in testing, where the r
 
 The data to operate against can be included as literals in a test. Hard-coded data input can be useful in assertions.
 
-See also [Actions](./test/actions.html).
+See also [Actions](./test/actions.md).
 
 ```xml
 userInput="We'll email you an order confirmation with details and tracking info."

docs/extending.md

@@ -363,7 +363,7 @@ __Use case__: Create an entity named `DivPanelGreen`, which is similar to the `D
 ```
 
 <!-- Link definitions -->
-[test]: ./test.html
-[data]: ./data.html
-[action group]: ./test/action-groups.html
-[actions]: ./test/actions.html
+[test]: ./test.md
+[data]: ./data.md
+[action group]: ./test/action-groups.md
+[actions]: ./test/actions.md

docs/getting-started.md

@@ -183,7 +183,7 @@ cd dev/tests/acceptance
 ```
 
 ```bash
-../../../vendor/bin/codecept run functional
+vendor/bin/codecept run functional -c dev/tests/acceptance/codeception.yml
 ```
 
 See more commands in [`codecept`][].

docs/introduction.md

@@ -2,9 +2,6 @@
 
 [Find your MFTF version][] of the MFTF.
 
-The latest Magento 2.3 release supports MFTF 2.3.13.
-The latest Magento 2.2 release supports MFTF 2.3.8.
-
 The Magento Functional Testing Framework (MFTF) aims to replace the [Functional Testing Framework] in future releases.
 MFTF improves:
 

docs/merge_points/extend-action-groups.md

@@ -6,6 +6,8 @@ In this example we add a `<click>` command to check the checkbox that our extens
 
 ## Starting action group
 
+<!-- {% raw %} -->
+
 ```xml
 <actionGroup name="FillAdminSimpleProductForm">
     <arguments>
@@ -95,4 +97,6 @@ Note that there are now two action groups below.
     <click selector="{{AdminProductSEOSection.sectionHeader}}" stepKey="openSeoSectionAssert"/>
     <seeInField userInput="{{simpleProduct.urlKey}}" selector="{{AdminProductSEOSection.urlKeyInput}}" stepKey="assertFieldUrlKey"/>
 </actionGroup>
-```
+```
+
+<!-- {% endraw %} -->