Merge remote-tracking branch 'origin/develop' into php8-develop

Author: jilu1

Diff for: dev/tests/verification/Resources/AssertTest.txt

@@ -151,5 +151,13 @@ class AssertTestCest
 		$I->assertNotEqualsCanonicalizing(["5", "8", "7", "9"], ["1", "2", "3", "4"], "pass"); // stepKey: a4
 		$I->assertEqualsIgnoringCase("Cat", "cat", "pass"); // stepKey: a5
 		$I->assertNotEqualsIgnoringCase("Cat", "Dog", "pass"); // stepKey: a6
+		$I->comment("assertions.md examples");
+		$I->assertElementContainsAttribute(".admin__menu-overlay", "style", "color: #333;"); // stepKey: assertElementContainsAttribute
+		$I->assertStringContainsString("Buy 5 for $5.00 each and save 50%", $DropDownTierPriceTextProduct1); // stepKey: assertDropDownTierPriceTextProduct1
+		$I->assertEmpty("$grabSearchButtonAttribute"); // stepKey: assertSearchButtonEnabled
+		$I->assertGreaterThanOrEqual($getOrderStatusFirstRow, $getOrderStatusSecondRow); // stepKey: checkStatusSortOrderAsc
+		$I->assertNotEquals($grabTotalBefore, $grabTotalAfter); // stepKey: assertNotEqualsExample
+		$I->assertNotRegExp('/placeholder\/thumbnail\.jpg/', $getSimpleProductThumbnail); // stepKey: simpleThumbnailIsNotDefault
+		$I->assertRegExp("#var\s+adminAnalyticsMetadata\s+=\s+{\s+(\"[\w_]+\":\s+\"[^\"]*?\",\s+)*?(\"[\w_]+\":\s+\"[^\"]*?\"\s+)};#s", $pageSource, "adminAnalyticsMetadata object is invalid"); // stepKey: validateadminAnalyticsMetadata
 	}
 }

Diff for: dev/tests/verification/TestModule/Test/AssertTest.xml

@@ -400,5 +400,33 @@
             <expectedResult type="string">Cat</expectedResult>
             <actualResult type="string">Dog</actualResult>
         </assertNotEqualsIgnoringCase>
+
+        <!-- assertions.md examples -->
+        <assertElementContainsAttribute stepKey="assertElementContainsAttribute">
+            <expectedResult selector=".admin__menu-overlay" attribute="style" type="string">color: #333;</expectedResult>
+        </assertElementContainsAttribute>
+        <assertStringContainsString stepKey="assertDropDownTierPriceTextProduct1">
+            <expectedResult type="string">Buy 5 for $5.00 each and save 50%</expectedResult>
+            <actualResult type="variable">DropDownTierPriceTextProduct1</actualResult>
+        </assertStringContainsString>
+        <assertEmpty stepKey="assertSearchButtonEnabled">
+            <actualResult type="string">$grabSearchButtonAttribute</actualResult>
+        </assertEmpty>
+        <assertGreaterThanOrEqual stepKey="checkStatusSortOrderAsc">
+            <actualResult type="const">$getOrderStatusSecondRow</actualResult>
+            <expectedResult type="const">$getOrderStatusFirstRow</expectedResult>
+        </assertGreaterThanOrEqual>
+        <assertNotEquals stepKey="assertNotEqualsExample">
+            <actualResult type="string">{$grabTotalAfter}</actualResult>
+            <expectedResult type="string">{$grabTotalBefore}</expectedResult>
+        </assertNotEquals>
+        <assertNotRegExp stepKey="simpleThumbnailIsNotDefault">
+            <actualResult type="const">$getSimpleProductThumbnail</actualResult>
+            <expectedResult type="const">'/placeholder\/thumbnail\.jpg/'</expectedResult>
+        </assertNotRegExp>
+        <assertRegExp message="adminAnalyticsMetadata object is invalid" stepKey="validateadminAnalyticsMetadata">
+            <expectedResult type="string">#var\s+adminAnalyticsMetadata\s+=\s+{\s+("[\w_]+":\s+"[^"]*?",\s+)*?("[\w_]+":\s+"[^"]*?"\s+)};#s</expectedResult>
+            <actualResult type="variable">$pageSource</actualResult>
+        </assertRegExp>
     </test>
 </tests>

Diff for: docs/test.md

@@ -87,7 +87,7 @@ Allure annotations provide metadata for reporting.
 `<before>` may contain these child elements:
 
 *  Any [Action][actions]
-*  [`<actionGroup>`]s
+*  [`<actionGroup>`]
 
 ### after {#after-tag}