Merge remote-tracking branch 'origin/MC-16967' into 2.1.18-develop-pr76

Author: SeruyV

app/code/Magento/Sales/Controller/Guest/View.php

@@ -49,15 +49,13 @@ public function __construct(
 
     /**
      * @return \Magento\Framework\Controller\ResultInterface
-     * @throws \Magento\Framework\Exception\NotFoundException
      */
     public function execute()
     {
-        if (!$this->getRequest()->isPost()) {
-            throw new \Magento\Framework\Exception\NotFoundException(__('Page not found.'));
-        }
-        if (!$this->formKeyValidator->validate($this->getRequest())) {
-            return $this->resultRedirectFactory->create()->setPath('*/*/form/');
+        if ($this->getRequest()->isPost()) {
+            if (!$this->formKeyValidator->validate($this->getRequest())) {
+                return $this->resultRedirectFactory->create()->setPath('*/*/form/');
+            }
         }
 
         $result = $this->guestHelper->loadValidOrder($this->getRequest());

app/code/Magento/Sales/Test/Unit/Controller/Guest/ViewTest.php

@@ -145,13 +145,15 @@ public function testExecuteOrderNotFound()
 
     /**
      * @return void
-     * @expectedException \Magento\Framework\Exception\NotFoundException
-     * @expectedExceptionMessage Page not found.
      */
     public function testExecuteWithNonPostRequest()
     {
         $this->requestMock->expects($this->once())->method('isPost')->willReturn(false);
 
+        $this->resultPageFactoryMock->expects($this->once())
+            ->method('create')
+            ->willReturn($this->resultPageMock);
+
         $this->viewController->execute();
     }
 

dev/tests/integration/testsuite/Magento/Sales/Controller/Guest/ViewTest.php

@@ -0,0 +1,27 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+
+namespace Magento\Sales\Controller\Guest;
+
+use Magento\TestFramework\Request;
+use Magento\TestFramework\TestCase\AbstractController;
+
+/**
+ * Test for \Magento\Sales\Controller\Guest\View class.
+ */
+class ViewTest extends AbstractController
+{
+    /**
+     * Check that controller applied GET requests.
+     */
+    public function testExecuteWithGetRequest()
+    {
+        $this->getRequest()->setMethod(Request::METHOD_GET);
+        $this->dispatch('sales/guest/view/');
+
+        $this->assertRedirect($this->stringContains('sales/guest/form'));
+    }
+}