Merge pull request #401 from magento/MQE-1679

MQE-1679: dontSeeInPageSource BIC schema

Author: KevinBKozan

dev/tests/verification/Resources/BasicFunctionalTest.txt

@@ -94,6 +94,10 @@ class BasicFunctionalTestCest
 		$I->dontSeeInField(".functionalTestSelector"); // stepKey: dontSeeInFieldKey1
 		$I->dontSeeInPageSource("Cosmo Kramer"); // stepKey: dontSeeInPageSourceKey1
 		$I->dontSeeInPageSource("<p>Jerry Seinfeld</p>"); // stepKey: dontSeeInPageSourceKey2
+		$I->dontSeeInPageSource("Cosmo Kramer"); // stepKey: dontSeeInPageSourceKey3
+		$I->dontSeeInPageSource("<p>Jerry Seinfeld</p>"); // stepKey: dontSeeInPageSourceKey4
+		$I->dontSeeInPageSource("foo"); // stepKey: dontSeeInPageSourceKey5
+		$I->dontSeeInPageSource("<p>foo</p>"); // stepKey: dontSeeInPageSourceKey6
 		$I->dontSeeInSource("Cosmo Kramer"); // stepKey: dontSeeInSourceKey1
 		$I->dontSeeInSource("<p>Jerry Seinfeld</p>"); // stepKey: dontSeeInSourceKey2
 		$I->dontSeeInTitle("someInput"); // stepKey: dontSeeInTitleKey1

dev/tests/verification/TestModule/Test/BasicFunctionalTest.xml

@@ -52,6 +52,10 @@
         <dontSeeInField selector=".functionalTestSelector" stepKey="dontSeeInFieldKey1" />
         <dontSeeInPageSource html="Cosmo Kramer" stepKey="dontSeeInPageSourceKey1"/>
         <dontSeeInPageSource html="&#60;p&#62;Jerry Seinfeld&#60;&#47;p&#62;" stepKey="dontSeeInPageSourceKey2"/>
+        <dontSeeInPageSource userInput="Cosmo Kramer" stepKey="dontSeeInPageSourceKey3"/>
+        <dontSeeInPageSource userInput="&#60;p&#62;Jerry Seinfeld&#60;&#47;p&#62;" stepKey="dontSeeInPageSourceKey4"/>
+        <dontSeeInPageSource userInput="bar" html="foo" stepKey="dontSeeInPageSourceKey5"/>
+        <dontSeeInPageSource userInput="&#60;p&#62;bar&#60;&#47;p&#62;" html="&#60;p&#62;foo&#60;&#47;p&#62;" stepKey="dontSeeInPageSourceKey6"/>
         <dontSeeInSource html="Cosmo Kramer" stepKey="dontSeeInSourceKey1"/>
         <dontSeeInSource html="&#60;p&#62;Jerry Seinfeld&#60;&#47;p&#62;" stepKey="dontSeeInSourceKey2"/>
         <dontSeeInTitle userInput="someInput" stepKey="dontSeeInTitleKey1"/>

src/Magento/FunctionalTestingFramework/Test/etc/Actions/dontSeeActions.xsd

@@ -172,7 +172,12 @@
         </xs:annotation>
         <xs:simpleContent>
             <xs:extension base="xs:string">
-                <xs:attribute ref="html" use="required"/>
+                <!--
+                    For backwards compatibility we accept both html and userInput.
+                    If html is specified, then html is used. Otherwise userInput is used.
+                 -->
+                <xs:attribute ref="html"/>
+                <xs:attribute ref="userInput"/>
                 <xs:attributeGroup ref="commonActionAttributes"/>
             </xs:extension>
         </xs:simpleContent>

src/Magento/FunctionalTestingFramework/Util/TestGenerator.php

@@ -1174,6 +1174,10 @@ public function generateStepsPhp($actionObjects, $generationScope = TestGenerato
                 case "dontSeeInPageSource":
                 case "seeInSource":
                 case "dontSeeInSource":
+                    //TODO: Deprecate allowed usage of userInput in dontSeeInPageSource
+                    if ($html === null && $input !== null) {
+                        $html = $input;
+                    }
                     $testSteps .= $this->wrapFunctionCall($actor, $actionObject, $html);
                     break;
                 case "conditionalClick":