Merge branch '2.2-develop' of github.com:magento/magento2ce into 2.2-bugs

omiroshnichenko · omiroshnichenko · commit d2b51b5fae89 · 2017-09-20T19:25:54.000+03:00
diff --git a/dev/tests/integration/testsuite/Magento/Paypal/Controller/ExpressTest.php b/dev/tests/integration/testsuite/Magento/Paypal/Controller/ExpressTest.php
@@ -141,10 +141,12 @@ public function testStartActionCustomerToQuote()
     /**
      * Test return action with configurable product.
      *
-     * @magentoDataFixture Magento/Paypal/_files/quote_express_configurable.php
+     * #magentoDataFixture Magento/Paypal/_files/quote_express_configurable.php skipped due to MAGETWO-75517
      */
     public function testReturnAction()
     {
+
+        $this->markTestSkipped('Test skipped due to MAGETWO-75517');
         $quote = $this->_objectManager->create(Quote::class);
         $quote->load('test_cart_with_configurable', 'reserved_order_id');
 

Original file line number	Diff line number	Diff line change
`@@ -141,10 +141,12 @@ public function testStartActionCustomerToQuote()`
`141`	`141`	`/**`
`142`	`142`	`* Test return action with configurable product.`
`143`	`143`	`*`
`144`		`- * @magentoDataFixture Magento/Paypal/_files/quote_express_configurable.php`
	`144`	`+ * #magentoDataFixture Magento/Paypal/_files/quote_express_configurable.php skipped due to MAGETWO-75517`
`145`	`145`	`*/`
`146`	`146`	`public function testReturnAction()`
`147`	`147`	`{`
	`148`	`+`
	`149`	`+ $this->markTestSkipped('Test skipped due to MAGETWO-75517');`
`148`	`150`	`$quote = $this->_objectManager->create(Quote::class);`
`149`	`151`	`$quote->load('test_cart_with_configurable', 'reserved_order_id');`
`150`	`152`