MAGETWO-35610: Merge and Fix Tests

arkadiych · arkadiych · commit 5ff3cf34df40 · 2015-03-31T19:28:52.000+03:00
- fixed wrong method name
diff --git a/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_methods.php b/dev/tests/static/testsuite/Magento/Test/Legacy/_files/obsolete_methods.php
@@ -341,7 +341,7 @@
     [
         'getIsMessagesAvailable',
         'Magento\GiftMessage\Helper\Message',
-        'Magento\GiftMessage\Helper\Message::isMessageAllowed'
+        'Magento\GiftMessage\Helper\Message::isMessagesAllowed'
     ],
     ['drawOpenCategoryItem', 'Magento\Catalog\Block\Navigation'],
     ['renderCategoriesMenuHtml', 'Magento\Catalog\Block\Navigation'],

Original file line number	Diff line number	Diff line change
`@@ -341,7 +341,7 @@`
`341`	`341`	`[`
`342`	`342`	`'getIsMessagesAvailable',`
`343`	`343`	`'Magento\GiftMessage\Helper\Message',`
`344`		`- 'Magento\GiftMessage\Helper\Message::isMessageAllowed'`
	`344`	`+ 'Magento\GiftMessage\Helper\Message::isMessagesAllowed'`
`345`	`345`	`],`
`346`	`346`	`['drawOpenCategoryItem', 'Magento\Catalog\Block\Navigation'],`
`347`	`347`	`['renderCategoriesMenuHtml', 'Magento\Catalog\Block\Navigation'],`