Merge branch 'MAGETWO-31369' of https://github.corp.ebay.com/magento-south/magento2ce into MAGETWO-31369

okarpenko · okarpenko · commit a3d60eff7ce2 · 2015-02-09T19:16:19.000+02:00
Conflicts:
	dev/tests/unit/testsuite/Magento/Theme/Block/Adminhtml/System/Design/Theme/Tab/CssTest.php
	dev/tests/unit/testsuite/Magento/Theme/Block/Html/Header/LogoTest.php
	dev/tests/unit/testsuite/Magento/Theme/Helper/StorageTest.php
	dev/tests/unit/testsuite/Magento/Theme/Model/ConfigTest.php
	dev/tests/unit/testsuite/Magento/Theme/Model/CopyServiceTest.php
	dev/tests/unit/testsuite/Magento/Theme/Model/Wysiwyg/StorageTest.php
	dev/tests/unit/testsuite/Magento/Wishlist/Controller/Index/AddTest.php
diff --git a/dev/tests/unit/testsuite/Magento/Theme/Block/Adminhtml/System/Design/Theme/Tab/CssTest.php b/dev/tests/unit/testsuite/Magento/Theme/Block/Adminhtml/System/Design/Theme/Tab/CssTest.php
@@ -126,7 +126,7 @@ protected static function getMethod($name)
     }
 
     /**
-     * covers \Magento\Theme\Block\Adminhtml\System\Design\Theme\Edit\Tab\Css::getDownloadUrl
+     * cover \Magento\Theme\Block\Adminhtml\System\Design\Theme\Edit\Tab\Css::getDownloadUrl
      */
     public function testGetterDownloadUrl()
     {
diff --git a/dev/tests/unit/testsuite/Magento/Theme/Block/Html/Header/LogoTest.php b/dev/tests/unit/testsuite/Magento/Theme/Block/Html/Header/LogoTest.php
@@ -8,7 +8,7 @@
 class LogoTest extends \PHPUnit_Framework_TestCase
 {
     /**
-     * covers \Magento\Theme\Block\Html\Header\Logo::getLogoSrc
+     * cover \Magento\Theme\Block\Html\Header\Logo::getLogoSrc
      */
     public function testGetLogoSrc()
     {
diff --git a/dev/tests/unit/testsuite/Magento/Theme/Helper/StorageTest.php b/dev/tests/unit/testsuite/Magento/Theme/Helper/StorageTest.php
@@ -136,7 +136,7 @@ protected function tearDown()
     }
 
     /**
-     * covers \Magento\Theme\Helper\Storage::getShortFilename
+     * cover \Magento\Theme\Helper\Storage::getShortFilename
      */
     public function testGetShortFilename()
     {
diff --git a/dev/tests/unit/testsuite/Magento/Theme/Model/ConfigTest.php b/dev/tests/unit/testsuite/Magento/Theme/Model/ConfigTest.php
@@ -95,7 +95,7 @@ protected function tearDown()
     }
 
     /**
-     * covers \Magento\Theme\Model\Config::assignToStore
+     * cover \Magento\Theme\Model\Config::assignToStore
      */
     public function testAssignToStoreInSingleStoreMode()
     {
@@ -146,7 +146,7 @@ public function testAssignToStoreInSingleStoreMode()
     }
 
     /**
-     * covers \Magento\Theme\Model\Config::assignToStore
+     * cover \Magento\Theme\Model\Config::assignToStore
      */
     public function testAssignToStoreNonSingleStoreMode()
     {
diff --git a/dev/tests/unit/testsuite/Magento/Theme/Model/CopyServiceTest.php b/dev/tests/unit/testsuite/Magento/Theme/Model/CopyServiceTest.php
@@ -253,7 +253,7 @@ protected function tearDown()
     }
 
     /**
-     * covers \Magento\Theme\Model\CopyService::_copyLayoutCustomization
+     * cover \Magento\Theme\Model\CopyService::_copyLayoutCustomization
      */
     public function testCopyLayoutUpdates()
     {
@@ -336,7 +336,7 @@ public function testCopyLayoutUpdates()
     }
 
     /**
-     * covers \Magento\Theme\Model\CopyService::_copyDatabaseCustomization
+     * cover \Magento\Theme\Model\CopyService::_copyDatabaseCustomization
      * @SuppressWarnings(PHPMD.ExcessiveMethodLength)
      */
     public function testCopyDatabaseCustomization()
@@ -459,7 +459,7 @@ public function testCopyDatabaseCustomization()
     }
 
     /**
-     * covers \Magento\Theme\Model\CopyService::_copyFilesystemCustomization
+     * cover \Magento\Theme\Model\CopyService::_copyFilesystemCustomization
      */
     public function testCopyFilesystemCustomization()
     {
diff --git a/dev/tests/unit/testsuite/Magento/Theme/Model/Wysiwyg/StorageTest.php b/dev/tests/unit/testsuite/Magento/Theme/Model/Wysiwyg/StorageTest.php
@@ -102,8 +102,8 @@ protected function tearDown()
     }
 
     /**
-     * covers \Magento\Theme\Model\Wysiwyg\Storage::_createThumbnail
-     * covers \Magento\Theme\Model\Wysiwyg\Storage::uploadFile
+     * cover \Magento\Theme\Model\Wysiwyg\Storage::_createThumbnail
+     * cover \Magento\Theme\Model\Wysiwyg\Storage::uploadFile
      */
     public function testUploadFile()
     {
@@ -154,7 +154,7 @@ public function testUploadFile()
     }
 
     /**
-     * covers \Magento\Theme\Model\Wysiwyg\Storage::uploadFile
+     * cover \Magento\Theme\Model\Wysiwyg\Storage::uploadFile
      * @expectedException \Magento\Framework\Model\Exception
      */
     public function testUploadInvalidFile()
@@ -183,7 +183,7 @@ protected function _prepareUploader()
 
     /**
      * @dataProvider booleanCasesDataProvider
-     * covers \Magento\Theme\Model\Wysiwyg\Storage::createFolder
+     * cover \Magento\Theme\Model\Wysiwyg\Storage::createFolder
      */
     public function testCreateFolder($isWritable)
     {
@@ -252,7 +252,7 @@ public function testCreateFolder($isWritable)
     }
 
     /**
-     * covers \Magento\Theme\Model\Wysiwyg\Storage::createFolder
+     * cover \Magento\Theme\Model\Wysiwyg\Storage::createFolder
      * @expectedException \Magento\Framework\Model\Exception
      */
     public function testCreateFolderWithInvalidName()
@@ -262,7 +262,7 @@ public function testCreateFolderWithInvalidName()
     }
 
     /**
-     * covers \Magento\Theme\Model\Wysiwyg\Storage::createFolder
+     * cover \Magento\Theme\Model\Wysiwyg\Storage::createFolder
      * @expectedException \Magento\Framework\Model\Exception
      */
     public function testCreateFolderDirectoryAlreadyExist()
@@ -294,7 +294,7 @@ public function testCreateFolderDirectoryAlreadyExist()
     }
 
     /**
-     * covers \Magento\Theme\Model\Wysiwyg\Storage::getDirsCollection
+     * cover \Magento\Theme\Model\Wysiwyg\Storage::getDirsCollection
      */
     public function testGetDirsCollection()
     {
@@ -318,7 +318,7 @@ public function testGetDirsCollection()
     }
 
     /**
-     * covers \Magento\Theme\Model\Wysiwyg\Storage::getDirsCollection
+     * cover \Magento\Theme\Model\Wysiwyg\Storage::getDirsCollection
      * @expectedException \Magento\Framework\Model\Exception
      */
     public function testGetDirsCollectionWrongDirName()
@@ -337,7 +337,7 @@ public function testGetDirsCollectionWrongDirName()
     }
 
     /**
-     * covers \Magento\Theme\Model\Wysiwyg\Storage::getFilesCollection
+     * cover \Magento\Theme\Model\Wysiwyg\Storage::getFilesCollection
      */
     public function testGetFilesCollection()
     {
@@ -373,7 +373,7 @@ public function testGetFilesCollection()
     }
 
     /**
-     * covers \Magento\Theme\Model\Wysiwyg\Storage::getFilesCollection
+     * cover \Magento\Theme\Model\Wysiwyg\Storage::getFilesCollection
      */
     public function testGetFilesCollectionImageType()
     {
@@ -417,7 +417,7 @@ public function testGetFilesCollectionImageType()
     }
 
     /**
-     * covers \Magento\Theme\Model\Wysiwyg\Storage::getTreeArray
+     * cover \Magento\Theme\Model\Wysiwyg\Storage::getTreeArray
      */
     public function testTreeArray()
     {
@@ -460,7 +460,7 @@ public function testTreeArray()
     }
 
     /**
-     * covers \Magento\Theme\Model\Wysiwyg\Storage::deleteFile
+     * cover \Magento\Theme\Model\Wysiwyg\Storage::deleteFile
      */
     public function testDeleteFile()
     {
@@ -503,7 +503,7 @@ public function testDeleteFile()
     }
 
     /**
-     * covers \Magento\Theme\Model\Wysiwyg\Storage::deleteDirectory
+     * cover \Magento\Theme\Model\Wysiwyg\Storage::deleteDirectory
      */
     public function testDeleteDirectory()
     {
@@ -523,7 +523,7 @@ public function testDeleteDirectory()
     }
 
     /**
-     * covers \Magento\Theme\Model\Wysiwyg\Storage::deleteDirectory
+     * cover \Magento\Theme\Model\Wysiwyg\Storage::deleteDirectory
      * @expectedException \Magento\Framework\Model\Exception
      */
     public function testDeleteRootDirectory()
diff --git a/dev/tests/unit/testsuite/Magento/Wishlist/Controller/Index/AddTest.php b/dev/tests/unit/testsuite/Magento/Wishlist/Controller/Index/AddTest.php

Original file line number	Diff line number	Diff line change
`@@ -126,7 +126,7 @@ protected static function getMethod($name)`
`126`	`126`	`}`
`127`	`127`
`128`	`128`	`/**`
`129`		`- * covers \Magento\Theme\Block\Adminhtml\System\Design\Theme\Edit\Tab\Css::getDownloadUrl`
	`129`	`+ * cover \Magento\Theme\Block\Adminhtml\System\Design\Theme\Edit\Tab\Css::getDownloadUrl`
`130`	`130`	`*/`
`131`	`131`	`public function testGetterDownloadUrl()`
`132`	`132`	`{`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@`
`8`	`8`	`class LogoTest extends \PHPUnit_Framework_TestCase`
`9`	`9`	`{`
`10`	`10`	`/**`
`11`		`- * covers \Magento\Theme\Block\Html\Header\Logo::getLogoSrc`
	`11`	`+ * cover \Magento\Theme\Block\Html\Header\Logo::getLogoSrc`
`12`	`12`	`*/`
`13`	`13`	`public function testGetLogoSrc()`
`14`	`14`	`{`
Original file line number	Diff line number	Diff line change
`@@ -136,7 +136,7 @@ protected function tearDown()`
`136`	`136`	`}`
`137`	`137`
`138`	`138`	`/**`
`139`		`- * covers \Magento\Theme\Helper\Storage::getShortFilename`
	`139`	`+ * cover \Magento\Theme\Helper\Storage::getShortFilename`
`140`	`140`	`*/`
`141`	`141`	`public function testGetShortFilename()`
`142`	`142`	`{`
Original file line number	Diff line number	Diff line change
`@@ -95,7 +95,7 @@ protected function tearDown()`
`95`	`95`	`}`
`96`	`96`
`97`	`97`	`/**`
`98`		`- * covers \Magento\Theme\Model\Config::assignToStore`
	`98`	`+ * cover \Magento\Theme\Model\Config::assignToStore`
`99`	`99`	`*/`
`100`	`100`	`public function testAssignToStoreInSingleStoreMode()`
`101`	`101`	`{`
`@@ -146,7 +146,7 @@ public function testAssignToStoreInSingleStoreMode()`
`146`	`146`	`}`
`147`	`147`
`148`	`148`	`/**`
`149`		`- * covers \Magento\Theme\Model\Config::assignToStore`
	`149`	`+ * cover \Magento\Theme\Model\Config::assignToStore`
`150`	`150`	`*/`
`151`	`151`	`public function testAssignToStoreNonSingleStoreMode()`
`152`	`152`	`{`
Original file line number	Diff line number	Diff line change
`@@ -253,7 +253,7 @@ protected function tearDown()`
`253`	`253`	`}`
`254`	`254`
`255`	`255`	`/**`
`256`		`- * covers \Magento\Theme\Model\CopyService::_copyLayoutCustomization`
	`256`	`+ * cover \Magento\Theme\Model\CopyService::_copyLayoutCustomization`
`257`	`257`	`*/`
`258`	`258`	`public function testCopyLayoutUpdates()`
`259`	`259`	`{`
`@@ -336,7 +336,7 @@ public function testCopyLayoutUpdates()`
`336`	`336`	`}`
`337`	`337`
`338`	`338`	`/**`
`339`		`- * covers \Magento\Theme\Model\CopyService::_copyDatabaseCustomization`
	`339`	`+ * cover \Magento\Theme\Model\CopyService::_copyDatabaseCustomization`
`340`	`340`	`* @SuppressWarnings(PHPMD.ExcessiveMethodLength)`
`341`	`341`	`*/`
`342`	`342`	`public function testCopyDatabaseCustomization()`
`@@ -459,7 +459,7 @@ public function testCopyDatabaseCustomization()`
`459`	`459`	`}`
`460`	`460`
`461`	`461`	`/**`
`462`		`- * covers \Magento\Theme\Model\CopyService::_copyFilesystemCustomization`
	`462`	`+ * cover \Magento\Theme\Model\CopyService::_copyFilesystemCustomization`
`463`	`463`	`*/`
`464`	`464`	`public function testCopyFilesystemCustomization()`
`465`	`465`	`{`
Original file line number	Diff line number	Diff line change
`@@ -102,8 +102,8 @@ protected function tearDown()`
`102`	`102`	`}`
`103`	`103`
`104`	`104`	`/**`
`105`		`- * covers \Magento\Theme\Model\Wysiwyg\Storage::_createThumbnail`
`106`		`- * covers \Magento\Theme\Model\Wysiwyg\Storage::uploadFile`
	`105`	`+ * cover \Magento\Theme\Model\Wysiwyg\Storage::_createThumbnail`
	`106`	`+ * cover \Magento\Theme\Model\Wysiwyg\Storage::uploadFile`
`107`	`107`	`*/`
`108`	`108`	`public function testUploadFile()`
`109`	`109`	`{`
`@@ -154,7 +154,7 @@ public function testUploadFile()`
`154`	`154`	`}`
`155`	`155`
`156`	`156`	`/**`
`157`		`- * covers \Magento\Theme\Model\Wysiwyg\Storage::uploadFile`
	`157`	`+ * cover \Magento\Theme\Model\Wysiwyg\Storage::uploadFile`
`158`	`158`	`* @expectedException \Magento\Framework\Model\Exception`
`159`	`159`	`*/`
`160`	`160`	`public function testUploadInvalidFile()`
`@@ -183,7 +183,7 @@ protected function _prepareUploader()`
`183`	`183`
`184`	`184`	`/**`
`185`	`185`	`* @dataProvider booleanCasesDataProvider`
`186`		`- * covers \Magento\Theme\Model\Wysiwyg\Storage::createFolder`
	`186`	`+ * cover \Magento\Theme\Model\Wysiwyg\Storage::createFolder`
`187`	`187`	`*/`
`188`	`188`	`public function testCreateFolder($isWritable)`
`189`	`189`	`{`
`@@ -252,7 +252,7 @@ public function testCreateFolder($isWritable)`
`252`	`252`	`}`
`253`	`253`
`254`	`254`	`/**`
`255`		`- * covers \Magento\Theme\Model\Wysiwyg\Storage::createFolder`
	`255`	`+ * cover \Magento\Theme\Model\Wysiwyg\Storage::createFolder`
`256`	`256`	`* @expectedException \Magento\Framework\Model\Exception`
`257`	`257`	`*/`
`258`	`258`	`public function testCreateFolderWithInvalidName()`
`@@ -262,7 +262,7 @@ public function testCreateFolderWithInvalidName()`
`262`	`262`	`}`
`263`	`263`
`264`	`264`	`/**`
`265`		`- * covers \Magento\Theme\Model\Wysiwyg\Storage::createFolder`
	`265`	`+ * cover \Magento\Theme\Model\Wysiwyg\Storage::createFolder`
`266`	`266`	`* @expectedException \Magento\Framework\Model\Exception`
`267`	`267`	`*/`
`268`	`268`	`public function testCreateFolderDirectoryAlreadyExist()`
`@@ -294,7 +294,7 @@ public function testCreateFolderDirectoryAlreadyExist()`
`294`	`294`	`}`
`295`	`295`
`296`	`296`	`/**`
`297`		`- * covers \Magento\Theme\Model\Wysiwyg\Storage::getDirsCollection`
	`297`	`+ * cover \Magento\Theme\Model\Wysiwyg\Storage::getDirsCollection`
`298`	`298`	`*/`
`299`	`299`	`public function testGetDirsCollection()`
`300`	`300`	`{`
`@@ -318,7 +318,7 @@ public function testGetDirsCollection()`
`318`	`318`	`}`
`319`	`319`
`320`	`320`	`/**`
`321`		`- * covers \Magento\Theme\Model\Wysiwyg\Storage::getDirsCollection`
	`321`	`+ * cover \Magento\Theme\Model\Wysiwyg\Storage::getDirsCollection`
`322`	`322`	`* @expectedException \Magento\Framework\Model\Exception`
`323`	`323`	`*/`
`324`	`324`	`public function testGetDirsCollectionWrongDirName()`
`@@ -337,7 +337,7 @@ public function testGetDirsCollectionWrongDirName()`
`337`	`337`	`}`
`338`	`338`
`339`	`339`	`/**`
`340`		`- * covers \Magento\Theme\Model\Wysiwyg\Storage::getFilesCollection`
	`340`	`+ * cover \Magento\Theme\Model\Wysiwyg\Storage::getFilesCollection`
`341`	`341`	`*/`
`342`	`342`	`public function testGetFilesCollection()`
`343`	`343`	`{`
`@@ -373,7 +373,7 @@ public function testGetFilesCollection()`
`373`	`373`	`}`
`374`	`374`
`375`	`375`	`/**`
`376`		`- * covers \Magento\Theme\Model\Wysiwyg\Storage::getFilesCollection`
	`376`	`+ * cover \Magento\Theme\Model\Wysiwyg\Storage::getFilesCollection`
`377`	`377`	`*/`
`378`	`378`	`public function testGetFilesCollectionImageType()`
`379`	`379`	`{`
`@@ -417,7 +417,7 @@ public function testGetFilesCollectionImageType()`
`417`	`417`	`}`
`418`	`418`
`419`	`419`	`/**`
`420`		`- * covers \Magento\Theme\Model\Wysiwyg\Storage::getTreeArray`
	`420`	`+ * cover \Magento\Theme\Model\Wysiwyg\Storage::getTreeArray`
`421`	`421`	`*/`
`422`	`422`	`public function testTreeArray()`
`423`	`423`	`{`
`@@ -460,7 +460,7 @@ public function testTreeArray()`
`460`	`460`	`}`
`461`	`461`
`462`	`462`	`/**`
`463`		`- * covers \Magento\Theme\Model\Wysiwyg\Storage::deleteFile`
	`463`	`+ * cover \Magento\Theme\Model\Wysiwyg\Storage::deleteFile`
`464`	`464`	`*/`
`465`	`465`	`public function testDeleteFile()`
`466`	`466`	`{`
`@@ -503,7 +503,7 @@ public function testDeleteFile()`
`503`	`503`	`}`
`504`	`504`
`505`	`505`	`/**`
`506`		`- * covers \Magento\Theme\Model\Wysiwyg\Storage::deleteDirectory`
	`506`	`+ * cover \Magento\Theme\Model\Wysiwyg\Storage::deleteDirectory`
`507`	`507`	`*/`
`508`	`508`	`public function testDeleteDirectory()`
`509`	`509`	`{`
`@@ -523,7 +523,7 @@ public function testDeleteDirectory()`
`523`	`523`	`}`
`524`	`524`
`525`	`525`	`/**`
`526`		`- * covers \Magento\Theme\Model\Wysiwyg\Storage::deleteDirectory`
	`526`	`+ * cover \Magento\Theme\Model\Wysiwyg\Storage::deleteDirectory`
`527`	`527`	`* @expectedException \Magento\Framework\Model\Exception`
`528`	`528`	`*/`
`529`	`529`	`public function testDeleteRootDirectory()`