magento · jilu1 · Jul 9, 2020 · Mar 5, 2020 · Mar 10, 2020 · Mar 10, 2020
diff --git a/.gitignore b/.gitignore
@@ -19,3 +19,4 @@ dev/tests/mftf.log
 dev/tests/docs/*
 dev/tests/_output
 dev/tests/functional.suite.yml
+
diff --git a/.travis.yml b/.travis.yml
@@ -1,13 +1,17 @@
 language: php
 php:
-  - 7.1
-  - 7.2
   - 7.3
+  - 7.4
+services:
+  - docker
+before_install:
+  - docker run -d -p 4444:4444 -v /dev/shm:/dev/shm selenium/standalone-chrome:3.141.59-zirconium
 install: composer install --no-interaction --prefer-source
 env:
   matrix:
     - VERIFICATION_TOOL=phpunit-checks
     - VERIFICATION_TOOL=static-checks
+    - VERIFICATION_TOOL=functional
 script:
   - bin/$VERIFICATION_TOOL
 after_success:

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,94 @@
 Magento Functional Testing Framework Changelog
 ================================================
-2.6.3
+3.0.0
+---------
+
+### Enhancements
+
+* Customizability
+    * Introduced MFTF helpers `<helper>` to create custom actions outside of MFTF.[See custom-helpers page for details](./docs/custom-helpers.md)
+    * Removed deprecated actions `<executeSelenium>` and `<performOn>`.
+    * `<group value="skip"/>` no longer skips a test. Instead, the test is added to the `skip` group.
+
+* Maintainability
+    * Added support for PHP 7.4.
+    * Added support for PHPUnit 9.
+    * Dropped support for PHP 7.0, 7.1, 7.2.
+    * Schema updates for test entities to only allow single entity per file except Data and Metadata.
+    * Support for sub-folders in test modules.
+    * Removed support to read test entities from `<magento>dev/tests/acceptance/tests/functional/Magento/FunctionalTest`. 
+    * Removed file attribute for `<module>` in suiteSchema.
+    * Removed action `pauseExecution` and added `pause`. [See actions page for details](./docs/test/actions.md#pause)
+    * Removed action `formatMoney` and added `formatCurrency`. [See actions page for details](./docs/test/actions.md#formatcurrency) 
+    * Improved assertion actions to support PHPUnit 9 changes. [See assertions page for details](./docs/test/assertions.md)   
+        *  Added new actions: `assertEqualsWithDelta`, `assertNotEqualsWithDelta`, `assertEqualsCanonicalizing`, `assertNotEqualsCanonicalizing`, `assertEqualsIgnoringCase`, `assertNotEqualsIgnoringCase`.
+        *  Added new actions: `assertStringContainsString`, `assertStringNotContainsString`, `assertStringContainsStringIgnoringCase`, `assertStringNotContainsStringIgnoringCase` for string haystacks.
+        *  Removed actions: `assertInternalType`, `assertNotInternalType`, `assertArraySubset`.
+        *  Removed delta option from `assertEquals` and `assertNotEquals`.   
+    * Added static check `deprecatedEntityUsage` that checks and reports references to deprecated test entities.
+    * Added static check `annotations` that checks and reports missing annotations in tests.
+    * Updated `bin/mftf static-checks` command to allow executing static-checks defined in `staticRuleSet.json` by default. [See command page for details](./docs/commands/mftf.md#static-checks)
+    * Added support for Two-Factor Authentication (2FA). [See configure-2fa page for details](./docs/configure-2fa.md)
+    * Added new upgrade script to remove unused arguments from action groups.
+    * `mftf.log` no longer includes notices and warnings at test execution time.
+    * Added unhandledPromptBehavior driver capability for Chrome 75+ support.
+    * Added the Chrome option `--ignore-certificate-errors` to `functional.suite.dist.yml`.
+
+* Traceability
+    * Removed `--debug` option `NONE` to disallow ability to turn off schema validation.
+    * Notices added for test entity naming convention violations.
+    * Metadata file names changed to `*Meta.xml`.
+    * Introduced new `.env` configuration `VERBOSE_ARTIFACTS` to toggle saving attachments in Allure. [See configuration page for details](./docs/configuration.md)  
+    * Changed the `bin/mftf static-checks` error file directory from the current working directory to `TESTS_BP/tests/_output/static-results/`.
+
+* Readability
+    * Support only nested assertion syntax [See assertions page for details](./docs/test/assertions.md).      
+    * Documented [3.0.0 Backward Incompatible Changes](./docs/backward-incompatible-changes.md).
+    * Removed blacklist/whitelist terminology in MFTF. 
+
+* Upgrade scripts added to upgrade tests to MFTF major version requirements. See upgrade instructions below.
+* Bumped dependencies to support PHP/PHPUnit upgrade.
+
+### Upgrade Instructions
+
+* Run `bin/mftf reset --hard` to remove old generated configurations.
+* Run `bin/mftf build:project` to generate new configurations.
+* Run `bin/mftf upgrade:tests`. [See command page for details](./docs/commands/mftf.md#upgradetests).
+* After running the above command, some tests may need manually updates:
+    * Remove all occurrences of `<executeInSelenium>` and `<performOn>`.
+    * Remove all occurrences of `<module file=""/>` from any `<suite>`s.
+    * Ensure all `<assert*>` actions in your tests have a valid schema.
+* Lastly, try to generate all tests. Tests should all be generated as a result of the upgrades.
+    * If not, the most likely issue will be a changed XML schema. Check error messaging and search your codebase for the attributes listed.
+
+### Fixes
+
+* Throw exception during generation when leaving out .url for `amOnPage`.
+* `request_timeout` and `connection_timeout` added to functional.suite.yml.dist.
+* Fixed `ModuleResolver` to resolve test modules moved out of deprecated path.
+* Fixed issue of resolving arguments of type `entity` in action groups within a custom helper.
+* Fixed reporting issue in output file for `testDependencies` static check.
+* Fixed a bug in `actionGroupArguments` static check when action group filename is missing `ActionGroup`.
+* Fixed issue of running suites under root `_suite` directory in Standalone MFTF.
+* Fixed issue with custom helper usage in suites.
+* Fixed issue with decryption of secrets during data entity creation.
+* Fixed issue with merging of `array` items in data entity.
+* Fixed issue where an extended data entity would not merge array items. Array items should merge properly now.
+* Fixed issue where Chrome remains running after MFTF suite finishes.
+* Fixed javascript error seen on Chrome 83 for dragAndDrop action.
+* Fixed allure issue when `WebDriverCurlException` is encountered in `afterStep`.
+
+### GitHub Issues/Pull Requests
+
+* [#567](https://github.com/magento/magento2-functional-testing-framework/pull/567) -- log attachments for failed requests.
+
+### Demo Video links
+
+* [MFTF 3.0.0 RC1](https://www.youtube.com/watch?v=z0ZaZCmnw-A&t=2s)
+* [MFTF 3.0.0 RC2](https://www.youtube.com/watch?v=BJOQAw6dX5o)
+* [MFTF 3.0.0 RC3](https://www.youtube.com/watch?v=scLb7pi8pR0)
+
+2.6.4
 -----
 
 ### Fixes
@@ -70,9 +158,9 @@ Magento Functional Testing Framework Changelog
         * Command verifies and troubleshoots some configuration steps required for running tests
         * Please see DevDocs for more details
     * `<*Data>` actions now contain `API Endpoint` and `Request Header` artifacts.
-    * Introduced new `.env` configurations `ENABLE_BROWSER_LOG` and `BROWSER_LOG_BLACKLIST`
+    * Introduced new `.env` configurations `ENABLE_BROWSER_LOG` and `BROWSER_LOG_BLOCKLIST`
         * Configuration enables allure artifacts for browser log entries if they are present after the step.
-        * Blacklist filters out logs from specific sources.
+        * Blocklist filters out logs from specific sources.
 * Customizability
     * Introduced `timeout=""` to `magentoCLI` actions.
 

diff --git a/bin/blacklist.txt → bin/blocklist.txt b/bin/blacklist.txt → bin/blocklist.txt
@@ -3,7 +3,7 @@
 #                                                                 #
 # THIS FILE CANNOT CONTAIN BLANK LINES                            #
 ###################################################################
-bin/blacklist.txt
+bin/blocklist.txt
 dev/tests/static/Magento/Sniffs/Commenting/FunctionCommentSniff.php
 dev/tests/static/Magento/Sniffs/Commenting/VariableCommentSniff.php
 dev/tests/verification/_generated
diff --git a/bin/copyright-check b/bin/copyright-check
@@ -5,13 +5,13 @@
 
 
 FILE_EXTENSIONS='.php\|.xml\|.xsd'
-BLACKLIST='bin/blacklist.txt'
+BLOCKLIST='bin/blocklist.txt'
 RESULT=''
 
 # Iterate through the list of tracked files
 # that have the expected extensions
 # that are not ignored
-for i in `git ls-tree --full-tree -r --name-only HEAD | grep $FILE_EXTENSIONS | grep -v -f $BLACKLIST`
+for i in `git ls-tree --full-tree -r --name-only HEAD | grep $FILE_EXTENSIONS | grep -v -f $BLOCKLIST`
 do
     if echo `cat $i` | grep -q -v "Copyright © Magento, Inc. All rights reserved."; then
         # Copyright is missing

diff --git a/bin/copyright-check.bat b/bin/copyright-check.bat
@@ -3,7 +3,7 @@
 
 @echo off
 SETLOCAL EnableDelayedExpansion
-SET BLACKLIST_FILE=bin/blacklist.txt
+SET BLOCKLIST_FILE=bin/blocklist.txt
 SET i=0
 
 FOR /F %%x IN ('git ls-tree --full-tree -r --name-only HEAD') DO (
@@ -12,14 +12,14 @@ FOR /F %%x IN ('git ls-tree --full-tree -r --name-only HEAD') DO (
     if "%%~xx"==".xml" set GOOD_EXT=1
     if "%%~xx"==".xsd" set GOOD_EXT=1
     IF DEFINED GOOD_EXT (
-        SET BLACKLISTED=
-        FOR /F "tokens=* skip=5" %%f IN (%BLACKLIST_FILE%) DO (
+        SET BLOCKLISTED=
+        FOR /F "tokens=* skip=5" %%f IN (%BLOCKLIST_FILE%) DO (
             SET LINE=%%x
             IF NOT "!LINE!"=="!LINE:%%f=!" (
-                SET BLACKLISTED=1
+                SET BLOCKLISTED=1
             )
         )
-        IF NOT DEFINED BLACKLISTED (
+        IF NOT DEFINED BLOCKLISTED (
             FIND "Copyright © Magento, Inc. All rights reserved." %%x >nul
             IF ERRORLEVEL 1 (
                 SET /A i+=1

diff --git a/bin/functional b/bin/functional
@@ -0,0 +1,11 @@
+# Copyright © Magento, Inc. All rights reserved.
+# See COPYING.txt for license details.
+
+set -e
+
+echo "==============================="
+echo "   EXECUTE Functional Tests    "
+echo "==============================="
+bin/mftf build:project
+bin/mftf run:test DevDocsTest -f
+bin/mftf run:test FormatCurrencyTest -f
diff --git a/composer.json b/composer.json
@@ -2,53 +2,54 @@
     "name": "magento/magento2-functional-testing-framework",
     "description": "Magento2 Functional Testing Framework",
     "type": "library",
-    "version": "2.6.4",
+    "version": "3.0.0",
     "license": "AGPL-3.0",
     "keywords": ["magento", "automation", "functional", "testing"],
     "config": {
         "sort-packages": true
     },
     "require": {
-        "php": "~7.1.0||~7.2.0||~7.3.0",
+        "php": "^7.3",
         "ext-curl": "*",
         "ext-dom": "*",
+        "ext-intl": "*",
         "ext-json": "*",
         "ext-openssl": "*",
-        "allure-framework/allure-codeception": "~1.3.0",
+        "allure-framework/allure-codeception": "~1.4.0",
         "aws/aws-sdk-php": "^3.132",
-        "codeception/codeception": "~2.4.5",
-        "composer/composer": "^1.6",
+        "codeception/codeception": "~4.1.4",
+        "codeception/module-asserts": "^1.1",
+        "codeception/module-sequence": "^1.0",
+        "codeception/module-webdriver": "^1.0",
+        "composer/composer": "^1.9",
         "csharpru/vault-php": "~3.5.3",
         "csharpru/vault-php-guzzle6-transport": "^2.0",
-        "flow/jsonpath": ">0.2",
-        "fzaninotto/faker": "^1.6",
-        "monolog/monolog": "^1.0",
+        "monolog/monolog": "^1.17",
         "mustache/mustache": "~2.5",
         "php-webdriver/webdriver": "^1.8.0",
+        "spomky-labs/otphp": "^10.0",
         "symfony/console": "^4.4",
-        "symfony/finder": "^4.4",
-        "symfony/http-foundation": "^4.4",
-        "symfony/mime": "^4.4",
+        "symfony/finder": "^5.0",
+        "symfony/http-foundation": "^5.0",
+        "symfony/mime": "^5.0",
         "symfony/process": "^4.4",
-        "vlucas/phpdotenv": "^2.4"
+        "vlucas/phpdotenv": "^2.4",
+        "weew/helpers-array": "^1.3"
     },
     "require-dev": {
-        "squizlabs/php_codesniffer": "~3.2",
-        "sebastian/phpcpd": "~3.0 || ~4.0",
         "brainmaestro/composer-git-hooks": "^2.3.1",
-        "doctrine/cache": "<1.7.0",
-        "codeception/aspect-mock": "^3.0",
-        "goaop/framework": "2.2.0",
         "codacy/coverage": "^1.4",
-        "phpmd/phpmd": "^2.6.0",
-        "phpunit/phpunit": "~6.5.0 || ~7.0.0",
-        "rregeer/phpunit-coverage-check": "^0.1.4",
+        "codeception/aspect-mock": "^3.0",
+        "doctrine/cache": "<1.7.0",
+        "goaop/framework": "~2.3.4",
         "php-coveralls/php-coveralls": "^1.0",
+        "phpmd/phpmd": "^2.8.0",
+        "phpunit/phpunit": "^9.0",
+        "rregeer/phpunit-coverage-check": "^0.1.4",
+        "sebastian/phpcpd": "~5.0.0",
+        "squizlabs/php_codesniffer": "~3.5.4",
         "symfony/stopwatch": "~3.4.6"
     },
-    "suggest": {
-        "epfremme/swagger-php": "^2.0"
-    },
     "replace": {
         "facebook/webdriver": "^1.7.1"
     },
Original file line number	Diff line number	Diff line change
Expand Up		@@ -19,3 +19,4 @@ dev/tests/mftf.log
		dev/tests/docs/*
		dev/tests/_output
		dev/tests/functional.suite.yml