From fb69c1a94d66e69129a9b357e3ef6873024f94a4 Mon Sep 17 00:00:00 2001 From: Ji Lu Date: Thu, 13 Feb 2020 08:53:56 -0600 Subject: [PATCH 1/3] MQE-1997: type float is wrongly treated as integer in assert actions --- dev/tests/verification/Resources/AssertTest.txt | 1 + dev/tests/verification/TestModule/Test/AssertTest.xml | 4 ++++ src/Magento/FunctionalTestingFramework/Util/TestGenerator.php | 2 +- 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/dev/tests/verification/Resources/AssertTest.txt b/dev/tests/verification/Resources/AssertTest.txt index bb29759d5..c0cf932ae 100644 --- a/dev/tests/verification/Resources/AssertTest.txt +++ b/dev/tests/verification/Resources/AssertTest.txt @@ -49,6 +49,7 @@ class AssertTestCest $I->assertEmpty([], "pass"); // stepKey: assertEmpty $I->assertEquals($text, "Copyright © 2013-2017 Magento, Inc. All rights reserved.", "pass"); // stepKey: assertEquals1 $I->assertEquals("Copyright © 2013-2017 Magento, Inc. All rights reserved.", $text, "pass"); // stepKey: assertEquals2 + $I->assertEquals(1.5, $text, "pass"); // stepKey: assertFloatTypeIsCorrect $I->assertFalse(false, "pass"); // stepKey: assertFalse1 $I->assertFileNotExists("/out.txt", "pass"); // stepKey: assertFileNotExists1 $I->assertFileNotExists($text, "pass"); // stepKey: assertFileNotExists2 diff --git a/dev/tests/verification/TestModule/Test/AssertTest.xml b/dev/tests/verification/TestModule/Test/AssertTest.xml index 82f69b9b0..8cdc724cc 100644 --- a/dev/tests/verification/TestModule/Test/AssertTest.xml +++ b/dev/tests/verification/TestModule/Test/AssertTest.xml @@ -54,6 +54,10 @@ Copyright © 2013-2017 Magento, Inc. All rights reserved. text + + 1.5 + text + 0 diff --git a/src/Magento/FunctionalTestingFramework/Util/TestGenerator.php b/src/Magento/FunctionalTestingFramework/Util/TestGenerator.php index dda1dbd9f..2ec565c44 100644 --- a/src/Magento/FunctionalTestingFramework/Util/TestGenerator.php +++ b/src/Magento/FunctionalTestingFramework/Util/TestGenerator.php @@ -2194,6 +2194,6 @@ private function wrapParameterArray(string $value): string */ private function hasDecimalPoint(string $outStr) { - return strpos($outStr, localeconv()['decimal_point']) === false; + return strpos($outStr, localeconv()['decimal_point']) !== false; } } From 724ca691b51db6d6aff70195b977dab48345cc54 Mon Sep 17 00:00:00 2001 From: Soumya Unnikrishnan Date: Thu, 13 Feb 2020 14:47:35 -0600 Subject: [PATCH 2/3] MQE-2000: CHANGELOG.MD and Composer version bump 2.6.2 --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 339e82ed8..4792fa8ae 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,12 @@ Magento Functional Testing Framework Changelog ================================================ +2.6.2 +----- + +### Fixes +* Fixed float conversion error in test generation + 2.6.1 ----- From ba72b5a5428996305162cab5c99509a1f3abb3c4 Mon Sep 17 00:00:00 2001 From: Soumya Unnikrishnan Date: Thu, 13 Feb 2020 14:49:57 -0600 Subject: [PATCH 3/3] MQE-2000: CHANGELOG.MD and Composer version bump 2.6.2 --- composer.json | 2 +- composer.lock | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index 9a806e35c..ed4656a37 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.6.1", + "version": "2.6.2", "license": "AGPL-3.0", "keywords": ["magento", "automation", "functional", "testing"], "config": { diff --git a/composer.lock b/composer.lock index c493c4d77..caa95e992 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": "c79110e707cbbf2553f19b50052949e6", + "content-hash": "d9ea4056a8f4501c3f2766e09edce40d", "packages": [ { "name": "allure-framework/allure-codeception",