File tree 2 files changed +7
-4
lines changed
dev/tests/verification/TestModule/Cest
src/Magento/FunctionalTestingFramework/Util
2 files changed +7
-4
lines changed Original file line number Diff line number Diff line change 27
27
<assertEquals mergeKey =" assertEquals2" expected =" Copyright © 2013-2017 Magento, Inc. All rights reserved." expectedType =" string" actual =" text" actualType =" variable" message =" pass" />
28
28
<assertFalse mergeKey =" assertFalse1" actual =" 0" actualType =" bool" message =" pass" />
29
29
<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" />
31
31
<assertGreaterOrEquals mergeKey =" assertGreaterOrEquals" expected =" 2" expectedType =" int" actual =" 5" actualType =" int" message =" pass" />
32
32
<assertGreaterThan mergeKey =" assertGreaterThan" expected =" 2" expectedType =" int" actual =" 5" actualType =" int" message =" pass" />
33
33
<assertGreaterThanOrEqual mergeKey =" assertGreaterThanOrEqual" expected =" 2" expectedType =" int" actual =" 5" actualType =" int" message =" pass" />
34
34
<assertInternalType mergeKey =" assertInternalType1" expected =" string" expectedType =" string" actual =" xyz" actualType =" string" message =" pass" />
35
35
<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" />
37
37
<assertLessOrEquals mergeKey =" assertLessOrEquals" expected =" 5" expectedType =" int" actual =" 2" actualType =" int" message =" pass" />
38
38
<assertLessThan mergeKey =" assertLessThan" expected =" 5" expectedType =" int" actual =" 2" actualType =" int" message =" pass" />
39
39
<assertLessThanOrEqual mergeKey =" assertLessThanOrEqual" expected =" 5" expectedType =" int" actual =" 2" actualType =" int" message =" pass" />
Original file line number Diff line number Diff line change @@ -1371,7 +1371,7 @@ private function stripWrappedQuotes($input)
1371
1371
*/
1372
1372
private function addDollarSign ($ input )
1373
1373
{
1374
- return sprintf ("$%s " , $ input );
1374
+ return sprintf ("$%s " , ltrim ( $ this -> stripQuotes ( $ input), ' $ ' ) );
1375
1375
}
1376
1376
1377
1377
// @codingStandardsIgnoreStart
@@ -1447,6 +1447,8 @@ private function validateParameterArray($paramArray)
1447
1447
}
1448
1448
1449
1449
/**
1450
+ * Resolve value based on type.
1451
+ *
1450
1452
* @param string $value
1451
1453
* @param string $type
1452
1454
* @return string
@@ -1508,7 +1510,8 @@ private function toNumber($inStr)
1508
1510
* @param string $inStr
1509
1511
* @return string
1510
1512
*/
1511
- private function stripQuotes ($ inStr ) {
1513
+ private function stripQuotes ($ inStr )
1514
+ {
1512
1515
$ unquoted = preg_replace ('/^( \'(.*) \'|"(.*)")$/ ' , '$2$3 ' , $ inStr );
1513
1516
return $ unquoted ;
1514
1517
}
You can’t perform that action at this time.
0 commit comments