Merge remote-tracking branch 'origin/develop' into AC-13306

Author: glo71317

InventoryVisualMerchandiser/Test/Integration/Model/Category/ProductsTest.php

@@ -1,7 +1,21 @@
 <?php
-/**
- * Copyright © Magento, Inc. All rights reserved.
- * See COPYING.txt for license details.
+/************************************************************************
+ *
+ * ADOBE CONFIDENTIAL
+ * ___________________
+ *
+ * Copyright 2020 Adobe
+ * All Rights Reserved.
+ *
+ * NOTICE: All information contained herein is, and remains
+ * the property of Adobe and its suppliers, if any. The intellectual
+ * and technical concepts contained herein are proprietary to Adobe
+ * and its suppliers and are protected by all applicable intellectual
+ * property laws, including trade secret and copyright laws.
+ * Dissemination of this information or reproduction of this material
+ * is strictly forbidden unless prior written permission is obtained
+ * from Adobe.
+ * ************************************************************************
  */
 declare(strict_types=1);
 
@@ -141,7 +155,7 @@ public function testOutStockBottomCategorySorting(): void
             $this->markTestSkipped('VisualMerchandiser module is absent');
         }
 
-        $expectedOrderBy = ['is_in_stock', Select::SQL_DESC];
+        $expectedOrderBy = ['stock', Select::SQL_DESC];
 
         $storeCode = 'default';
         $this->storeManager->setCurrentStore($storeCode);