Skip to content

Commit ef7a76e

Browse files
authored
Merge branch 'develop' into db_contributions
2 parents 6c9c34d + 7f82e4d commit ef7a76e

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+914
-223
lines changed

.travis.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ php:
33
- 7.0
44
- 7.1
55
- 7.2
6+
- 7.3
67
install: composer install --no-interaction --prefer-source
78
env:
89
matrix:

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ Each Magento source file included in this distribution is licensed under AGPL 3.
6969
See the license [here][] or contact [[email protected]][] for a copy.
7070

7171
<!-- Link Definitions -->
72-
[Getting Started]: https://devdocs.magento.com/mftf/getting-started.html
72+
[Getting Started]: docs/getting-started.md
7373
[Contribution Guidelines]: .github/CONTRIBUTING.html
7474
[DevDocs Contributing]: https://github.com/magento/devdocs/blob/master/.github/CONTRIBUTING.md
7575

composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"sort-packages": true
1010
},
1111
"require": {
12-
"php": "7.0.2|7.0.4|~7.0.6|~7.1.0|~7.2.0",
12+
"php": "7.0.2||7.0.4||~7.0.6||~7.1.0||~7.2.0||~7.3.0",
1313
"allure-framework/allure-codeception": "~1.3.0",
1414
"ext-curl": "*",
1515
"codeception/codeception": "~2.3.4 || ~2.4.0 ",
@@ -25,7 +25,7 @@
2525
"require-dev": {
2626
"squizlabs/php_codesniffer": "~3.2",
2727
"sebastian/phpcpd": "~3.0 || ~4.0",
28-
"brainmaestro/composer-git-hooks": "^2.3",
28+
"brainmaestro/composer-git-hooks": "^2.3.1",
2929
"doctrine/cache": "<1.7.0",
3030
"codeception/aspect-mock": "^3.0",
3131
"goaop/framework": "2.2.0",

composer.lock

Lines changed: 11 additions & 10 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

docs/commands/codeception.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,27 +12,27 @@ To run the Codeception testing framework commands directly, change your director
1212
Run all the generated tests:
1313

1414
```bash
15-
../../../vendor/bin/codecept run functional -c dev/tests/acceptance/codeception.yml
15+
vendor/bin/codecept run functional -c dev/tests/acceptance/codeception.yml
1616
```
1717

1818
Run all tests without the `<group value="skip"/>` [annotation][]:
1919

2020
```bash
21-
../../../vendor/bin/codecept run functional --skip-group skip -c dev/tests/acceptance/codeception.yml
21+
vendor/bin/codecept run functional --skip-group skip -c dev/tests/acceptance/codeception.yml
2222
```
2323

2424
Run all tests with the `<group value="example"/>` [annotation][] but with no `<group value="skpip"/>`:
2525

2626
```bash
27-
../../../vendor/bin/codecept run functional --group example --skip-group skip -c dev/tests/acceptance/codeception.yml
27+
vendor/bin/codecept run functional --group example --skip-group skip -c dev/tests/acceptance/codeception.yml
2828
```
2929

3030
## `codecept run`
3131

3232
`codecept run` runs the test suites:
3333

3434
```bash
35-
../../../vendor/bin/codecept run
35+
vendor/bin/codecept run
3636
```
3737

3838
<div class="bs-callout bs-callout-info">
@@ -81,5 +81,5 @@ Options:
8181

8282
<!-- Link definitions -->
8383

84-
[mftf tool]: mftf.html
85-
[annotation]: ../test/annotations.html
84+
[mftf tool]: mftf.md
85+
[annotation]: ../test/annotations.md

docs/commands/mftf.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -384,11 +384,11 @@ vendor/bin/mftf upgrade:tests /Users/user/magento2/app/code/Magento/Catalog/Test
384384

385385
<!-- LINK DEFINITIONS -->
386386

387-
[configuration]: ../configuration.html
387+
[configuration]: ../configuration.md
388388
[Reference]: #reference
389389
[build]: #buildproject
390390
[setup]: #setupenv
391-
[Reporting]: ../reporting.html
391+
[Reporting]: ../reporting.md
392392

393393
<!-- Abbreviations -->
394394

docs/configuration.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ Example:
160160
MAGENTO_RESTAPI_SERVER_PORT=5000
161161
```
162162

163-
### *_BP
163+
### \*_BP
164164

165165
Settings to override base paths for the framework.
166166
You can use it when the MFTF is applied as a separate tool.
@@ -254,6 +254,6 @@ BROWSER=firefox
254254
<!-- Link definitions -->
255255

256256
[`MAGENTO_CLI_COMMAND_PATH`]: #magento_cli_command_path
257-
[generateDate]: test/actions.html#generatedate
258-
[mftf]: commands/mftf.html
257+
[generateDate]: test/actions.md#generatedate
258+
[mftf]: commands/mftf.md
259259
[timezones]: http://php.net/manual/en/timezones.php

docs/credentials.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ The decrypted values are only available in the `.credentials` file.
9494
The MFTF tests delivered with Magento application do not use credentials and do not cover external services, because of sensitivity of the data.</div>
9595

9696
<!-- Link definitions -->
97-
[`fillField`]: test/actions.html#fillfield
98-
[data]: data.html
99-
[initial setup]: getting-started.html
100-
[test reports]: reporting.html
97+
[`fillField`]: test/actions.md#fillfield
98+
[data]: data.md
99+
[initial setup]: getting-started.md
100+
[test reports]: reporting.md

docs/data.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ This emphasizes the practice for the `stepKey` of `createData` to be descriptive
7474

7575
## Use data returned by test actions
7676

77-
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>`.
77+
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>`.
7878

7979
Further in the test, the data grabbed by the `someSelector` selector can be referenced using the `stepKey` value. In this case, it is `grabStepKey`.
8080

@@ -89,7 +89,7 @@ The following example shows the usage of `grabValueFrom` in testing, where the r
8989

9090
The data to operate against can be included as literals in a test. Hard-coded data input can be useful in assertions.
9191

92-
See also [Actions](./test/actions.html).
92+
See also [Actions](./test/actions.md).
9393

9494
```xml
9595
userInput="We'll email you an order confirmation with details and tracking info."

docs/extending.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -363,7 +363,7 @@ __Use case__: Create an entity named `DivPanelGreen`, which is similar to the `D
363363
```
364364

365365
<!-- Link definitions -->
366-
[test]: ./test.html
367-
[data]: ./data.html
368-
[action group]: ./test/action-groups.html
369-
[actions]: ./test/actions.html
366+
[test]: ./test.md
367+
[data]: ./data.md
368+
[action group]: ./test/action-groups.md
369+
[actions]: ./test/actions.md

0 commit comments

Comments
 (0)