MAGETWO-83094: Products Orderd Report exported CSV is empty

Author: dhorytskyi

dev/tests/integration/testsuite/Magento/Backend/Model/UrlTest.php

@@ -44,15 +44,37 @@ public function testGetUrl()
         $url = $this->_model->getUrl('adminhtml/auth/login');
         $this->assertContains('admin/auth/login/key/', $url);
 
-        $this->request->setParams(['param' => 'ab==']);
+        $routeParams = [
+            '_escape_params' => false,
+            'param1' => 'a1=='
+        ];
+        $url = $this->_model->getUrl('path', $routeParams);
+        $this->assertContains('/param1/a1==/', $url);
+
+        $this->request->setParams(['param2' => 'a2==']);
         $routeParams = [
             '_current' => true,
-            '_escape_params' => true,
+            '_escape_params' => false,
         ];
         $url = $this->_model->getUrl('path', $routeParams);
+        $this->assertContains('/param2/a2==/', $url);
+
         /** @var ParamEncoder $paramEncoder */
         $paramEncoder = Bootstrap::getObjectManager()->get(ParamEncoder::class);
-        $this->assertContains('/param/' . $paramEncoder->encode('ab==') . '/', $url);
+        $routeParams = [
+            '_escape_params' => true,
+            'param3' => 'a3=='
+        ];
+        $url = $this->_model->getUrl('path', $routeParams);
+        $this->assertContains('/param3/' . $paramEncoder->encode('a3==') . '/', $url);
+
+        $this->request->setParams(['param4' => 'a4==']);
+        $routeParams = [
+            '_current' => true,
+            '_escape_params' => true,
+        ];
+        $url = $this->_model->getUrl('path', $routeParams);
+        $this->assertContains('/param4/' . $paramEncoder->encode('a4==') . '/', $url);
     }
 
     /**

dev/tests/integration/testsuite/Magento/Customer/Controller/Adminhtml/IndexTest.php

@@ -217,8 +217,14 @@ public function testSaveActionWithValidCustomerDataAndValidAddressData()
         $this->assertNotEquals(0, $this->accountManagement->getDefaultBillingAddress($customerId));
         $this->assertNull($this->accountManagement->getDefaultShippingAddress($customerId));
 
+        $urlPatternParts = [
+            $this->_baseControllerUrl . 'edit',
+            'id/' . $customerId,
+            'back/1',
+        ];
+        $urlPattern = '/^' . str_replace('/', '\/', implode('(/.*/)|/', $urlPatternParts)) . '/';
         $this->assertRedirect(
-            $this->stringStartsWith($this->_baseControllerUrl . 'edit/id/' . $customerId . '/back/1')
+            $this->matchesRegularExpression($urlPattern)
         );
 
         /** @var \Magento\Newsletter\Model\Subscriber $subscriber */