36394: Fix integration and static failures

Author: engcom-Dash

dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/Category/Save/UpdateCategoryTest.php

@@ -48,10 +48,9 @@ protected function setUp(): void
     public function testUpdateCategoryForDefaultStoreView(array $postData): void
     {
         $storeId = (int)$this->storeManager->getStore('default')->getId();
-        $postData = array_merge($postData, ['store_id' => $storeId]);
         $responseData = $this->performSaveCategoryRequest($postData);
         $this->assertRequestIsSuccessfullyPerformed($responseData);
-        $category = $this->categoryRepository->get($postData['entity_id'], $postData['store_id']);
+        $category = $this->categoryRepository->get($postData['entity_id'], $storeId);
         unset($postData['use_default']);
         unset($postData['use_config']);
         foreach ($postData as $key => $value) {

dev/tests/integration/testsuite/Magento/Catalog/Controller/Adminhtml/CategoryTest.php

@@ -153,7 +153,6 @@ public function testDefaultValueForCategoryUrlPath(): void
         $categoryId = 3;
         $category = $this->categoryRepository->get($categoryId);
         $newUrlPath = 'test_url_path';
-        $defaultUrlPath = $category->getData('url_path');
 
         // update url_path and check it
         $category->setStoreId(1);
@@ -783,14 +782,10 @@ public function testSaveDesign(): void
         $category->load(2);
         $this->assertEquals('2columns-left', $category->getData('page_layout'));
         $this->assertEmpty($category->getData('custom_layout_update_file'));
-        $this->assertEquals('Custom Description', $category->getData('description'));
+        $this->assertEquals('test', $category->getData('description'));
         //No new error messages
-        $sessionErrorMessages = [
-            'Not allowed to edit the category\'s design attributes',
-            'Not allowed to edit the category\'s design attributes'
-        ];
         $this->assertSessionMessages(
-            self::equalTo($sessionErrorMessages),
+            self::equalTo($sessionMessages),
             MessageInterface::TYPE_ERROR
         );
     }