MAGETWO-45133: Get json instead of normal page when trying to delete category after reset

Author: igrybkov

app/code/Magento/Catalog/Block/Adminhtml/Category/Edit/Form.php

@@ -98,10 +98,7 @@ protected function _prepareLayout()
                 [
                     'id' => 'delete',
                     'label' => __('Delete Category'),
-                    'onclick' => "categoryDelete('" . $this->getUrl(
-                        'catalog/*/delete',
-                        ['_current' => true]
-                    ) . "')",
+                    'onclick' => "categoryDelete('" . $this->getDeleteUrl() . "')",
                     'class' => 'delete'
                 ]
             );
@@ -115,7 +112,7 @@ protected function _prepareLayout()
                 [
                     'id' => 'reset',
                     'label' => __('Reset'),
-                    'onclick' => "categoryReset('" . $this->getUrl($resetPath, ['_current' => true]) . "',true)",
+                    'onclick' => "categoryReset('" . $this->getUrl($resetPath, $this->getDefaultUrlParams()) . "',true)",
                     'class' => 'reset'
                 ]
             );
@@ -259,8 +256,7 @@ public function getHeader()
      */
     public function getDeleteUrl(array $args = [])
     {
-        $params = ['_current' => true];
-        $params = array_merge($params, $args);
+        $params = array_merge($this->getDefaultUrlParams(), $args);
         return $this->getUrl('catalog/*/delete', $params);
     }
 
@@ -272,8 +268,7 @@ public function getDeleteUrl(array $args = [])
      */
     public function getRefreshPathUrl(array $args = [])
     {
-        $params = ['_current' => true];
-        $params = array_merge($params, $args);
+        $params = array_merge($this->getDefaultUrlParams(), $args);
         return $this->getUrl('catalog/*/refreshPath', $params);
     }
 
@@ -359,4 +354,12 @@ protected function getButtonChildBlock($childId, $blockClassName = null)
         }
         return $this->getLayout()->createBlock($blockClassName, $this->getNameInLayout() . '-' . $childId);
     }
+
+    /**
+     * @return array
+     */
+    protected function getDefaultUrlParams()
+    {
+        return ['_current' => true, '_query' => ['isAjax' => null]];
+    }
 }

app/code/Magento/Catalog/Test/Unit/Block/Adminhtml/Category/Edit/FormTest.php

@@ -50,6 +50,11 @@ class FormTest extends \PHPUnit_Framework_TestCase
      */
     protected $requestMock;
 
+    /**
+     * @var \Magento\Framework\UrlInterface|\PHPUnit_Framework_MockObject_MockObject
+     */
+    private $urlBuilderMock;
+
     /**
      * Set up
      *
@@ -103,9 +108,16 @@ protected function setUp()
             ['getParam']
         );
 
+        $this->urlBuilderMock = $this->getMockBuilder('Magento\Framework\UrlInterface')
+            ->disableOriginalConstructor()
+            ->getMockForAbstractClass();
+
         $this->contextMock->expects($this->any())
             ->method('getRequest')
             ->will($this->returnValue($this->requestMock));
+        $this->contextMock->expects($this->any())
+            ->method('getUrlBuilder')
+            ->will($this->returnValue($this->urlBuilderMock));
 
         $this->form = $this->objectManager->getObject(
             'Magento\Catalog\Block\Adminhtml\Category\Edit\Form',
@@ -148,4 +160,28 @@ public function testGetCategoryId()
 
         $this->assertEquals(789, $this->form->getCategoryId());
     }
+
+    public function testGetDeleteUrl()
+    {
+        $url = 'some/magento/delete/url';
+        $params = ['property' => 'value'];
+        $this->urlBuilderMock->expects($this->once())
+            ->method('getUrl')
+            ->with('catalog/*/delete', ['_current' => true, '_query' => ['isAjax' => null], 'property' => 'value'])
+            ->willReturn($url);
+
+        $this->assertEquals($url, $this->form->getDeleteUrl($params));
+    }
+
+    public function testGetRefreshPathUrl()
+    {
+        $url = 'some/magento/refresh/path/url';
+        $params = ['argument' => 'value'];
+        $this->urlBuilderMock->expects($this->once())
+            ->method('getUrl')
+            ->with('catalog/*/refreshPath', ['_current' => true, '_query' => ['isAjax' => null], 'argument' => 'value'])
+            ->willReturn($url);
+
+        $this->assertEquals($url, $this->form->getRefreshPathUrl($params));
+    }
 }