Skip to content

Commit c275806

Browse files
authored
Merge pull request #756 from magento/MQE-2214
MQE-2214: Part 1 Docs Annual Review
2 parents 9c8ab08 + 6917199 commit c275806

File tree

6 files changed

+108
-152
lines changed

6 files changed

+108
-152
lines changed

docs/configuration.md

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
# Configuration
22

33
The `*.env` file provides additional configuration for the Magento Functional Testing Framework (MFTF).
4-
To run the MFTF on your Magento instance, specify the basic configuration values.
4+
To run MFTF on your Magento instance, specify the basic configuration values.
55
Advanced users can create custom configurations based on requirements and environment.
66

77
## Basic configuration
88

9-
These basic configuration values are __required__ and must be set by the user before the MFTF can function correctly.
9+
These basic configuration values are __required__ and must be set by the user before MFTF can function correctly.
1010

1111
### MAGENTO_BASE_URL
1212

@@ -34,7 +34,7 @@ MAGENTO_BACKEND_NAME=admin_12346
3434

3535
### MAGENTO_BACKEND_BASE_URL
3636

37-
(Optional) If you are running the Admin Panel on separate a domain, specify this value:
37+
(Optional) If you are running the Admin Panel on a separate domain, specify this value:
3838

3939
Example:
4040

@@ -64,7 +64,7 @@ MAGENTO_ADMIN_PASSWORD=1234reTyt%$7
6464

6565
## Advanced configuration
6666

67-
Depending on the environment you use, you may need to configure the MFTF more precisely by setting more configuration parameters then for basic configuration.
67+
Depending on the environment you use, you may need to configure MFTF more precisely by setting additional configuration parameters.
6868
This section describes available configuration parameters and their default values (where applicable).
6969

7070
### DEFAULT_TIMEZONE
@@ -173,8 +173,8 @@ MAGENTO_RESTAPI_SERVER_PORT=5000
173173
### \*_BP
174174

175175
Settings to override base paths for the framework.
176-
You can use it when the MFTF is applied as a separate tool.
177-
For example, when you need to place the MFTF and the Magento codebase in separate projects.
176+
You can use it when MFTF is applied as a separate tool.
177+
For example, when you need to place MFTF and the Magento codebase in separate projects.
178178

179179
```conf
180180
MAGENTO_BP
@@ -221,13 +221,13 @@ The path to where the MFTF modules mirror Magento modules.
221221
Example:
222222

223223
```conf
224-
TESTS_MODULE_PATH=~/magento2/dev/tests/acceptance/tests/functional/Magento/FunctionalTest
224+
TESTS_MODULE_PATH=~/magento2/dev/tests/acceptance/tests/functional/Magento
225225
```
226226

227227
### MODULE_ALLOWLIST
228228

229229
Use for a new module.
230-
When adding a new directory at `Magento/FunctionalTest`, add the directory name to `MODULE_ALLOWLIST` to enable the MFTF to process it.
230+
When adding a new directory at `tests/functional/Magento`, add the directory name to `MODULE_ALLOWLIST` to enable MFTF to process it.
231231

232232
Example:
233233

@@ -245,7 +245,7 @@ It points to `MAGENTO_BASE_URL` + `dev/tests/acceptance/utils/command.php`
245245
Modify the default value:
246246

247247
- for non-default Magento installation
248-
- when use a subdirectory in the `MAGENTO_BASE_URL`
248+
- when using a subdirectory in the `MAGENTO_BASE_URL`
249249

250250
Example: `dev/tests/acceptance/utils/command.php`
251251

docs/credentials.md

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,20 @@
33
When you test functionality that involves external services such as UPS, FedEx, PayPal, or SignifyD,
44
use the MFTF credentials feature to hide sensitive [data][] like integration tokens and API keys.
55

6-
Currently the MFTF supports three types of credential storage:
6+
Currently MFTF supports three types of credential storage:
77

88
- **.credentials file**
99
- **HashiCorp Vault**
1010
- **AWS Secrets Manager**
1111

1212
## Configure File Storage
1313

14-
The MFTF creates a sample file for credentials during [initial setup][]: `magento2/dev/tests/acceptance/.credentials.example`.
14+
MFTF creates a sample file for credentials during [initial setup][]: `magento2/dev/tests/acceptance/.credentials.example`.
1515
The file contains an example list of keys for fields that can require credentials.
1616

1717
### Create `.credentials`
1818

19-
To make the MFTF process the file with credentials, in the command line, navigate to `magento2/dev/tests/acceptance/` and rename `.credentials.example` to `.credentials`.
19+
To make MFTF process the file with credentials, in the command line, navigate to `magento2/dev/tests/acceptance/` and rename `.credentials.example` to `.credentials`.
2020

2121
```bash
2222
cd dev/tests/acceptance/
@@ -78,7 +78,7 @@ vendor/my_awesome_service_token=rRVSVnh3cbDsVG39oTMz4A
7878
Hashicorp vault secures, stores, and tightly controls access to data in modern computing.
7979
It provides advanced data protection for your testing credentials.
8080

81-
The MFTF works with both `vault enterprise` and `vault open source` that use `KV Version 2` secret engine.
81+
MFTF works with both `vault enterprise` and `vault open source` that use `KV Version 2` secret engine.
8282

8383
### Install vault CLI
8484

@@ -92,11 +92,11 @@ Authenticate to vault server via the vault CLI tool: [Login Vault][Login Vault].
9292
vault login -method -path
9393
```
9494

95-
**Do not** use `-no-store` command option, as the MFTF will rely on the persisted token in the token helper (usually the local filesystem) for future API requests.
95+
**Do not** use `-no-store` command option, as MFTF will rely on the persisted token in the token helper (usually the local filesystem) for future API requests.
9696

9797
### Store secrets in vault
9898

99-
The MFTF uses the `KV Version 2` secret engine for secret storage.
99+
MFTF uses the `KV Version 2` secret engine for secret storage.
100100
More information for working with `KV Version 2` can be found in [Vault KV2][Vault KV2].
101101

102102
#### Secrets path and key convention
@@ -225,7 +225,7 @@ export CREDENTIAL_AWS_ACCOUNT_ID=<Your_12_Digits_AWS_Account_ID>
225225
## Configure multiple credential storage
226226

227227
It is possible and sometimes useful to setup and use multiple credential storage at the same time.
228-
In this case, the MFTF tests are able to read secret data at runtime from all storage options, in this case MFTF use the following precedence:
228+
In this case, the MFTF tests are able to read secret data at runtime from all storage options. MFTF will use the following precedence:
229229

230230
```
231231
.credentials File > HashiCorp Vault > AWS Secrets Manager
@@ -253,7 +253,7 @@ For example, to reference secret data in the [`fillField`][] action, use the `us
253253
## Implementation details
254254

255255
The generated tests do not contain credentials values.
256-
The MFTF dynamically retrieves, encrypts, and decrypts the sensitive data during test execution.
256+
MFTF dynamically retrieves, encrypts, and decrypts the sensitive data during test execution.
257257
Decrypted credentials do not appear in the console, error logs, or [test reports][].
258258
The decrypted values are only available in the `.credentials` file or within vault.
259259

@@ -277,4 +277,4 @@ The MFTF tests delivered with Magento application do not use credentials and do
277277
[`CREDENTIAL_AWS_SECRETS_MANAGER_PROFILE`]: configuration.md#credential_aws_secrets_manager_profile
278278
[`CREDENTIAL_AWS_SECRETS_MANAGER_REGION`]: configuration.md#credential_aws_secrets_manager_region
279279
[Key Management Service]: https://aws.amazon.com/kms/
280-
[Amazon Resource Name]: https://docs.aws.amazon.com/general/latest/gr/aws-arns-and-namespaces.html
280+
[Amazon Resource Name]: https://docs.aws.amazon.com/general/latest/gr/aws-arns-and-namespaces.html

docs/data.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Input testing data
22

3-
The MFTF enables you to specify and use `<data>` entities defined in XML. Default `<data>` entities are provided for use and as templates for entity creation and manipulation.
3+
MFTF enables you to specify and use `<data>` entities defined in XML. Default `<data>` entities are provided for use and as templates for entity creation and manipulation.
44
The following diagram shows the XML structure of an MFTF data object:
55

66
![MFTF Data Object](img/data-dia.svg)
@@ -67,7 +67,7 @@ In this example:
6767
As of MFTF 2.3.6, you no longer need to differentiate between scopes (a test, a hook, or a suite) for persisted data when referencing it in tests.
6868
</div>
6969

70-
The MFTF now stores the persisted data and attempts to retrieve it using the combination of `stepKey` and the scope of where it has been called.
70+
MFTF now stores the persisted data and attempts to retrieve it using the combination of `stepKey` and the scope of where it has been called.
7171
The current scope is preferred, then widening to _test > hook > suite_ or _hook > test > suite_.
7272

7373
This emphasizes the practice for the `stepKey` of `createData` to be descriptive and unique, as a duplicated `stepKey` in both a `<test>` and `<before>` prefers the `<test>` data.

0 commit comments

Comments
 (0)