Merge remote-tracking branch 'origin/MC-33071-CE-10' into MC-33071

Author: zakdma

dev/tests/api-functional/testsuite/Magento/GraphQl/ConfigurableProduct/ConfigurableProductStockStatusTest.php

@@ -42,8 +42,8 @@ public function testConfigurableProductShowOutOfStock()
         $this->stockRegistry->updateStockItemBySku($childSkuOutOfStock, $stockItem);
         $query = $this->getQuery($parentSku);
         $response = $this->graphQlQuery($query);
-        $this->assertArraySubset(
-            [['product' => ['sku' => $childSkuOutOfStock, 'stock_status' => 'OUT_OF_STOCK']]],
+        $this->assertContainsEquals(
+            ['product' => ['sku' => $childSkuOutOfStock, 'stock_status' => 'OUT_OF_STOCK']],
             $response['products']['items'][0]['variants']
         );
     }

dev/tests/api-functional/testsuite/Magento/GraphQl/DownloadableProduct/DownloadableProductViewTest.php

@@ -33,11 +33,11 @@ public function testQueryAllFieldsDownloadableProductsWithDownloadableFileAndSam
   {
        items{
            id
-           attribute_set_id    
+           attribute_set_id
            created_at
            name
            sku
-           type_id        
+           type_id
            updated_at
         price{
         regularPrice{
@@ -50,16 +50,16 @@ public function testQueryAllFieldsDownloadableProductsWithDownloadableFileAndSam
             description
           }
         }
-      }          
+      }
            ... on DownloadableProduct {
             links_title
             links_purchased_separately
-            
+
             downloadable_product_links{
               sample_url
               sort_order
               title
-              price              
+              price
             }
             downloadable_product_samples{
               title
@@ -203,7 +203,7 @@ private function assertDownloadableProductLinks($product, $actualResponse)
         /** @var LinkInterface $downloadableProductLinks */
         $downloadableProductLinks = $product->getExtensionAttributes()->getDownloadableProductLinks();
         $downloadableProductLink = $downloadableProductLinks[1];
-        $this->assertNotEmpty('sample_url', $actualResponse['downloadable_product_links'][1]);
+        $this->assertNotEmpty($actualResponse['downloadable_product_links'][1]['sample_url']);
         $this->assertResponseFields(
             $actualResponse['downloadable_product_links'][1],
             [
@@ -227,7 +227,7 @@ private function assertDownloadableProductSamples($product, $actualResponse)
         /** @var SampleInterface $downloadableProductSamples */
         $downloadableProductSamples = $product->getExtensionAttributes()->getDownloadableProductSamples();
         $downloadableProductSample = $downloadableProductSamples[0];
-        $this->assertNotEmpty('sample_url', $actualResponse['downloadable_product_samples'][0]);
+        $this->assertNotEmpty($actualResponse['downloadable_product_samples'][0]['sample_url']);
         $this->assertResponseFields(
             $actualResponse['downloadable_product_samples'][0],
             [