Merge branch '2.4-develop' into issue-7213

magento · May 29, 2020 · 4f20656 · 4f20656
2 parents b4a02dd + 97f9b00
commit 4f20656
Show file tree

Hide file tree

Showing 3,304 changed files with 2 additions and 224,031 deletions.
diff --git a/.php_cs.dist b/.php_cs.dist
@@ -10,9 +10,6 @@
 
 $finder = PhpCsFixer\Finder::create()
     ->name('*.phtml')
-    ->exclude('dev/tests/functional/generated')
-    ->exclude('dev/tests/functional/var')
-    ->exclude('dev/tests/functional/vendor')
     ->exclude('dev/tests/integration/tmp')
     ->exclude('dev/tests/integration/var')
     ->exclude('lib/internal/Cm')

diff --git a/app/code/Magento/Backend/Test/Mftf/Test/AdminLoginSuccessfulTest.xml b/app/code/Magento/Backend/Test/Mftf/Test/AdminLoginSuccessfulTest.xml
@@ -20,6 +20,7 @@
             <group value="login"/>
         </annotations>
 
+
         <actionGroup ref="AdminLoginActionGroup" stepKey="loginAsAdmin"/>
         <actionGroup ref="AssertAdminSuccessLoginActionGroup" stepKey="assertLoggedIn"/>
         <actionGroup ref="AdminLogoutActionGroup" stepKey="logoutFromAdmin"/>

diff --git a/app/code/Magento/Customer/Test/Mftf/Section/AdminDeleteUserSection.xml b/app/code/Magento/Customer/Test/Mftf/Section/AdminDeleteUserSection.xml
@@ -11,7 +11,7 @@
     <section name="AdminDeleteUserSection">
         <element name="theUser" selector="//td[contains(text(), 'John')]" type="button"/>
         <element name="password" selector="#user_current_password" type="input"/>
-        <element name="delete" selector="//button/span[contains(text(), 'Delete User')]" type="button"/>
+        <element name="delete" selector=".page-actions-buttons #delete" type="button"/>
         <element name="confirm" selector="//*[@class='action-primary action-accept']" type="button"/>
     </section>
 </sections>
diff --git a/dev/tests/functional/.gitignore b/dev/tests/functional/.gitignore
diff --git a/dev/tests/functional/bootstrap.php b/dev/tests/functional/bootstrap.php
diff --git a/dev/tests/functional/composer.json b/dev/tests/functional/composer.json
diff --git a/dev/tests/functional/credentials.xml.dist b/dev/tests/functional/credentials.xml.dist
diff --git a/dev/tests/functional/etc/config.xml.dist b/dev/tests/functional/etc/config.xml.dist