Merge remote-tracking branch 'origin/MAGETWO-69185' into NORD-BUGFIXES-PR

RuslanKostiv1 · RuslanKostiv1 · commit 35782ad3c7e2 · 2017-06-13T16:41:13.000+03:00
diff --git a/app/code/Magento/Shipping/Test/Unit/Model/Shipping/LabelsTest.php b/app/code/Magento/Shipping/Test/Unit/Model/Shipping/LabelsTest.php
@@ -156,7 +156,7 @@ public function testRequestToShipment($regionId)
 
     /**
      * @expectedException \Magento\Framework\Exception\LocalizedException
-     * @dataProvider testRequestToShipmentLocalizedExceptionDataProvider
+     * @dataProvider requestToShipmentLocalizedExceptionDataProvider
      */
     public function testRequestToShipmentLocalizedException($isShipmentCarrierNotNull)
     {
@@ -280,7 +280,7 @@ public function requestToShipmentDataProvider()
      * Data provider to testRequestToShipmentLocalizedException
      * @return array
      */
-    public function testRequestToShipmentLocalizedExceptionDataProvider()
+    public function requestToShipmentLocalizedExceptionDataProvider()
     {
         return [
             [

Original file line number	Diff line number	Diff line change
`@@ -156,7 +156,7 @@ public function testRequestToShipment($regionId)`
`156`	`156`
`157`	`157`	`/**`
`158`	`158`	`* @expectedException \Magento\Framework\Exception\LocalizedException`
`159`		`- * @dataProvider testRequestToShipmentLocalizedExceptionDataProvider`
	`159`	`+ * @dataProvider requestToShipmentLocalizedExceptionDataProvider`
`160`	`160`	`*/`
`161`	`161`	`public function testRequestToShipmentLocalizedException($isShipmentCarrierNotNull)`
`162`	`162`	`{`
`@@ -280,7 +280,7 @@ public function requestToShipmentDataProvider()`
`280`	`280`	`* Data provider to testRequestToShipmentLocalizedException`
`281`	`281`	`* @return array`
`282`	`282`	`*/`
`283`		`- public function testRequestToShipmentLocalizedExceptionDataProvider()`
	`283`	`+ public function requestToShipmentLocalizedExceptionDataProvider()`
`284`	`284`	`{`
`285`	`285`	`return [`
`286`	`286`	`[`