Merge remote-tracking branch 'origin/MAGETWO-90719-reorder-exception' into BugFixPR

Author: Joan He

app/code/Magento/Catalog/Test/Mftf/Test/StorefrontPurchaseProductWithCustomOptions.xml

@@ -16,9 +16,7 @@
             <description value="Admin should be able to sell products with different variants of their own"/>
             <severity value="CRITICAL"/>
             <testCaseId value="MAGETWO-61717"/>
-            <skip>
-                <issueId value="MAGETWO-90719"/>
-            </skip>
+            <group value="Catalog"/>
         </annotations>
         <before>
             <createData entity="Simple_US_Customer" stepKey="createCustomer"/>

composer.json

@@ -38,7 +38,7 @@
         "elasticsearch/elasticsearch": "~2.0|~5.1",
         "magento/composer": "~1.4.0",
         "magento/magento-composer-installer": ">=0.1.11",
-        "magento/zendframework1": "~1.14.0",
+        "magento/zendframework1": "~1.14.1",
         "monolog/monolog": "^1.17",
         "oyejorge/less.php": "~1.7.0",
         "pelago/emogrifier": "^2.0.0",

composer.lock

@@ -30,6 +30,9 @@ class ValidatorInfoTest extends \PHPUnit\Framework\TestCase
      */
     protected $validateFactoryMock;
 
+    /**
+     * {@inheritdoc}
+     */
     protected function setUp()
     {
         $this->objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
@@ -111,11 +114,11 @@ public function testExceptionWithoutErrors()
      */
     public function testValidate()
     {
-        $validateMock = $this->createPartialMock(\Zend_Validate::class, ['isValid']);
-        $validateMock->expects($this->once())->method('isValid')->will($this->returnValue(true));
+        //use actual zend class to test changed functionality
+        $validate = $this->objectManager->create(\Zend_Validate::class);
         $this->validateFactoryMock->expects($this->once())
             ->method('create')
-            ->will($this->returnValue($validateMock));
+            ->will($this->returnValue($validate));
         $this->assertTrue(
             $this->model->validate(
                 $this->getOptionValue(),