Merge remote-tracking branch 'origin/MC-35998' into 2.4-develop-pr36

Author: serhii-balko

lib/internal/Magento/Framework/App/StaticResource.php

@@ -124,17 +124,28 @@ public function launch()
             )
         ) {
             $this->response->setHttpResponseCode(404);
-        } else {
-            $path = $this->request->get('resource');
+            return $this->response;
+        }
+
+        $path = $this->request->get('resource');
+        try {
             $params = $this->parsePath($path);
-            $this->state->setAreaCode($params['area']);
-            $this->objectManager->configure($this->configLoader->load($params['area']));
-            $file = $params['file'];
-            unset($params['file']);
-            $asset = $this->assetRepo->createAsset($file, $params);
-            $this->response->setFilePath($asset->getSourceFile());
-            $this->publisher->publish($asset);
+        } catch (\InvalidArgumentException $e) {
+            if ($appMode == \Magento\Framework\App\State::MODE_PRODUCTION) {
+                $this->response->setHttpResponseCode(404);
+                return $this->response;
+            }
+            throw $e;
         }
+
+        $this->state->setAreaCode($params['area']);
+        $this->objectManager->configure($this->configLoader->load($params['area']));
+        $file = $params['file'];
+        unset($params['file']);
+        $asset = $this->assetRepo->createAsset($file, $params);
+        $this->response->setFilePath($asset->getSourceFile());
+        $this->publisher->publish($asset);
+
         return $this->response;
     }
 

lib/internal/Magento/Framework/App/Test/Unit/StaticResourceTest.php

@@ -84,6 +84,9 @@ class StaticResourceTest extends TestCase
      */
     private $object;
 
+    /**
+     * @inheridoc
+     */
     protected function setUp(): void
     {
         $this->stateMock = $this->createMock(State::class);
@@ -109,6 +112,9 @@ protected function setUp(): void
         );
     }
 
+    /**
+     * Test to lunch on production mode
+     */
     public function testLaunchProductionMode()
     {
         $this->stateMock->expects($this->once())
@@ -249,6 +255,9 @@ public function launchDataProvider()
         ];
     }
 
+    /**
+     * Test to lunch with wrong path on developer mode
+     */
     public function testLaunchWrongPath()
     {
         $this->expectException('InvalidArgumentException');
@@ -263,6 +272,28 @@ public function testLaunchWrongPath()
         $this->object->launch();
     }
 
+    /**
+     * Test to lunch with wrong path on production mode
+     */
+    public function testLaunchWrongPathProductionMode()
+    {
+        $mode = State::MODE_PRODUCTION;
+        $path = 'wrong/path.js';
+
+        $this->stateMock->method('getMode')->willReturn($mode);
+        $this->deploymentConfigMock->method('getConfigData')
+            ->with(ConfigOptionsListConstants::CONFIG_PATH_SCD_ON_DEMAND_IN_PRODUCTION)
+            ->willReturn(true);
+        $this->requestMock->method('get')->with('resource')->willReturn($path);
+        $this->responseMock->expects($this->once())
+            ->method('setHttpResponseCode')
+            ->with(404);
+        $this->object->launch();
+    }
+
+    /**
+     * Test to Ability to handle exceptions on developer mode
+     */
     public function testCatchExceptionDeveloperMode()
     {
         $this->objectManagerMock->expects($this->once())
@@ -286,6 +317,9 @@ public function testCatchExceptionDeveloperMode()
         $this->assertTrue($this->object->catchException($bootstrap, $exception));
     }
 
+    /**
+     * Test to lunch with wrong path
+     */
     public function testLaunchPathAbove()
     {
         $this->expectException('InvalidArgumentException');