Merge branch 'MAGETWO-37431' of https://github.corp.ebay.com/magento-firedrakes/magento2ce into MAGETWO-28011

sivaschenko · sivaschenko · commit 36e34dcc2883 · 2015-05-29T15:29:41.000+03:00
diff --git a/app/code/Magento/Sales/Model/Order.php b/app/code/Magento/Sales/Model/Order.php
@@ -427,6 +427,7 @@ public function setCanSendNewEmailFlag($flag)
     /**
      * Load order by system increment identifier
      *
+     * @deprecated
      * @param string $incrementId
      * @return \Magento\Sales\Model\Order
      */
diff --git a/dev/tests/functional/tests/app/Magento/Cms/Test/Page/CmsIndex.xml b/dev/tests/functional/tests/app/Magento/Cms/Test/Page/CmsIndex.xml
@@ -18,5 +18,6 @@
         <block name="currencyBlock" class="Magento\Directory\Test\Block\Currency\Switcher" locator=".switcher.currency" strategy="css selector" />
         <block name="cmsPageBlock" class="Magento\Cms\Test\Block\Page" locator=".page-main" strategy="css selector" />
         <block name="widgetView" class="Magento\Widget\Test\Block\WidgetView" locator=".widget" strategy="css selector" />
+        <block name="messagesBlock" class="Magento\Backend\Test\Block\Messages" locator=".messages" strategy="css selector"/>
     </page>
 </config>

Original file line number	Diff line number	Diff line change
`@@ -427,6 +427,7 @@ public function setCanSendNewEmailFlag($flag)`
`427`	`427`	`/**`
`428`	`428`	`* Load order by system increment identifier`
`429`	`429`	`*`
	`430`	`+ * @deprecated`
`430`	`431`	`* @param string $incrementId`
`431`	`432`	`* @return \Magento\Sales\Model\Order`
`432`	`433`	`*/`