Skip to content

Merge 2.4.4 master into develop #422

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 31 commits into from
Aug 15, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
9b5de03
Merge pull request #356 from magento/develop
KevinBKozan Jun 10, 2019
098bc0d
added file name suffix principle for data
sprankhub Jun 25, 2019
a850051
Merge pull request #374 from sprankhub/patch-1
KevinBKozan Jun 27, 2019
ec1dd8f
Merge pull request #376 from magento/develop
KevinBKozan Jun 28, 2019
e791d01
Adding testfile to repo.
dobooth Jul 29, 2019
d29d870
Merge branch 'develop' into db_mftf_testlist_md
dobooth Jul 29, 2019
7d925af
new layout. handle multiple tests.
dobooth Jul 29, 2019
235affd
SMALL_CHANGE: Minor change suggested
diazwatson Jul 30, 2019
2ca3d95
SMALL_CHANGE: Minor change suggested
diazwatson Jul 30, 2019
658dc22
Small grammar fixup.
dobooth Jul 31, 2019
4a430db
Merge pull request #403 from magento/diazwatson-patch-1
KevinBKozan Jul 31, 2019
af5fe4f
adding test reference file.
dobooth Jul 31, 2019
7fe94f7
Merge branch 'develop' into db_mftf_testlist_md
dobooth Jul 31, 2019
553a763
Merge pull request #405 from magento/develop
okolesnyk Aug 1, 2019
eb0b1cd
Merge branch 'develop' into db_mftf_testlist_md
dobooth Aug 1, 2019
4d6dbec
Merge pull request #407 from magento-devdocs/db_mftf_testlist_md
KevinBKozan Aug 1, 2019
a3b5011
Temp removal of files to fix build.
dobooth Aug 2, 2019
9e9a20f
Merge pull request #408 from magento-devdocs/db_remove_topics
KevinBKozan Aug 2, 2019
c5083b1
MQE-1691: CREDS resolution does not occur from Suite <before>
soumyau Aug 9, 2019
af1d458
Rolling up doc updates from other PRs
dobooth Aug 9, 2019
8801962
file name change
dobooth Aug 9, 2019
c9ddf79
Fix pointers
dobooth Aug 9, 2019
28ecf8c
Merge pull request #416 from magento-devdocs/db_doc_rollup
okolesnyk Aug 9, 2019
e202f07
Removed duplicate ID
dobooth Aug 12, 2019
45f0233
Merge pull request #417 from magento-devdocs/db_dupeid
KevinBKozan Aug 13, 2019
ca130c3
MQE-1510
KevinBKozan Aug 14, 2019
98db6ec
Merge pull request #415 from magento/MQE-1691
KevinBKozan Aug 14, 2019
88d6483
MQE-1699: CHANGELOG.MD and Composer version bump
KevinBKozan Aug 14, 2019
1bdb14e
Merge pull request #420 from magento/MQE-1699
KevinBKozan Aug 14, 2019
ab347cf
Merge pull request #421 from magento/MFTF-2.4.4
KevinBKozan Aug 15, 2019
2d4efac
Merge remote-tracking branch 'origin/master' into develop
tomreece Aug 15, 2019
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion bin/mftf
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down
2 changes: 1 addition & 1 deletion composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -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": {
Expand Down
2 changes: 1 addition & 1 deletion composer.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions dev/tests/verification/Resources/functionalSuiteHooks.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
3 changes: 2 additions & 1 deletion docs/data.md
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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
5 changes: 2 additions & 3 deletions docs/getting-started.md
Original file line number Diff line number Diff line change
Expand Up @@ -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][].

Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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/
Expand Down
31 changes: 31 additions & 0 deletions docs/mftf-tests.md
Original file line number Diff line number Diff line change
@@ -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 %}
35 changes: 0 additions & 35 deletions docs/selectors.md

This file was deleted.

Loading