Merge pull request #7009 from magento-commerce/platform-health

[Platform Health] Dependency Updates

.gitignore

@@ -32,6 +32,8 @@ atlassian*
 /package.json
 /.php_cs
 /.php_cs.cache
+/.php-cs-fixer.php
+/.php-cs-fixer.cache
 /grunt-config.json
 /pub/media/*.*
 !/pub/media/.htaccess

.php_cs.dist → .php-cs-fixer.dist.php

@@ -21,20 +21,20 @@
     ->exclude('setup/vendor')
     ->exclude('var');
 
-return PhpCsFixer\Config::create()
-    ->setFinder($finder)
+$config = new PhpCsFixer\Config();
+$config->setFinder($finder)
     ->setRules([
         '@PSR2' => true,
         'array_syntax' => ['syntax' => 'short'],
         'concat_space' => ['spacing' => 'one'],
         'include' => true,
         'new_with_braces' => true,
         'no_empty_statement' => true,
-        'no_extra_consecutive_blank_lines' => true,
+        'no_extra_blank_lines' => true,
         'no_leading_import_slash' => true,
         'no_leading_namespace_whitespace' => true,
         'no_multiline_whitespace_around_double_arrow' => true,
-        'no_multiline_whitespace_before_semicolons' => true,
+        'multiline_whitespace_before_semicolons' => true,
         'no_singleline_whitespace_before_semicolons' => true,
         'no_trailing_comma_in_singleline_array' => true,
         'no_unused_imports' => true,
@@ -44,3 +44,4 @@
         'standardize_not_equals' => true,
         'ternary_operator_spaces' => true,
     ]);
+return $config;

app/code/Magento/Backend/Test/Mftf/ActionGroup/WebSetup/GoToWebSetupPageActionGroup.xml

@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="GoToWebSetupPageActionGroup">
+        <annotations>
+            <description>Go to the Web Setup Page</description>
+        </annotations>
+
+        <amOnPage url="{{WebSetupPage.url}}" stepKey="goToWebSetupPage"/>
+        <waitForPageLoad stepKey="waitForWebSetupPageLoad" time="10"/>
+        <seeElementInDOM selector="{{WebSetupPageLandingSection.section}}" stepKey="assertSetupPageHasLandingSection"/>
+        <seeElementInDOM selector="{{WebSetupPageLicenseSection.section}}" stepKey="assertSetupPageHasLicenseSection"/>
+    </actionGroup>
+</actionGroups>

app/code/Magento/Backend/Test/Mftf/ActionGroup/WebSetup/WebSetupShowLandingSectionActionGroup.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="WebSetupShowLandingSectionActionGroup">
+        <annotations>
+            <description>Action for showing landing section and closing license section on Web Setup Page</description>
+        </annotations>
+
+        <click selector="{{WebSetupPageLicenseSection.go_back_button}}" stepKey="showLandingSection"/>
+        <waitForElementVisible selector="{{WebSetupPageLandingSection.section}}" stepKey="waitForVisibleWebSetupPageLandingSection" time="5"/>
+    </actionGroup>
+</actionGroups>

app/code/Magento/Backend/Test/Mftf/ActionGroup/WebSetup/WebSetupShowLicenseSectionActionGroup.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<actionGroups xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/actionGroupSchema.xsd">
+    <actionGroup name="WebSetupShowLicenseSectionActionGroup">
+        <annotations>
+            <description>Action for showing license section on Web Setup Page</description>
+        </annotations>
+
+        <click selector="{{WebSetupPageLandingSection.terms_and_agreement_link}}" stepKey="showLicenseSection"/>
+        <waitForElementVisible selector="{{WebSetupPageLicenseSection.section}}" stepKey="waitForVisibleWebSetupPageLicenseSection" time="5"/>
+    </actionGroup>
+</actionGroups>

app/code/Magento/Backend/Test/Mftf/Page/WebSetup/WebSetupPage.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<pages xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/PageObject.xsd">
+    <page name="WebSetupPage" url="setup/" area="storefront" module="Magento_Backend">
+        <section name="WebSetupLandingPageSection"/>
+        <section name="WebSetupLicensePageSection"/>
+    </page>
+</pages>

app/code/Magento/Backend/Test/Mftf/Section/WebSetup/WebSetupPageLandingSection.xml

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="WebSetupPageLandingSection">
+        <element name="section" type="text" selector="section[data-section=landing]"/>
+        <element name="logo" type="text" selector="section[data-section=landing] > img.logo"/>
+        <element name="version" type="text" selector="section[data-section=landing] > p.text-version"/>
+        <element name="welcome" type="text" selector="section[data-section=landing] > p.text-welcome"/>
+        <element name="terms_and_agreement_link" type="text" selector="section[data-section=landing] > p.text-welcome > a[href^='javascript:showSection'][href*='license']"/>
+    </section>
+</sections>

app/code/Magento/Backend/Test/Mftf/Section/WebSetup/WebSetupPageLicenseSection.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<sections xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Page/etc/SectionObject.xsd">
+    <section name="WebSetupPageLicenseSection">
+        <element name="section" type="text" selector="section[data-section=license]"/>
+        <element name="license_text" type="text" selector="section[data-section=license] div.license-text"/>
+        <element name="go_back_button" type="button" selector="section[data-section=license] div.page-license-footer button[onclick^='showSection'][onclick*='landing']"/>
+    </section>
+</sections>

app/code/Magento/Backend/Test/Mftf/Test/WebSetup/WebSetupPageTest.xml

@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ /**
+  * Copyright © Magento, Inc. All rights reserved.
+  * See COPYING.txt for license details.
+  */
+-->
+
+<tests xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:mftf:Test/etc/testSchema.xsd">
+    <test name="WebSetupPageTest">
+        <annotations>
+            <features value="Setup"/>
+            <stories value="Setup Magento via Web Interface"/>
+            <title value="Setup Magento via Web Interface"/>
+            <description value="Setup Magento via Web Interface should show only landing section with logo, version, and welcome and licence section"/>
+            <severity value="MAJOR"/>
+        </annotations>
+        <actionGroup ref="GoToWebSetupPageActionGroup" stepKey="goToWebSetupPage"/>
+        <seeElement selector="{{WebSetupPageLandingSection.section}}" stepKey="assertLandingSectionVisibleInSetupPage"/>
+        <dontSeeElement selector="{{WebSetupPageLicenseSection.section}}" stepKey="assertLicenseSectionInvisibleInSetupPage"/>
+        <seeElement selector="{{WebSetupPageLandingSection.logo}}" stepKey="assertSetupPageLogoVisibleInSetupPage"/>
+        <seeElement selector="{{WebSetupPageLandingSection.version}}" stepKey="assertVersionVisibleInSetupPage"/>
+        <seeElement selector="{{WebSetupPageLandingSection.welcome}}" stepKey="assertWelcomeVisibleInSetupPage"/>
+        <actionGroup ref="WebSetupShowLicenseSectionActionGroup" stepKey="showLicense"/>
+        <seeElement selector="{{WebSetupPageLicenseSection.section}}" stepKey="assertLicenseSectionVisibleInSetupPage"/>
+        <dontSeeElement selector="{{WebSetupPageLandingSection.section}}" stepKey="assertLandingSectionInvisibleInSetupPage"/>
+        <actionGroup ref="WebSetupShowLandingSectionActionGroup" stepKey="goBackToLanding"/>
+        <seeElement selector="{{WebSetupPageLandingSection.section}}" stepKey="assertLandingSectionVisibleAfterGoingBackFromLicenseSection"/>
+        <dontSeeElement selector="{{WebSetupPageLicenseSection.section}}" stepKey="assertLicenseSectionInvisibleAfterGoingBackFromLicenseSection"/>
+    </test>
+</tests>