Merge pull request #5399 from magento-pangolin/MQE-2008-2.3-develop

[Pangolin] MQE-2008: Filter test generation and execution by severity

Author: okolesnyk

app/code/Magento/Csp/Model/Collector/CspWhitelistXml/Converter.php

@@ -43,7 +43,6 @@ public function convert($source)
                 }
             }
             $policyConfig[$id]['hosts'] = array_unique($policyConfig[$id]['hosts']);
-            $policyConfig[$id]['hashes'] = array_unique($policyConfig[$id]['hashes']);
         }
 
         return $policyConfig;

composer.json

@@ -89,7 +89,7 @@
         "friendsofphp/php-cs-fixer": "~2.14.0",
         "lusitanian/oauth": "~0.8.10",
         "magento/magento-coding-standard": "*",
-        "magento/magento2-functional-testing-framework": "2.6.2",
+        "magento/magento2-functional-testing-framework": "~2.6.3",
         "pdepend/pdepend": "2.5.2",
         "phpcompatibility/php-compatibility": "^9.3",
         "phpmd/phpmd": "@stable",

composer.lock

@@ -11,6 +11,7 @@
             <values>
                 <value id="mage-base" type="host">https://magento.com</value>
                 <value id="hash" type="hash" algorithm="sha256">B2yPHKaXnvFWtRChIbabYmUBFZdVfKKXHbWtWidDVF8=</value>
+                <value id="hash2" type="hash" algorithm="sha256">B3yPHKaXnvFWtRChIbabYmUBFZdVfKKXHbWtWidDVF8=</value>
             </values>
         </policy>
         <policy id="media-src">

dev/tests/integration/_files/Magento/TestModuleCspConfig/etc/csp_whitelist.xml

@@ -11,6 +11,7 @@
             <values>
                 <value id="devdocs-base" type="host">https://devdocs.magento.com</value>
                 <value id="mage-base" type="host">http://magento.com</value>
+                <value id="hash3" type="hash" algorithm="sha256">B4yPHKaXnvFWtRChIbabYmUBFZdVfKKXHbWtWidDVF8=</value>
             </values>
         </policy>
     </policies>

dev/tests/integration/_files/Magento/TestModuleCspConfig2/etc/csp_whitelist.xml

@@ -53,7 +53,14 @@ public function testCollecting(): void
             if ($policy->getId() === 'object-src') {
                 $this->assertInstanceOf(FetchPolicy::class, $policy);
                 $this->assertEquals(['http://magento.com', 'https://devdocs.magento.com'], $policy->getHostSources());
-                $this->assertEquals(['B2yPHKaXnvFWtRChIbabYmUBFZdVfKKXHbWtWidDVF8=' => 'sha256'], $policy->getHashes());
+                $this->assertEquals(
+                    [
+                        'B2yPHKaXnvFWtRChIbabYmUBFZdVfKKXHbWtWidDVF8=' => 'sha256',
+                        'B3yPHKaXnvFWtRChIbabYmUBFZdVfKKXHbWtWidDVF8=' => 'sha256',
+                        'B4yPHKaXnvFWtRChIbabYmUBFZdVfKKXHbWtWidDVF8=' => 'sha256'
+                    ],
+                    $policy->getHashes()
+                );
                 $objectSrcChecked = true;
             } elseif ($policy->getId() === 'media-src') {
                 $this->assertInstanceOf(FetchPolicy::class, $policy);