From 6a2842bb45848e2d64268894819c6d775c4667c1 Mon Sep 17 00:00:00 2001 From: Alexander Paliarush Date: Tue, 14 Jul 2015 18:26:00 -0500 Subject: [PATCH 1/5] MAGETWO-38049: Wrong Reset Password link in a Welcome email when customer was created on backend - Fixed tests --- .../Magento/Email/Test/Unit/Model/TemplateTest.php | 12 +++++++++++- .../Newsletter/Test/Unit/Model/TemplateTest.php | 9 +++++++++ .../Magento/Email/Model/Template/FilterTest.php | 2 ++ 3 files changed, 22 insertions(+), 1 deletion(-) diff --git a/app/code/Magento/Email/Test/Unit/Model/TemplateTest.php b/app/code/Magento/Email/Test/Unit/Model/TemplateTest.php index 72945c314c400..b216d421cc77f 100644 --- a/app/code/Magento/Email/Test/Unit/Model/TemplateTest.php +++ b/app/code/Magento/Email/Test/Unit/Model/TemplateTest.php @@ -61,6 +61,11 @@ class TemplateTest extends \PHPUnit_Framework_TestCase */ private $filterFactory; + /** + * @var \Magento\Framework\Url|\PHPUnit_Framework_MockObject_MockObject + */ + private $urlModel; + /** * @var \Magento\Email\Model\Template\Config|\PHPUnit_Framework_MockObject_MockObject */ @@ -103,6 +108,9 @@ public function setUp() $this->templateFactory = $this->getMockBuilder('Magento\Email\Model\TemplateFactory') ->disableOriginalConstructor() ->getMock(); + $this->urlModel = $this->getMockBuilder('Magento\Framework\Url') + ->disableOriginalConstructor() + ->getMock(); $this->filterFactory = $this->getMockBuilder('Magento\Email\Model\Template\FilterFactory') ->setMethods(['create']) ->disableOriginalConstructor() @@ -131,6 +139,7 @@ protected function getModelMock(array $mockedMethods = []) $this->scopeConfig, $this->emailConfig, $this->templateFactory, + $this->urlModel, $this->filterFactory ] ) @@ -160,7 +169,7 @@ public function testSetAndGetTemplateFilter() public function testGetTemplateFilterWithEmptyValue() { $filterTemplate = $this->getMockBuilder('Magento\Framework\Filter\Template') - ->setMethods(['setUseAbsoluteLinks', 'setStoreId']) + ->setMethods(['setUseAbsoluteLinks', 'setStoreId', 'setUrlModel']) ->disableOriginalConstructor() ->getMock(); $filterTemplate->expects($this->once()) @@ -737,6 +746,7 @@ public function testGetType($templateType, $expectedResult) $this->getMock('Magento\Framework\App\Config\ScopeConfigInterface'), $emailConfig, $this->getMock('Magento\Email\Model\TemplateFactory', [], [], '', false), + $this->getMock('Magento\Framework\Url', [], [], '', false), $this->getMock('Magento\Email\Model\Template\FilterFactory', [], [], '', false), ['template_id' => 10], ] diff --git a/app/code/Magento/Newsletter/Test/Unit/Model/TemplateTest.php b/app/code/Magento/Newsletter/Test/Unit/Model/TemplateTest.php index 4e27c0b7acdff..a7d71621c9c09 100644 --- a/app/code/Magento/Newsletter/Test/Unit/Model/TemplateTest.php +++ b/app/code/Magento/Newsletter/Test/Unit/Model/TemplateTest.php @@ -65,6 +65,11 @@ class TemplateTest extends \PHPUnit_Framework_TestCase */ private $templateFactory; + /** + * @var \Magento\Framework\Url|\PHPUnit_Framework_MockObject_MockObject + */ + private $urlModel; + /** * @var \Magento\Framework\App\RequestInterface|\PHPUnit_Framework_MockObject_MockObject */ @@ -122,6 +127,9 @@ public function setUp() $this->templateFactory = $this->getMockBuilder('Magento\Email\Model\TemplateFactory') ->disableOriginalConstructor() ->getMock(); + $this->urlModel = $this->getMockBuilder('Magento\Framework\Url') + ->disableOriginalConstructor() + ->getMock(); $this->request = $this->getMockBuilder('Magento\Framework\App\RequestInterface') ->disableOriginalConstructor() ->getMock(); @@ -152,6 +160,7 @@ protected function getModelMock(array $mockedMethods = []) $this->scopeConfig, $this->emailConfig, $this->templateFactory, + $this->urlModel, $this->request, $this->filterFactory, ] diff --git a/dev/tests/integration/testsuite/Magento/Email/Model/Template/FilterTest.php b/dev/tests/integration/testsuite/Magento/Email/Model/Template/FilterTest.php index eec2737e1aa00..37f1e04885bdd 100644 --- a/dev/tests/integration/testsuite/Magento/Email/Model/Template/FilterTest.php +++ b/dev/tests/integration/testsuite/Magento/Email/Model/Template/FilterTest.php @@ -77,6 +77,8 @@ public function testStoreDirective() $this->assertStringMatchesFormat('http://example.com/%stranslation/ajax/index/', $url); $this->_model->setStoreId(0); + $backendUrlModel = $this->_objectManager->create('Magento\Backend\Model\Url'); + $this->_model->setUrlModel($backendUrlModel); $url = $this->_model->storeDirective( ['{{store url="translation/ajax/index"}}', 'store', ' url="translation/ajax/index"'] ); From e12cf68ec6fa411b8d141ea01d5a77e958fdf08f Mon Sep 17 00:00:00 2001 From: Alexander Paliarush Date: Tue, 14 Jul 2015 12:32:38 -0500 Subject: [PATCH 2/5] MAGETWO-38049: Wrong Reset Password link in a Welcome email when customer was created on backend --- .../view/frontend/email/account_new.html | 6 ++--- .../email/account_new_confirmation.html | 6 ++--- .../frontend/email/account_new_confirmed.html | 6 ++--- .../view/frontend/email/password_new.html | 4 +-- .../email/password_reset_confirmation.html | 4 +-- .../Magento/Email/Model/AbstractTemplate.php | 25 +++++++++++++++++++ .../Magento/Email/Model/BackendTemplate.php | 3 +++ app/code/Magento/Email/Model/Template.php | 7 ++++-- app/code/Magento/Email/etc/di.xml | 10 ++++++++ .../Magento/Newsletter/Model/Template.php | 3 +++ .../view/frontend/email/creditmemo_new.html | 4 +-- .../frontend/email/creditmemo_update.html | 4 +-- .../view/frontend/email/invoice_new.html | 4 +-- .../view/frontend/email/invoice_update.html | 4 +-- .../Sales/view/frontend/email/order_new.html | 2 +- .../view/frontend/email/order_update.html | 4 +-- .../view/frontend/email/shipment_new.html | 4 +-- .../view/frontend/email/shipment_update.html | 4 +-- 18 files changed, 74 insertions(+), 30 deletions(-) diff --git a/app/code/Magento/Customer/view/frontend/email/account_new.html b/app/code/Magento/Customer/view/frontend/email/account_new.html index f5c2706ae392e..d64121a198ee3 100644 --- a/app/code/Magento/Customer/view/frontend/email/account_new.html +++ b/app/code/Magento/Customer/view/frontend/email/account_new.html @@ -6,7 +6,7 @@ --> @@ -19,7 +19,7 @@ {{trans 'To sign in to our site, use these credentials during checkout or on the My Account page:' - customer_url=$store.getUrl('customer/account/') + customer_url=$this.getUrl($store, 'customer/account/') |raw}}