Merge remote-tracking branch 'origin/master' into develop

Author: tomreece

CHANGELOG.md

@@ -1,6 +1,11 @@
 Magento Functional Testing Framework Changelog
 ================================================
 
+2.4.4
+-----
+### Fixes
+* Fixed an issue where `_CREDS` could not be resolved when used in a suite.
+
 2.4.3
 -----
 * Customizability

bin/mftf

@@ -29,7 +29,7 @@ try {
 try {
     $application = new Symfony\Component\Console\Application();
     $application->setName('Magento Functional Testing Framework CLI');
-    $application->setVersion('2.4.3');
+    $application->setVersion('2.4.4');
     /** @var \Magento\FunctionalTestingFramework\Console\CommandListInterface $commandList */
     $commandList = new \Magento\FunctionalTestingFramework\Console\CommandList;
     foreach ($commandList->getCommands() as $command) {

composer.json

@@ -2,7 +2,7 @@
     "name": "magento/magento2-functional-testing-framework",
     "description": "Magento2 Functional Testing Framework",
     "type": "library",
-    "version": "2.4.3",
+    "version": "2.4.4",
     "license": "AGPL-3.0",
     "keywords": ["magento", "automation", "functional", "testing"],
     "config": {

composer.lock

@@ -3,6 +3,7 @@
 namespace Group;
 
 use Magento\FunctionalTestingFramework\DataGenerator\Handlers\PersistedObjectHandler;
+use Magento\FunctionalTestingFramework\DataGenerator\Handlers\CredentialStore;
 
 /**
  * Group class is Codeception Extension which is allowed to handle to all internal events.

dev/tests/verification/Resources/functionalSuiteHooks.txt

@@ -3,6 +3,7 @@
 namespace Group;
 
 use Magento\FunctionalTestingFramework\DataGenerator\Handlers\PersistedObjectHandler;
+use Magento\FunctionalTestingFramework\DataGenerator\Handlers\CredentialStore;
 
 /**
  * Group class is Codeception Extension which is allowed to handle to all internal events.

dev/tests/verification/Resources/functionalSuiteWithComments.txt

@@ -121,6 +121,7 @@ The following conventions apply to MFTF `<data>`:
 * A `<data>` file may contain multiple data entities.
 * Camel case is used for `<data>` elements. The name represents the `<data>` type. For example, a file with customer data is `CustomerData.xml`. A file for simple product would be `SimpleProductData.xml`.
 * Camel case is used for the entity name.
+* The file name must have the suffix `Data.xml`.
 
 ## Example
 
@@ -263,4 +264,4 @@ Attributes|Type|Use|Description
 [Actions]: ./test/actions.md
 [category creation]: http://docs.magento.com/m2/ce/user_guide/catalog/category-create.html
 [Credentials]: ./credentials.md
-[test actions]: ./test/actions.md#actions-returning-a-variable
+[test actions]: ./test/actions.md#actions-returning-a-variable

docs/data.md

@@ -100,7 +100,7 @@ location ~* ^/dev/tests/acceptance/utils($|/) {
 
 ## Set up an embedded MFTF {#setup-framework}
 
-This is a default setup that you would need to start using the MFTF to cover your Magento project with functional testing.
+This is the default setup of the MFTF that you would need to cover your Magento project with functional tests.
 It installs the framework using an existing Composer dependency such as `magento/magento2-functional-testing-framework`.
 If you want to set up the MFTF as a standalone tool, refer to [Set up a standalone MFTF][].
 
@@ -257,7 +257,7 @@ cd magento2-functional-testing-framework
 composer install
 ```
 
-### Step 3. Build the project   {#build-project}
+### Step 3. Build the project
 
 ```bash
 bin/mftf build:project
@@ -309,7 +309,6 @@ allure serve dev/tests/_output/allure-results/
 [allure docs]: https://docs.qameta.io/allure/
 [Allure Framework]: http://allure.qatools.ru/
 [basic configuration]: configuration.html#basic-configuration
-[build]: #build-project
 [chrome driver]: https://sites.google.com/a/chromium.org/chromedriver/downloads
 [Codeception Test execution]: https://blog.jetbrains.com/phpstorm/2017/03/codeception-support-comes-to-phpstorm-2017-1/
 [composer]: https://getcomposer.org/download/

docs/getting-started.md

@@ -0,0 +1,31 @@
+<style>
+.mftf-dl {
+  margin-bottom: 2.5em;
+}
+dl dt{
+  font-weight:400;
+}
+
+</style>
+
+# MFTF functional test reference
+
+The Magento Functional Testing Framework runs tests on every Module within Magento. These files are stored within each Module folder in the Magento repo.
+This page lists all those tests so that developers can have a good sense of what is covered.
+
+{% include mftf/mftf_data.md %}
+
+{% for item in mftf %}
+
+### {{ item.name }} 
+{% for file in item.items %}
+#### [{{ file.filename }}]({{file.repo}})
+{: .mftf-test-link}
+
+{% for test in file.tests %}
+{{test.testname}}
+  : {{test.description}}
+{: .mftf-dl}
+{% endfor %}
+{% endfor %}
+{% endfor %}