MQE-683: [Deprecation] Only use more nested assertion syntax

KevinBKozan · KevinBKozan · commit 3a901e3107a2 · 2020-03-03T09:01:28.000-06:00
- Even more fixes
diff --git a/src/Magento/FunctionalTestingFramework/Upgrade/UpdateAssertionSchema.php b/src/Magento/FunctionalTestingFramework/Upgrade/UpdateAssertionSchema.php
@@ -147,12 +147,12 @@ private function convertOldAssertionToNew($assertion)
             }
         }
         $newString .= ">\n";
-        // Guess value type if not set in either case
-        if (!isset($subElements["actual"]['type']) && isset($subElements["actual"]["value"])) {
-            $subElements["actual"]['type'] = $this->guessValueType($subElements["actual"]["value"]);
+        // Set type to const if it's absent
+        if (isset($subElements["actual"]['value']) && !isset($subElements["actual"]['type'])) {
+            $subElements["actual"]['type'] = "const";
         }
-        if (!isset($subElements["expected"]['type']) && isset($subElements["expected"]["value"])) {
-            $subElements["expected"]['type'] = $this->guessValueType($subElements["expected"]["value"]);
+        if (isset($subElements["expected"]['value']) && !isset($subElements["expected"]['type'])) {
+            $subElements["expected"]['type'] = "const";
         }
         // Massage subElements with data for edge cases
         if ($assertType == 'assertElementContainsAttribute') {

Original file line number	Diff line number	Diff line change
`@@ -147,12 +147,12 @@ private function convertOldAssertionToNew($assertion)`
`147`	`147`	`}`
`148`	`148`	`}`
`149`	`149`	`$newString .= ">\n";`
`150`		`- // Guess value type if not set in either case`
`151`		`- if (!isset($subElements["actual"]['type']) && isset($subElements["actual"]["value"])) {`
`152`		`- $subElements["actual"]['type'] = $this->guessValueType($subElements["actual"]["value"]);`
	`150`	`+ // Set type to const if it's absent`
	`151`	`+ if (isset($subElements["actual"]['value']) && !isset($subElements["actual"]['type'])) {`
	`152`	`+ $subElements["actual"]['type'] = "const";`
`153`	`153`	`}`
`154`		`- if (!isset($subElements["expected"]['type']) && isset($subElements["expected"]["value"])) {`
`155`		`- $subElements["expected"]['type'] = $this->guessValueType($subElements["expected"]["value"]);`
	`154`	`+ if (isset($subElements["expected"]['value']) && !isset($subElements["expected"]['type'])) {`
	`155`	`+ $subElements["expected"]['type'] = "const";`
`156`	`156`	`}`
`157`	`157`	`// Massage subElements with data for edge cases`
`158`	`158`	`if ($assertType == 'assertElementContainsAttribute') {`