Skip to content

Commit

Permalink
conflict resolved
Browse files Browse the repository at this point in the history
  • Loading branch information
engcom-Echo committed May 13, 2020
1 parent 179a72f commit a096270
Showing 1 changed file with 2 additions and 7 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -10,20 +10,16 @@
use Magento\Catalog\Ui\DataProvider\Product\Form\Modifier\Categories;
use Magento\Catalog\Model\ResourceModel\Category\CollectionFactory as CategoryCollectionFactory;
use Magento\Catalog\Model\ResourceModel\Category\Collection as CategoryCollection;
use Magento\Catalog\Model\ResourceModel\Category\CollectionFactory as CategoryCollectionFactory;
use Magento\Catalog\Ui\DataProvider\Product\Form\Modifier\Categories;
use Magento\Framework\AuthorizationInterface;
use Magento\Framework\DB\Helper as DbHelper;
use Magento\Framework\UrlInterface;
use Magento\Store\Model\Store;
use Magento\Framework\AuthorizationInterface;
use Magento\Backend\Model\Auth\Session;
use Magento\Authorization\Model\Role;
use Magento\User\Model\User;
use PHPUnit\Framework\MockObject\MockObject;

/**
* Class CategoriesTest
*
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
*/
class CategoriesTest extends AbstractModifierTest
Expand Down Expand Up @@ -59,7 +55,7 @@ class CategoriesTest extends AbstractModifierTest
private $authorizationMock;

/**
* @var \Magento\Backend\Model\Auth\Session|\PHPUnit\Framework\MockObject\MockObject
* @var Session|MockObject
*/
private $sessionMock;

Expand Down Expand Up @@ -88,7 +84,6 @@ protected function setUp(): void
->setMethods(['getUser'])
->disableOriginalConstructor()
->getMock();

$this->categoryCollectionFactoryMock->expects($this->any())
->method('create')
->willReturn($this->categoryCollectionMock);
Expand Down

0 comments on commit a096270

Please sign in to comment.