Skip to content

Commit 4feb793

Browse files
committed
MQE-235: added codeception Asserts module functions in framework.
1 parent 00af5c9 commit 4feb793

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
lines changed

dev/tests/verification/TestModule/Cest/AssertCest.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,13 @@
2727
<assertEquals mergeKey="assertEquals2" expected="Copyright © 2013-2017 Magento, Inc. All rights reserved." expectedType="string" actual="text" actualType="variable" message="pass"/>
2828
<assertFalse mergeKey="assertFalse1" actual="0" actualType="bool" message="pass"/>
2929
<assertFileNotExists mergeKey="assertFileNotExists1" actual="/out.txt" actualType="string" message="pass"/>
30-
<assertFileNotExists mergeKey="assertFileNotExists2" actual="text" actualType="variable" message="pass"/>
30+
<assertFileNotExists mergeKey="assertFileNotExists2" actual="$text" actualType="variable" message="pass"/>
3131
<assertGreaterOrEquals mergeKey="assertGreaterOrEquals" expected="2" expectedType="int" actual="5" actualType="int" message="pass"/>
3232
<assertGreaterThan mergeKey="assertGreaterThan" expected="2" expectedType="int" actual="5" actualType="int" message="pass"/>
3333
<assertGreaterThanOrEqual mergeKey="assertGreaterThanOrEqual" expected="2" expectedType="int" actual="5" actualType="int" message="pass"/>
3434
<assertInternalType mergeKey="assertInternalType1" expected="string" expectedType="string" actual="xyz" actualType="string" message="pass"/>
3535
<assertInternalType mergeKey="assertInternalType2" expected="int" expectedType="string" actual="21" actualType="int" message="pass"/>
36-
<assertInternalType mergeKey="assertInternalType3" expected="string" expectedType="string" actual="text" actualType="variable" message="pass"/>
36+
<assertInternalType mergeKey="assertInternalType3" expected="string" expectedType="string" actual="$text" actualType="variable" message="pass"/>
3737
<assertLessOrEquals mergeKey="assertLessOrEquals" expected="5" expectedType="int" actual="2" actualType="int" message="pass"/>
3838
<assertLessThan mergeKey="assertLessThan" expected="5" expectedType="int" actual="2" actualType="int" message="pass"/>
3939
<assertLessThanOrEqual mergeKey="assertLessThanOrEqual" expected="5" expectedType="int" actual="2" actualType="int" message="pass"/>

src/Magento/FunctionalTestingFramework/Util/TestGenerator.php

+5-2
Original file line numberDiff line numberDiff line change
@@ -1371,7 +1371,7 @@ private function stripWrappedQuotes($input)
13711371
*/
13721372
private function addDollarSign($input)
13731373
{
1374-
return sprintf("$%s", $input);
1374+
return sprintf("$%s", ltrim($this->stripQuotes($input), '$'));
13751375
}
13761376

13771377
// @codingStandardsIgnoreStart
@@ -1447,6 +1447,8 @@ private function validateParameterArray($paramArray)
14471447
}
14481448

14491449
/**
1450+
* Resolve value based on type.
1451+
*
14501452
* @param string $value
14511453
* @param string $type
14521454
* @return string
@@ -1508,7 +1510,8 @@ private function toNumber($inStr)
15081510
* @param string $inStr
15091511
* @return string
15101512
*/
1511-
private function stripQuotes($inStr) {
1513+
private function stripQuotes($inStr)
1514+
{
15121515
$unquoted = preg_replace('/^(\'(.*)\'|"(.*)")$/', '$2$3', $inStr);
15131516
return $unquoted;
15141517
}

0 commit comments

Comments
 (0)