diff --git a/app/code/Magento/Authorizenet/etc/adminhtml/system.xml b/app/code/Magento/Authorizenet/etc/adminhtml/system.xml index 591d0951e2d45..cfff3a927453c 100644 --- a/app/code/Magento/Authorizenet/etc/adminhtml/system.xml +++ b/app/code/Magento/Authorizenet/etc/adminhtml/system.xml @@ -44,45 +44,48 @@ - + + + + Magento\Config\Model\Config\Source\Locale\Currency - + Magento\Config\Model\Config\Source\Yesno - + Magento\Config\Model\Config\Source\Yesno - + validate-email - + Magento\Authorizenet\Model\Source\Cctype - + Magento\Config\Model\Config\Source\Yesno - + Magento\Payment\Model\Config\Source\Allspecificcountries - + Magento\Directory\Model\Config\Source\Country - + - + - + validate-number diff --git a/app/code/Magento/Authorizenet/etc/config.xml b/app/code/Magento/Authorizenet/etc/config.xml index a620f157b10e4..d672c305df335 100644 --- a/app/code/Magento/Authorizenet/etc/config.xml +++ b/app/code/Magento/Authorizenet/etc/config.xml @@ -30,6 +30,8 @@ authorizenet/directpost_payment/place https://test.authorize.net/gateway/transact.dll https://secure.authorize.net/gateway/transact.dll + https://apitest.authorize.net/xml/v1/request.api + https://api2.authorize.net/xml/v1/request.api diff --git a/app/code/Magento/Backend/Block/Store/Switcher.php b/app/code/Magento/Backend/Block/Store/Switcher.php index a224e2a3b40d9..8cf98be294f97 100644 --- a/app/code/Magento/Backend/Block/Store/Switcher.php +++ b/app/code/Magento/Backend/Block/Store/Switcher.php @@ -558,4 +558,17 @@ public function getHintHtml() } return $html; } + + /** + * Get whether iframe is being used + * + * @return bool + */ + public function isUsingIframe() + { + if ($this->hasData('is_using_iframe')) { + return (bool)$this->getData('is_using_iframe'); + } + return false; + } } diff --git a/app/code/Magento/Backend/view/adminhtml/templates/store/switcher.phtml b/app/code/Magento/Backend/view/adminhtml/templates/store/switcher.phtml index a2f94b3563cfc..ef97688024295 100644 --- a/app/code/Magento/Backend/view/adminhtml/templates/store/switcher.phtml +++ b/app/code/Magento/Backend/view/adminhtml/templates/store/switcher.phtml @@ -30,7 +30,8 @@ class="admin__action-dropdown" data-mage-init='{"dropdown":{}}' data-toggle="dropdown" - aria-haspopup="true"> + aria-haspopup="true" + id="store-change-button"> getCurrentSelectionName() ?>
    @@ -168,15 +169,35 @@ require(['jquery'], function(jQuery){ }; scopeSwitcherHandler(switcherParams); } else { - var url = 'getSwitchUrl() ?>' + scopeParams; + getUseConfirm()): ?> if (confirm("")) { - setLocation(url); + reload(); } else { obj.value = 'getStoreId() ?>'; } + reload(); + + } + + function reload() { + isUsingIframe()): ?> + var url = 'getSwitchUrl() ?>' + scopeParams; setLocation(url); + + jQuery('#preview_selected_store').val(scopeId); + jQuery('#preview_form').submit(); + + jQuery('.store-switcher .dropdown-menu li a').each(function() { + var $this = jQuery(this); + + if ($this.data('role') === 'store-view-id' && $this.data('value') == scopeId) { + jQuery('#store-change-button').html($this.text()); + } + }); + + jQuery('#store-change-button').click(); } } diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Block/MassDelete.php b/app/code/Magento/Cms/Controller/Adminhtml/Block/MassDelete.php index d9a8c044873cf..6004e737bb04b 100644 --- a/app/code/Magento/Cms/Controller/Adminhtml/Block/MassDelete.php +++ b/app/code/Magento/Cms/Controller/Adminhtml/Block/MassDelete.php @@ -47,12 +47,13 @@ public function __construct(Context $context, Filter $filter, CollectionFactory public function execute() { $collection = $this->filter->getCollection($this->collectionFactory->create()); + $collectionSize = $collection->getSize(); - foreach ($collection as $item) { - $item->delete(); + foreach ($collection as $block) { + $block->delete(); } - $this->messageManager->addSuccess(__('A total of %1 record(s) have been deleted.', $collection->getSize())); + $this->messageManager->addSuccess(__('A total of %1 record(s) have been deleted.', $collectionSize)); /** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */ $resultRedirect = $this->resultFactory->create(ResultFactory::TYPE_REDIRECT); diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Page/MassDelete.php b/app/code/Magento/Cms/Controller/Adminhtml/Page/MassDelete.php index e5cfcf22966f5..6505b7e6b7d8d 100644 --- a/app/code/Magento/Cms/Controller/Adminhtml/Page/MassDelete.php +++ b/app/code/Magento/Cms/Controller/Adminhtml/Page/MassDelete.php @@ -46,12 +46,13 @@ public function __construct(Context $context, Filter $filter, CollectionFactory public function execute() { $collection = $this->filter->getCollection($this->collectionFactory->create()); + $collectionSize = $collection->getSize(); - foreach ($collection as $item) { - $item->delete(); + foreach ($collection as $page) { + $page->delete(); } - $this->messageManager->addSuccess(__('A total of %1 record(s) have been deleted.', $collection->getSize())); + $this->messageManager->addSuccess(__('A total of %1 record(s) have been deleted.', $collectionSize)); /** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */ $resultRedirect = $this->resultFactory->create(ResultFactory::TYPE_REDIRECT); diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Page/MassDisable.php b/app/code/Magento/Cms/Controller/Adminhtml/Page/MassDisable.php index e572618c62381..e3d39c9a6f2ac 100644 --- a/app/code/Magento/Cms/Controller/Adminhtml/Page/MassDisable.php +++ b/app/code/Magento/Cms/Controller/Adminhtml/Page/MassDisable.php @@ -52,7 +52,7 @@ public function execute() $item->save(); } - $this->messageManager->addSuccess(__('A total of %1 record(s) have been updated.', $collection->getSize())); + $this->messageManager->addSuccess(__('A total of %1 record(s) have been disabled.', $collection->getSize())); /** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */ $resultRedirect = $this->resultFactory->create(ResultFactory::TYPE_REDIRECT); diff --git a/app/code/Magento/Cms/Controller/Adminhtml/Page/MassEnable.php b/app/code/Magento/Cms/Controller/Adminhtml/Page/MassEnable.php index b8f4a69306977..a6c7415d9d5f1 100644 --- a/app/code/Magento/Cms/Controller/Adminhtml/Page/MassEnable.php +++ b/app/code/Magento/Cms/Controller/Adminhtml/Page/MassEnable.php @@ -52,7 +52,7 @@ public function execute() $item->save(); } - $this->messageManager->addSuccess(__('A total of %1 record(s) have been updated.', $collection->getSize())); + $this->messageManager->addSuccess(__('A total of %1 record(s) have been enabled.', $collection->getSize())); /** @var \Magento\Backend\Model\View\Result\Redirect $resultRedirect */ $resultRedirect = $this->resultFactory->create(ResultFactory::TYPE_REDIRECT); diff --git a/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/AbstractMassActionTest.php b/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/AbstractMassActionTest.php new file mode 100644 index 0000000000000..83802f3515b4d --- /dev/null +++ b/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/AbstractMassActionTest.php @@ -0,0 +1,68 @@ +objectManager = new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this); + + $this->messageManagerMock = $this->getMock('Magento\Framework\Message\ManagerInterface', [], [], '', false); + + $this->resultFactoryMock = $this->getMockBuilder('Magento\Framework\Controller\ResultFactory') + ->disableOriginalConstructor() + ->getMock(); + $this->resultRedirectMock = $this->getMockBuilder('Magento\Backend\Model\View\Result\Redirect') + ->disableOriginalConstructor() + ->getMock(); + $this->resultFactoryMock->expects($this->any()) + ->method('create') + ->with(ResultFactory::TYPE_REDIRECT, []) + ->willReturn($this->resultRedirectMock); + + $this->contextMock = $this->getMock('\Magento\Backend\App\Action\Context', [], [], '', false); + + $this->filterMock = $this->getMockBuilder('Magento\Ui\Component\MassAction\Filter') + ->disableOriginalConstructor() + ->getMock(); + + $this->contextMock->expects($this->any())->method('getMessageManager')->willReturn($this->messageManagerMock); + $this->contextMock->expects($this->any())->method('getResultFactory')->willReturn($this->resultFactoryMock); + } +} diff --git a/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Block/MassDeleteTest.php b/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Block/MassDeleteTest.php new file mode 100644 index 0000000000000..2910d63641d65 --- /dev/null +++ b/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Block/MassDeleteTest.php @@ -0,0 +1,97 @@ +collectionFactoryMock = $this->getMock( + 'Magento\Cms\Model\Resource\Block\CollectionFactory', + ['create'], + [], + '', + false + ); + + $this->blockCollectionMock = $this->getMock('Magento\Cms\Model\Resource\Block\Collection', [], [], '', false); + + $this->massDeleteController = $this->objectManager->getObject( + 'Magento\Cms\Controller\Adminhtml\Block\MassDelete', + [ + 'context' => $this->contextMock, + 'filter' => $this->filterMock, + 'collectionFactory' => $this->collectionFactoryMock + ] + ); + } + + public function testMassDeleteAction() + { + $deletedBlocksCount = 2; + + $collection = [ + $this->getBlockMock(), + $this->getBlockMock() + ]; + + $this->collectionFactoryMock->expects($this->once())->method('create')->willReturn($this->blockCollectionMock); + + $this->filterMock->expects($this->once()) + ->method('getCollection') + ->with($this->blockCollectionMock) + ->willReturn($this->blockCollectionMock); + + $this->blockCollectionMock->expects($this->once())->method('getSize')->willReturn($deletedBlocksCount); + $this->blockCollectionMock->expects($this->once()) + ->method('getIterator') + ->willReturn(new \ArrayIterator($collection)); + + $this->messageManagerMock->expects($this->once()) + ->method('addSuccess') + ->with(__('A total of %1 record(s) have been deleted.', $deletedBlocksCount)); + $this->messageManagerMock->expects($this->never())->method('addError'); + + $this->resultRedirectMock->expects($this->once()) + ->method('setPath') + ->with('*/*/') + ->willReturnSelf(); + + $this->assertSame($this->resultRedirectMock, $this->massDeleteController->execute()); + } + + /** + * Create Cms Block Collection Mock + * + * @return \Magento\Cms\Model\Resource\Block\Collection|\PHPUnit_Framework_MockObject_MockObject + */ + protected function getBlockMock() + { + $blockMock = $this->getMock('Magento\Cms\Model\Resource\Block\Collection', ['delete'], [], '', false); + $blockMock->expects($this->once())->method('delete')->willReturn(true); + + return $blockMock; + } +} diff --git a/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Page/MassDeleteTest.php b/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Page/MassDeleteTest.php new file mode 100644 index 0000000000000..6f87c8bca31c9 --- /dev/null +++ b/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Page/MassDeleteTest.php @@ -0,0 +1,97 @@ +collectionFactoryMock = $this->getMock( + 'Magento\Cms\Model\Resource\Page\CollectionFactory', + ['create'], + [], + '', + false + ); + + $this->pageCollectionMock = $this->getMock('Magento\Cms\Model\Resource\Page\Collection', [], [], '', false); + + $this->massDeleteController = $this->objectManager->getObject( + 'Magento\Cms\Controller\Adminhtml\Page\MassDelete', + [ + 'context' => $this->contextMock, + 'filter' => $this->filterMock, + 'collectionFactory' => $this->collectionFactoryMock + ] + ); + } + + public function testMassDeleteAction() + { + $deletedPagesCount = 2; + + $collection = [ + $this->getPageMock(), + $this->getPageMock() + ]; + + $this->collectionFactoryMock->expects($this->once())->method('create')->willReturn($this->pageCollectionMock); + + $this->filterMock->expects($this->once()) + ->method('getCollection') + ->with($this->pageCollectionMock) + ->willReturn($this->pageCollectionMock); + + $this->pageCollectionMock->expects($this->once())->method('getSize')->willReturn($deletedPagesCount); + $this->pageCollectionMock->expects($this->once()) + ->method('getIterator') + ->willReturn(new \ArrayIterator($collection)); + + $this->messageManagerMock->expects($this->once()) + ->method('addSuccess') + ->with(__('A total of %1 record(s) have been deleted.', $deletedPagesCount)); + $this->messageManagerMock->expects($this->never())->method('addError'); + + $this->resultRedirectMock->expects($this->once()) + ->method('setPath') + ->with('*/*/') + ->willReturnSelf(); + + $this->assertSame($this->resultRedirectMock, $this->massDeleteController->execute()); + } + + /** + * Create Cms Page Collection Mock + * + * @return \Magento\Cms\Model\Resource\Page\Collection|\PHPUnit_Framework_MockObject_MockObject + */ + protected function getPageMock() + { + $pageMock = $this->getMock('Magento\Cms\Model\Resource\Page\Collection', ['delete'], [], '', false); + $pageMock->expects($this->once())->method('delete')->willReturn(true); + + return $pageMock; + } +} diff --git a/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Page/MassDisableTest.php b/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Page/MassDisableTest.php new file mode 100644 index 0000000000000..7bc2ee03ecf6e --- /dev/null +++ b/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Page/MassDisableTest.php @@ -0,0 +1,104 @@ +collectionFactoryMock = $this->getMock( + 'Magento\Cms\Model\Resource\Page\CollectionFactory', + ['create'], + [], + '', + false + ); + + $this->pageCollectionMock = $this->getMock('Magento\Cms\Model\Resource\Page\Collection', [], [], '', false); + + $this->massDisableController = $this->objectManager->getObject( + 'Magento\Cms\Controller\Adminhtml\Page\MassDisable', + [ + 'context' => $this->contextMock, + 'filter' => $this->filterMock, + 'collectionFactory' => $this->collectionFactoryMock + ] + ); + } + + public function testMassDisableAction() + { + $disabledPagesCount = 2; + + $collection = [ + $this->getPageMock(), + $this->getPageMock() + ]; + + $this->collectionFactoryMock->expects($this->once())->method('create')->willReturn($this->pageCollectionMock); + + $this->filterMock->expects($this->once()) + ->method('getCollection') + ->with($this->pageCollectionMock) + ->willReturn($this->pageCollectionMock); + + $this->pageCollectionMock->expects($this->once())->method('getSize')->willReturn($disabledPagesCount); + $this->pageCollectionMock->expects($this->once()) + ->method('getIterator') + ->willReturn(new \ArrayIterator($collection)); + + $this->messageManagerMock->expects($this->once()) + ->method('addSuccess') + ->with(__('A total of %1 record(s) have been disabled.', $disabledPagesCount)); + $this->messageManagerMock->expects($this->never())->method('addError'); + + $this->resultRedirectMock->expects($this->once()) + ->method('setPath') + ->with('*/*/') + ->willReturnSelf(); + + $this->assertSame($this->resultRedirectMock, $this->massDisableController->execute()); + } + + /** + * Create Cms Page Collection Mock + * + * @return \Magento\Cms\Model\Resource\Page\Collection|\PHPUnit_Framework_MockObject_MockObject + */ + protected function getPageMock() + { + $pageMock = $this->getMock( + 'Magento\Cms\Model\Resource\Page\Collection', + ['setIsActive', 'save'], + [], + '', + false + ); + $pageMock->expects($this->once())->method('setIsActive')->with(false)->willReturn(true); + $pageMock->expects($this->once())->method('save')->willReturn(true); + + return $pageMock; + } +} diff --git a/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Page/MassEnableTest.php b/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Page/MassEnableTest.php new file mode 100644 index 0000000000000..2fbef8db33457 --- /dev/null +++ b/app/code/Magento/Cms/Test/Unit/Controller/Adminhtml/Page/MassEnableTest.php @@ -0,0 +1,104 @@ +collectionFactoryMock = $this->getMock( + 'Magento\Cms\Model\Resource\Page\CollectionFactory', + ['create'], + [], + '', + false + ); + + $this->pageCollectionMock = $this->getMock('Magento\Cms\Model\Resource\Page\Collection', [], [], '', false); + + $this->massEnableController = $this->objectManager->getObject( + 'Magento\Cms\Controller\Adminhtml\Page\MassEnable', + [ + 'context' => $this->contextMock, + 'filter' => $this->filterMock, + 'collectionFactory' => $this->collectionFactoryMock + ] + ); + } + + public function testMassEnableAction() + { + $enabledPagesCount = 2; + + $collection = [ + $this->getPageMock(), + $this->getPageMock() + ]; + + $this->collectionFactoryMock->expects($this->once())->method('create')->willReturn($this->pageCollectionMock); + + $this->filterMock->expects($this->once()) + ->method('getCollection') + ->with($this->pageCollectionMock) + ->willReturn($this->pageCollectionMock); + + $this->pageCollectionMock->expects($this->once())->method('getSize')->willReturn($enabledPagesCount); + $this->pageCollectionMock->expects($this->once()) + ->method('getIterator') + ->willReturn(new \ArrayIterator($collection)); + + $this->messageManagerMock->expects($this->once()) + ->method('addSuccess') + ->with(__('A total of %1 record(s) have been enabled.', $enabledPagesCount)); + $this->messageManagerMock->expects($this->never())->method('addError'); + + $this->resultRedirectMock->expects($this->once()) + ->method('setPath') + ->with('*/*/') + ->willReturnSelf(); + + $this->assertSame($this->resultRedirectMock, $this->massEnableController->execute()); + } + + /** + * Create Cms Page Collection Mock + * + * @return \Magento\Cms\Model\Resource\Page\Collection|\PHPUnit_Framework_MockObject_MockObject + */ + protected function getPageMock() + { + $pageMock = $this->getMock( + 'Magento\Cms\Model\Resource\Page\Collection', + ['setIsActive', 'save'], + [], + '', + false + ); + $pageMock->expects($this->once())->method('setIsActive')->with(true)->willReturn(true); + $pageMock->expects($this->once())->method('save')->willReturn(true); + + return $pageMock; + } +} diff --git a/app/code/Magento/Customer/Block/CustomerData.php b/app/code/Magento/Customer/Block/CustomerData.php index 60f5a10b91718..66d4043f152e6 100644 --- a/app/code/Magento/Customer/Block/CustomerData.php +++ b/app/code/Magento/Customer/Block/CustomerData.php @@ -7,6 +7,27 @@ class CustomerData extends \Magento\Framework\View\Element\Template { + /** + * Sections that can not be cached on frontend-side + * + * @var array + */ + protected $nonCachedSections = []; + + /** + * @param \Magento\Framework\View\Element\Template\Context $context + * @param array $data + * @param array $nonCachedSections + */ + public function __construct( + \Magento\Framework\View\Element\Template\Context $context, + array $data = [], + array $nonCachedSections = [] + ) { + $this->nonCachedSections = $nonCachedSections; + parent::__construct($context, $data); + } + /** * Get CookieLifeTime * @return null|string scopeCode @@ -29,4 +50,24 @@ public function getCustomerDataUrl($route) { return $this->getUrl($route, ['_secure' => $this->getRequest()->isSecure()]); } + + /** + * Get sections that can not be cached on frontend-side + * + * @return array + */ + public function getNotCachedSections() + { + return $this->nonCachedSections; + } + + /** + * Get keys of sections that can not be cached on frontend-side + * + * @return array + */ + public function getNonCachedSectionKeys() + { + return array_keys($this->nonCachedSections); + } } diff --git a/app/code/Magento/Customer/view/frontend/templates/js/customer-data.phtml b/app/code/Magento/Customer/view/frontend/templates/js/customer-data.phtml index 0be4fef69c4b1..9d6096765518c 100644 --- a/app/code/Magento/Customer/view/frontend/templates/js/customer-data.phtml +++ b/app/code/Magento/Customer/view/frontend/templates/js/customer-data.phtml @@ -13,6 +13,7 @@ '*' => ['Magento_Customer/js/customer-data' => [ 'sectionLoadUrl' => $block->getCustomerDataUrl('customer/section/load'), 'cookieLifeTime' => $block->getCookieLifeTime(), + 'nonCachedSections' => $block->getNonCachedSectionKeys(), ]], ]); ?> diff --git a/app/code/Magento/Customer/view/frontend/web/js/customer-data.js b/app/code/Magento/Customer/view/frontend/web/js/customer-data.js index f76913fee604f..726fa0816d71d 100644 --- a/app/code/Magento/Customer/view/frontend/web/js/customer-data.js +++ b/app/code/Magento/Customer/view/frontend/web/js/customer-data.js @@ -23,6 +23,8 @@ define([ storage.removeAll(); var date = new Date(Date.now() + parseInt(options.cookieLifeTime, 10) * 1000); $.localStorage.set('mage-cache-timeout', date); + } else { + invalidateNonCachedSections(options); } }; @@ -33,6 +35,12 @@ define([ } }; + var invalidateNonCachedSections = function(options) { + _.each(options.nonCachedSections, function (sectionName) { + storageInvalidation.set(sectionName, true); + }); + } + var dataProvider = { getFromStorage: function (sectionNames) { var result = {}; diff --git a/app/code/Magento/Widget/Model/Template/Filter.php b/app/code/Magento/Widget/Model/Template/Filter.php index a07bdd85de474..d2a9f11772deb 100644 --- a/app/code/Magento/Widget/Model/Template/Filter.php +++ b/app/code/Magento/Widget/Model/Template/Filter.php @@ -73,12 +73,12 @@ public function __construct( } /** - * Generate widget + * General method for generate widget * * @param string[] $construction * @return string */ - public function widgetDirective($construction) + public function generateWidget($construction) { $params = $this->getParameters($construction[2]); @@ -114,6 +114,17 @@ public function widgetDirective($construction) return $widget->toHtml(); } + /** + * Generate widget + * + * @param string[] $construction + * @return string + */ + public function widgetDirective($construction) + { + return $this->generateWidget($construction); + } + /** * Retrieve media file URL directive * diff --git a/app/code/Magento/Widget/Model/Template/FilterEmulate.php b/app/code/Magento/Widget/Model/Template/FilterEmulate.php new file mode 100644 index 0000000000000..9c7aefc55afe2 --- /dev/null +++ b/app/code/Magento/Widget/Model/Template/FilterEmulate.php @@ -0,0 +1,20 @@ +_appState->emulateAreaCode('frontend', [$this, 'generateWidget'], [$construction]); + } +} diff --git a/app/code/Magento/Widget/Test/Unit/Model/Template/FilterEmulateTest.php b/app/code/Magento/Widget/Test/Unit/Model/Template/FilterEmulateTest.php new file mode 100644 index 0000000000000..7a9115f5c4ca1 --- /dev/null +++ b/app/code/Magento/Widget/Test/Unit/Model/Template/FilterEmulateTest.php @@ -0,0 +1,59 @@ +objectManagerHelper = new ObjectManagerHelper($this); + $this->appStateMock = $this->getMock('Magento\Framework\App\State', [], [], '', false); + + $this->filterEmulate = $this->objectManagerHelper->getObject( + 'Magento\Widget\Model\Template\FilterEmulate', + ['appState' => $this->appStateMock] + ); + } + + /** + * @return void + */ + public function testWidgetDirective() + { + $result = 'some text'; + $construction = [ + '{{widget type="Widget\\Link" anchor_text="Test" template="block.phtml" id_path="p/1"}}', + 'widget', + ' type="" anchor_text="Test" template="block.phtml" id_path="p/1"' + ]; + + $this->appStateMock->expects($this->once()) + ->method('emulateAreaCode') + ->with('frontend', [$this->filterEmulate, 'generateWidget'], [$construction]) + ->willReturn($result); + $this->assertSame($result, $this->filterEmulate->widgetDirective($construction)); + } +} diff --git a/app/code/Magento/Widget/Test/Unit/Model/Template/FilterTest.php b/app/code/Magento/Widget/Test/Unit/Model/Template/FilterTest.php index 82c845cfe85b2..77921c4b21964 100644 --- a/app/code/Magento/Widget/Test/Unit/Model/Template/FilterTest.php +++ b/app/code/Magento/Widget/Test/Unit/Model/Template/FilterTest.php @@ -5,32 +5,269 @@ */ namespace Magento\Widget\Test\Unit\Model\Template; +use Magento\Framework\TestFramework\Unit\Helper\ObjectManager as ObjectManagerHelper; use Magento\Store\Model\StoreManagerInterface; class FilterTest extends \PHPUnit_Framework_TestCase { + /** + * @var \Magento\Widget\Model\Template\Filter + */ + protected $filter; + + /** + * @var ObjectManagerHelper + */ + protected $objectManagerHelper; + + /** + * @var \Magento\Store\Model\Store|\PHPUnit_Framework_MockObject_MockObject + */ + protected $storeMock; + + /** + * @var StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject + */ + protected $storeManagerMock; + + /** + * @var \Magento\Widget\Model\Resource\Widget|\PHPUnit_Framework_MockObject_MockObject + */ + protected $widgetResourceMock; + + /** + * @var \Magento\Widget\Model\Widget|\PHPUnit_Framework_MockObject_MockObject + */ + protected $widgetMock; + + /** + * @var \Magento\Framework\View\LayoutInterface|\PHPUnit_Framework_MockObject_MockObject + */ + protected $layoutMock; + + /** + * @return void + */ + protected function setUp() + { + $this->objectManagerHelper = new ObjectManagerHelper($this); + $this->storeMock = $this->getMock('Magento\Store\Model\Store', [], [], '', false); + $this->storeManagerMock = $this->getMock('Magento\Store\Model\StoreManagerInterface'); + $this->widgetResourceMock = $this->getMock('Magento\Widget\Model\Resource\Widget', [], [], '', false); + $this->widgetMock = $this->getMock('Magento\Widget\Model\Widget', [], [], '', false); + $this->layoutMock = $this->getMock('Magento\Framework\View\LayoutInterface'); + + $this->filter = $this->objectManagerHelper->getObject( + 'Magento\Widget\Model\Template\Filter', + [ + 'storeManager' => $this->storeManagerMock, + 'widgetResource' => $this->widgetResourceMock, + 'widget' => $this->widgetMock, + 'layout' => $this->layoutMock + ] + ); + } + + /** + * @param array $construction + * @param string $name + * @param string $type + * @param int $preConfigId + * @param array $params + * @param array $preconfigure + * @param string $widgetXml + * @param \Magento\Widget\Block\BlockInterface|null $widgetBlock + * @param string $expectedResult + * @return void + * @dataProvider generateWidgetDataProvider + */ + public function testGenerateWidget( + $construction, + $name, + $type, + $preConfigId, + $params, + $preconfigure, + $widgetXml, + $widgetBlock, + $expectedResult + ) { + $this->generalForGenerateWidget($name, $type, $preConfigId, $params, $preconfigure, $widgetXml, $widgetBlock); + $this->assertSame($expectedResult, $this->filter->generateWidget($construction)); + } + + /** + * @param array $construction + * @param string $name + * @param string $type + * @param int $preConfigId + * @param array $params + * @param array $preconfigure + * @param string $widgetXml + * @param \Magento\Widget\Block\BlockInterface|null $widgetBlock + * @param string $expectedResult + * @return void + * @dataProvider generateWidgetDataProvider + */ + public function testWidgetDirective( + $construction, + $name, + $type, + $preConfigId, + $params, + $preconfigure, + $widgetXml, + $widgetBlock, + $expectedResult + ) { + $this->generalForGenerateWidget($name, $type, $preConfigId, $params, $preconfigure, $widgetXml, $widgetBlock); + $this->assertSame($expectedResult, $this->filter->widgetDirective($construction)); + } + + /** + * @return array + */ + public function generateWidgetDataProvider() + { + return [ + [ + 'construction' => [ + '{{widget type="Widget\\Link" anchor_text="Test" template="block.phtml" id_path="p/1"}}', + 'widget', + ' type="" anchor_text="Test" template="block.phtml" id_path="p/1"' + ], + 'name' => null, + 'type' => 'Widget\Link', + 'preConfigId' => null, + 'params' => ['id' => ''], + 'preconfigure' => [], + 'widgetXml' => '', + 'widgetBlock' => null, + 'expectedResult' => '' + ], + [ + 'construction' => [ + '{{widget type="Widget\\Link" anchor_text="Test" template="block.phtml" id_path="p/1"}}', + 'widget', + ' type="" id="1" anchor_text="Test" template="block.phtml" id_path="p/1"' + ], + 'name' => null, + 'type' => null, + 'preConfigId' => 1, + 'params' => ['id' => '1'], + 'preconfigure' => ['widget_type' => '', 'parameters' => ''], + 'widgetXml' => null, + 'widgetBlock' => null, + 'expectedResult' => '' + ], + [ + 'construction' => [ + '{{widget type="Widget\\Link" anchor_text="Test" template="block.phtml" id_path="p/1"}}', + 'widget', + ' type="" name="testName" id="1" anchor_text="Test" template="block.phtml" id_path="p/1"' + ], + 'name' => 'testName', + 'type' => 'Widget\Link', + 'preConfigId' => 1, + 'params' => ['id' => '1'], + 'preconfigure' => ['widget_type' => "Widget\\Link", 'parameters' => ['id' => '1']], + 'widgetXml' => 'some xml', + 'widgetBlock' => $this->getBlockMock('widget text'), + 'expectedResult' => 'widget text' + ], + [ + 'construction' => [ + '{{widget type="Widget\\Link" anchor_text="Test" template="block.phtml" id_path="p/1"}}', + 'widget', + ' type="Widget\\Link" name="testName" anchor_text="Test" template="block.phtml" id_path="p/1"' + ], + 'name' => 'testName', + 'type' => 'Widget\Link', + 'preConfigId' => null, + 'params' => [ + 'type' => 'Widget\Link', + 'name' => 'testName', + 'anchor_text' => 'Test', + 'template' => 'block.phtml', + 'id_path' => 'p/1' + ], + 'preconfigure' => [], + 'widgetXml' => 'some xml', + 'widgetBlock' => $this->getBlockMock('widget text'), + 'expectedResult' => 'widget text' + ], + ]; + } + + /** + * @param string $name + * @param string $type + * @param int $preConfigId + * @param array $params + * @param array $preconfigure + * @param string $widgetXml + * @param \Magento\Widget\Block\BlockInterface|null $widgetBlock + * @return void + * @dataProvider generateWidgetDataProvider + */ + protected function generalForGenerateWidget( + $name, + $type, + $preConfigId, + $params, + $preconfigure, + $widgetXml, + $widgetBlock + ) { + $this->widgetResourceMock->expects($this->any()) + ->method('loadPreconfiguredWidget') + ->with($preConfigId) + ->willReturn($preconfigure); + $this->widgetMock->expects($this->any()) + ->method('getWidgetByClassType') + ->with($type) + ->willReturn($widgetXml); + $this->layoutMock->expects($this->any()) + ->method('createBlock') + ->with($type, $name, ['data' => $params]) + ->willReturn($widgetBlock); + } + + /** + * @param string $returnedResult + * @return \Magento\Widget\Block\BlockInterface|\PHPUnit_Framework_MockObject_MockObject + */ + protected function getBlockMock($returnedResult = '') + { + /** @var \Magento\Widget\Block\BlockInterface|\PHPUnit_Framework_MockObject_MockObject $blockMock */ + $blockMock = $this->getMockBuilder('Magento\Widget\Block\BlockInterface') + ->setMethods(['toHtml']) + ->getMockForAbstractClass(); + $blockMock->expects($this->any()) + ->method('toHtml') + ->willReturn($returnedResult); + + return $blockMock; + } + + /** + * @return void + */ public function testMediaDirective() { $image = 'wysiwyg/VB.png'; $construction = ['{{media url="' . $image . '"}}', 'media', ' url="' . $image . '"']; $baseUrl = 'http://localhost/pub/media/'; - /** @var \Magento\Store\Model\Store|\PHPUnit_Framework_MockObject_MockObject $storeMock */ - $storeMock = $this->getMock('Magento\Store\Model\Store', [], [], '', false); - $storeMock->expects($this->once())->method('getBaseUrl')->with(\Magento\Framework\UrlInterface::URL_TYPE_MEDIA) + $this->storeMock->expects($this->once()) + ->method('getBaseUrl') + ->with(\Magento\Framework\UrlInterface::URL_TYPE_MEDIA) ->willReturn($baseUrl); + $this->storeManagerMock->expects($this->once()) + ->method('getStore') + ->willReturn($this->storeMock); - /** @var StoreManagerInterface|\PHPUnit_Framework_MockObject_MockObject $storeManagerMock */ - $storeManagerMock = $this->getMock('Magento\Store\Model\StoreManagerInterface', [], [], '', false); - $storeManagerMock->expects($this->once())->method('getStore')->will($this->returnValue($storeMock)); - - /** @var \Magento\Widget\Model\Template\Filter $filter */ - $filter = (new \Magento\Framework\TestFramework\Unit\Helper\ObjectManager($this)) - ->getObject( - 'Magento\Widget\Model\Template\Filter', - ['storeManager' => $storeManagerMock] - ); - $result = $filter->mediaDirective($construction); + $result = $this->filter->mediaDirective($construction); $this->assertEquals($baseUrl . $image, $result); } } diff --git a/app/code/Magento/Widget/etc/adminhtml/di.xml b/app/code/Magento/Widget/etc/adminhtml/di.xml index 723a652e4548b..52d47c1c9391e 100644 --- a/app/code/Magento/Widget/etc/adminhtml/di.xml +++ b/app/code/Magento/Widget/etc/adminhtml/di.xml @@ -14,4 +14,10 @@ + + + Magento\Widget\Model\Template\FilterEmulate + Magento\Widget\Model\Template\FilterEmulate + +