From 5dfe03b0d5b151ab9a6a580744fd188942184472 Mon Sep 17 00:00:00 2001 From: Kevin Kozan Date: Tue, 21 Aug 2018 11:31:02 -0500 Subject: [PATCH 1/2] MQE-1216: Disable Readiness Check in default Config - removed PageReadinessExtension from codeception.dist.yml defaults --- etc/config/codeception.dist.yml | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/etc/config/codeception.dist.yml b/etc/config/codeception.dist.yml index 57582f1bd..273ede0b0 100755 --- a/etc/config/codeception.dist.yml +++ b/etc/config/codeception.dist.yml @@ -15,7 +15,6 @@ extensions: - Codeception\Extension\RunFailed - Magento\FunctionalTestingFramework\Extension\TestContextExtension - Magento\FunctionalTestingFramework\Allure\Adapter\MagentoAllureAdapter - - Magento\FunctionalTestingFramework\Extension\PageReadinessExtension config: Yandex\Allure\Adapter\AllureAdapter: deletePreviousResults: true @@ -24,15 +23,5 @@ extensions: - env - zephyrId - useCaseId - Magento\FunctionalTestingFramework\Extension\PageReadinessExtension: - driver: \Magento\FunctionalTestingFramework\Module\MagentoWebDriver - timeout: 30 - resetFailureThreshold: 3 - readinessMetrics: - - \Magento\FunctionalTestingFramework\Extension\ReadinessMetrics\DocumentReadyState - - \Magento\FunctionalTestingFramework\Extension\ReadinessMetrics\JQueryAjaxRequests - - \Magento\FunctionalTestingFramework\Extension\ReadinessMetrics\PrototypeAjaxRequests - - \Magento\FunctionalTestingFramework\Extension\ReadinessMetrics\RequireJsDefinitions - - \Magento\FunctionalTestingFramework\Extension\ReadinessMetrics\MagentoLoadingMasks params: - .env \ No newline at end of file From 6d3abc9866edff27ff0f7e7d177816551faa09f5 Mon Sep 17 00:00:00 2001 From: Kevin Kozan Date: Tue, 21 Aug 2018 11:33:44 -0500 Subject: [PATCH 2/2] MFTF 2.3.5 - Version Bump and CHANGELOG.md - version bump to 2.3.5 - updated composer version and .lock file - Changelog update --- CHANGELOG.md | 5 +++ bin/mftf | 2 +- composer.json | 2 +- composer.lock | 101 ++++++++++++++++++++++++++++++++++++++++++++------ 4 files changed, 96 insertions(+), 14 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index cf798da9f..1b6998ce1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,11 @@ Magento Functional Testing Framework Changelog ================================================ +2.3.5 +----- +### Fixes +* Removed `PageReadinessExtension` from default enabled extensions due to Jenkins instability. + 2.3.4 ----- ### Fixes diff --git a/bin/mftf b/bin/mftf index ad9952e59..e37a33835 100755 --- a/bin/mftf +++ b/bin/mftf @@ -29,7 +29,7 @@ try { try { $application = new Symfony\Component\Console\Application(); $application->setName('Magento Functional Testing Framework CLI'); - $application->setVersion('2.3.4'); + $application->setVersion('2.3.5'); /** @var \Magento\FunctionalTestingFramework\Console\CommandListInterface $commandList */ $commandList = new \Magento\FunctionalTestingFramework\Console\CommandList; foreach ($commandList->getCommands() as $command) { diff --git a/composer.json b/composer.json index c7804dcf9..c3a4a9840 100755 --- a/composer.json +++ b/composer.json @@ -2,7 +2,7 @@ "name": "magento/magento2-functional-testing-framework", "description": "Magento2 Functional Testing Framework", "type": "library", - "version": "2.3.4", + "version": "2.3.5", "license": "AGPL-3.0", "keywords": ["magento", "automation", "functional", "testing"], "config": { diff --git a/composer.lock b/composer.lock index 32a599939..d6fa0f490 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "49a38f189328c8b1a79e5787a720ac3c", + "content-hash": "996e132ba111598750baca40e9152d5f", "packages": [ { "name": "allure-framework/allure-codeception", @@ -297,16 +297,16 @@ }, { "name": "consolidation/annotated-command", - "version": "2.8.4", + "version": "2.8.5", "source": { "type": "git", "url": "https://github.com/consolidation/annotated-command.git", - "reference": "651541a0b68318a2a202bda558a676e5ad92223c" + "reference": "1e8ff512072422b850b44aa721b5b303e4a5ebb3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/consolidation/annotated-command/zipball/651541a0b68318a2a202bda558a676e5ad92223c", - "reference": "651541a0b68318a2a202bda558a676e5ad92223c", + "url": "https://api.github.com/repos/consolidation/annotated-command/zipball/1e8ff512072422b850b44aa721b5b303e4a5ebb3", + "reference": "1e8ff512072422b850b44aa721b5b303e4a5ebb3", "shasum": "" }, "require": { @@ -345,7 +345,7 @@ } ], "description": "Initialize Symfony Console commands from annotated command class methods.", - "time": "2018-05-25T18:04:25+00:00" + "time": "2018-08-18T23:51:49+00:00" }, { "name": "consolidation/config", @@ -507,16 +507,16 @@ }, { "name": "consolidation/robo", - "version": "1.3.0", + "version": "1.3.1", "source": { "type": "git", "url": "https://github.com/consolidation/Robo.git", - "reference": "ac563abfadf7cb7314b4e152f2b5033a6c255f6f" + "reference": "31f2d2562c4e1dcde70f2659eefd59aa9c7f5b2d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/consolidation/Robo/zipball/ac563abfadf7cb7314b4e152f2b5033a6c255f6f", - "reference": "ac563abfadf7cb7314b4e152f2b5033a6c255f6f", + "url": "https://api.github.com/repos/consolidation/Robo/zipball/31f2d2562c4e1dcde70f2659eefd59aa9c7f5b2d", + "reference": "31f2d2562c4e1dcde70f2659eefd59aa9c7f5b2d", "shasum": "" }, "require": { @@ -524,6 +524,8 @@ "consolidation/config": "^1.0.10", "consolidation/log": "~1", "consolidation/output-formatters": "^3.1.13", + "consolidation/self-update": "^1", + "g1a/composer-test-scenarios": "^2", "grasmash/yaml-expander": "^1.3", "league/container": "^2.2", "php": ">=5.5.0", @@ -540,7 +542,6 @@ "codeception/aspect-mock": "^1|^2.1.1", "codeception/base": "^2.3.7", "codeception/verify": "^0.3.2", - "g1a/composer-test-scenarios": "^2", "goaop/framework": "~2.1.2", "goaop/parser-reflection": "^1.1.0", "natxet/cssmin": "3.0.4", @@ -583,7 +584,50 @@ } ], "description": "Modern task runner", - "time": "2018-05-27T01:42:53+00:00" + "time": "2018-08-17T18:44:18+00:00" + }, + { + "name": "consolidation/self-update", + "version": "1.0.0", + "source": { + "type": "git", + "url": "https://github.com/consolidation/self-update.git", + "reference": "adbb784e58cc0836d8522851f7e38ee7ade0d553" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/consolidation/self-update/zipball/adbb784e58cc0836d8522851f7e38ee7ade0d553", + "reference": "adbb784e58cc0836d8522851f7e38ee7ade0d553", + "shasum": "" + }, + "require": { + "php": ">=5.5.0", + "symfony/console": "^2.8|^3|^4", + "symfony/filesystem": "^2.5|^3|^4" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.x-dev" + } + }, + "autoload": { + "psr-4": { + "SelfUpdate\\": "src" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Alexander Menk", + "email": "menk@mestrona.net" + } + ], + "description": "Provides a self:update command for Symfony Console applications.", + "time": "2018-08-17T04:50:59+00:00" }, { "name": "container-interop/container-interop", @@ -1115,6 +1159,39 @@ ], "time": "2018-07-12T10:23:15+00:00" }, + { + "name": "g1a/composer-test-scenarios", + "version": "2.2.0", + "source": { + "type": "git", + "url": "https://github.com/g1a/composer-test-scenarios.git", + "reference": "a166fd15191aceab89f30c097e694b7cf3db4880" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/g1a/composer-test-scenarios/zipball/a166fd15191aceab89f30c097e694b7cf3db4880", + "reference": "a166fd15191aceab89f30c097e694b7cf3db4880", + "shasum": "" + }, + "bin": [ + "scripts/create-scenario", + "scripts/dependency-licenses", + "scripts/install-scenario" + ], + "type": "library", + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Greg Anderson", + "email": "greg.1.anderson@greenknowe.org" + } + ], + "description": "Useful scripts for testing multiple sets of Composer dependencies.", + "time": "2018-08-08T23:37:23+00:00" + }, { "name": "grasmash/expander", "version": "1.0.0",