Skip to content

Commit 0ec0c87

Browse files
jilu1jilu1
authored
Merge pull request magento#10 from magento-commerce/3.2.0-RC
3.2.0 RC to Maser
2 parents b6f86b3 + be2f5cd commit 0ec0c87

File tree

99 files changed

+3192
-324
lines changed

Some content is hidden

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

99 files changed

+3192
-324
lines changed

‎.github/workflows/main.yml

+152
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,152 @@
1+
# Copyright © Magento, Inc. All rights reserved.
2+
# See COPYING.txt for license details.
3+
4+
name: CI
5+
6+
on: [pull_request]
7+
8+
jobs:
9+
unit-tests:
10+
name: Unit Tests
11+
runs-on: ubuntu-latest
12+
strategy:
13+
fail-fast: false
14+
matrix:
15+
php-versions: ['7.3', '7.4']
16+
steps:
17+
- uses: actions/checkout@v2
18+
19+
- name: Setup PHP
20+
uses: shivammathur/setup-php@master
21+
with:
22+
php-version: ${{ matrix.php-versions }}
23+
extensions: curl, dom, intl, json, openssl
24+
25+
- name: Cache Composer packages
26+
id: composer-cache
27+
uses: actions/cache@v2
28+
with:
29+
path: vendor
30+
key: ${{ runner.os }}-php-${{ hashFiles('**/composer.lock') }}
31+
restore-keys: |
32+
${{ runner.os }}-php-
33+
34+
- name: Install dependencies
35+
if: steps.composer-cache.outputs.cache-hit != 'true'
36+
run: composer install --prefer-dist --no-progress --no-suggest
37+
38+
- name: Run tests
39+
run: vendor/bin/phpunit --configuration dev/tests/phpunit.xml --testsuite unit --coverage-clover clover.xml
40+
41+
- name: Monitor coverage
42+
if: github.event_name == 'pull_request'
43+
uses: slavcodev/coverage-monitor-action@1.1.0
44+
with:
45+
github_token: ${{ secrets.GITHUB_TOKEN }}
46+
clover_file: "clover.xml"
47+
threshold_alert: 10
48+
threshold_warning: 20
49+
50+
verification-tests:
51+
name: Verification Tests
52+
runs-on: ubuntu-latest
53+
strategy:
54+
fail-fast: false
55+
matrix:
56+
php-versions: ['7.3', '7.4']
57+
steps:
58+
- uses: actions/checkout@v2
59+
60+
- name: Setup PHP
61+
uses: shivammathur/setup-php@master
62+
with:
63+
php-version: ${{ matrix.php-versions }}
64+
extensions: curl, dom, intl, json, openssl
65+
66+
- name: Cache Composer packages
67+
id: composer-cache
68+
uses: actions/cache@v2
69+
with:
70+
path: vendor
71+
key: ${{ runner.os }}-php-${{ hashFiles('**/composer.lock') }}
72+
restore-keys: |
73+
${{ runner.os }}-php-
74+
75+
- name: Install dependencies
76+
if: steps.composer-cache.outputs.cache-hit != 'true'
77+
run: composer install --prefer-dist --no-progress --no-suggest
78+
79+
- name: Run tests
80+
run: vendor/bin/phpunit --configuration dev/tests/phpunit.xml --testsuite verification
81+
82+
static-tests:
83+
name: Static Tests
84+
runs-on: ubuntu-latest
85+
strategy:
86+
fail-fast: false
87+
matrix:
88+
php-versions: ['7.3', '7.4']
89+
steps:
90+
- uses: actions/checkout@v2
91+
92+
- name: Setup PHP
93+
uses: shivammathur/setup-php@master
94+
with:
95+
php-version: ${{ matrix.php-versions }}
96+
extensions: curl, dom, intl, json, openssl
97+
98+
- name: Cache Composer packages
99+
id: composer-cache
100+
uses: actions/cache@v2
101+
with:
102+
path: vendor
103+
key: ${{ runner.os }}-php-${{ hashFiles('**/composer.lock') }}
104+
restore-keys: |
105+
${{ runner.os }}-php-
106+
107+
- name: Install dependencies
108+
if: steps.composer-cache.outputs.cache-hit != 'true'
109+
run: composer install --prefer-dist --no-progress --no-suggest
110+
111+
- name: Run tests
112+
run: bin/static-checks
113+
114+
functional-tests:
115+
name: Functional Tests
116+
runs-on: ubuntu-latest
117+
strategy:
118+
fail-fast: false
119+
matrix:
120+
php-versions: ['7.3', '7.4']
121+
122+
services:
123+
chrome:
124+
image: selenium/standalone-chrome:3.141.59-zirconium
125+
ports:
126+
- 4444:4444
127+
steps:
128+
- uses: actions/checkout@v2
129+
130+
- name: Setup PHP
131+
uses: shivammathur/setup-php@master
132+
with:
133+
php-version: ${{ matrix.php-versions }}
134+
extensions: curl, dom, intl, json, openssl
135+
136+
- name: Cache Composer packages
137+
id: composer-cache
138+
uses: actions/cache@v2
139+
with:
140+
path: vendor
141+
key: ${{ runner.os }}-php-${{ hashFiles('**/composer.lock') }}
142+
restore-keys: |
143+
${{ runner.os }}-php-
144+
145+
- name: Install dependencies
146+
if: steps.composer-cache.outputs.cache-hit != 'true'
147+
run: composer install --prefer-dist --no-progress --no-suggest
148+
149+
- name: Run tests
150+
run: bin/functional
151+
152+

‎.travis.yml

-18
This file was deleted.

‎CHANGELOG.md

+28-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,34 @@
11
Magento Functional Testing Framework Changelog
22
================================================
3+
4+
3.2.0
5+
---------
6+
7+
### Enhancements
8+
9+
* Usability
10+
* Introduced error tolerance during test and suite generation. See the [command page](./docs/commands/mftf.md#error-tolerance-during-generation) for details.
11+
Addressed github issue [#276](https://github.com/magento/magento2-functional-testing-framework/issues/276).
12+
13+
* Maintainability
14+
* Updated annotation static-check to check all required annotations.
15+
16+
### Fixes
17+
18+
* Fixed issue where CUSTOM_MODULE_PATHS env variable does not use all paths.
19+
* Fixed issue where run:test only records the last failed test in `failed` file.
20+
21+
3.1.1
22+
---------
23+
24+
* Traceability
25+
* Removed `travis.yml` and replaced with `.github/workflows/main.yml`
26+
27+
### Fixes
28+
Fixed issue with XPath locators for waits in MagentoPwaWebDriver.
29+
330
3.1.0
4-
________
31+
---------
532

633
### Enhancements
734

‎bin/functional

+1
Original file line numberDiff line numberDiff line change
@@ -7,5 +7,6 @@ echo "==============================="
77
echo " EXECUTE Functional Tests "
88
echo "==============================="
99
bin/mftf build:project
10+
bin/mftf run:test DeprecatedDevDocsTest -f
1011
bin/mftf run:test DevDocsTest -f
1112
bin/mftf run:test FormatCurrencyTest -f

‎composer.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name": "magento/magento2-functional-testing-framework",
33
"description": "Magento2 Functional Testing Framework",
44
"type": "library",
5-
"version": "3.1.0",
5+
"version": "3.2.0",
66
"license": "AGPL-3.0",
77
"keywords": ["magento", "automation", "functional", "testing"],
88
"config": {
@@ -63,7 +63,7 @@
6363
},
6464
"autoload-dev": {
6565
"psr-4": {
66-
"tests\\unit\\": "dev/tests/unit"
66+
"tests\\": "dev/tests"
6767
}
6868
},
6969
"scripts": {

‎composer.lock

+3-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)