Skip to content

Commit 57efbda

Browse files
author
Cari Spruiell
committed
Merge remote-tracking branch 'remotes/classyllama/MAGETWO-37843-responsive-email-templates-in-blank-theme' into MAGETWO-37843-responsive-email-templates-in-blank-theme
2 parents b23a905 + 7a76384 commit 57efbda

File tree

6 files changed

+40
-41
lines changed

6 files changed

+40
-41
lines changed

‎app/code/Magento/Downloadable/view/frontend/templates/email/order/items/invoice/downloadable.phtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<tr>
1414
<td class="item-info has-extra">
1515
<p class="product-name"><?= $block->escapeHtml($_item->getName()) ?></p>
16-
<p class="sku"><?= __('SKU'); ?>: <?= $this->escapeHtml($block->getSku($_item)) ?></p>
16+
<p class="sku"><?= __('SKU'); ?>: <?= $block->escapeHtml($block->getSku($_item)) ?></p>
1717
<?php if ($block->getItemOptions()): ?>
1818
<dl>
1919
<?php foreach ($block->getItemOptions() as $option): ?>

‎app/code/Magento/Downloadable/view/frontend/templates/email/order/items/order/downloadable.phtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<tr>
1414
<td class="item-info has-extra">
1515
<p class="product-name"><?= $block->escapeHtml($_item->getName()) ?></p>
16-
<p class="sku"><?= __('SKU'); ?>: <?= $this->escapeHtml($block->getSku($_item)) ?></p>
16+
<p class="sku"><?= __('SKU'); ?>: <?= $block->escapeHtml($block->getSku($_item)) ?></p>
1717
<?php if ($block->getItemOptions()): ?>
1818
<dl>
1919
<?php foreach ($block->getItemOptions() as $option): ?>

‎dev/tests/integration/testsuite/Magento/Customer/Controller/Adminhtml/IndexTest.php

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -795,6 +795,9 @@ public function testMassUnsubscriberAction()
795795
$subscriberFactory->create()->subscribeCustomerById(2);
796796
$this->getRequest()->setParam('customer', [1, 2]);
797797

798+
// Ensure secret key is disabled (subscription status notification emails turn it off)
799+
$this->_objectManager->get('Magento\Backend\Model\UrlInterface')->turnOffSecretKey();
800+
798801
// Test
799802
$this->dispatch('backend/customer/index/massUnsubscribe');
800803

@@ -856,6 +859,9 @@ public function testMassUnsubscriberActionPartialUpdate()
856859
$subscriberFactory->create()->subscribeCustomerById(2);
857860
$this->getRequest()->setParam('customer', [1, 4200, 2]);
858861

862+
// Ensure secret key is disabled (subscription status notification emails turn it off)
863+
$this->_objectManager->get('Magento\Backend\Model\UrlInterface')->turnOffSecretKey();
864+
859865
// Test
860866
$this->dispatch('backend/customer/index/massUnsubscribe');
861867

‎dev/tests/integration/testsuite/Magento/Customer/_files/customer.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,5 +26,6 @@
2626
->setDefaultShipping(1)
2727
->setTaxvat('12')
2828
->setGender(0);
29+
2930
$customer->isObjectNew(true);
3031
$customer->save();

‎dev/tests/integration/testsuite/Magento/Customer/_files/two_customers.php

Lines changed: 14 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -9,32 +9,19 @@
99
require 'customer.php';
1010

1111
$customer = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create('Magento\Customer\Model\Customer');
12-
$customer->setWebsiteId(
13-
1
14-
)->setEntityId(
15-
2
16-
)->setEntityTypeId(
17-
1
18-
)->setAttributeSetId(
19-
0
20-
)->setEmail(
21-
'customer_two@example.com'
22-
)->setPassword(
23-
'password'
24-
)->setGroupId(
25-
1
26-
)->setStoreId(
27-
1
28-
)->setIsActive(
29-
1
30-
)->setFirstname(
31-
'Firstname'
32-
)->setLastname(
33-
'Lastname'
34-
)->setDefaultBilling(
35-
1
36-
)->setDefaultShipping(
37-
1
38-
);
12+
$customer->setWebsiteId(1)
13+
->setEntityId(2)
14+
->setEntityTypeId(1)
15+
->setAttributeSetId(0)
16+
->setEmail('customer_two@example.com')
17+
->setPassword('password')
18+
->setGroupId(1)
19+
->setStoreId(1)
20+
->setIsActive(1)
21+
->setFirstname('Firstname')
22+
->setLastname('Lastname')
23+
->setDefaultBilling(1)
24+
->setDefaultShipping(1);
25+
3926
$customer->isObjectNew(true);
4027
$customer->save();

‎dev/tests/static/testsuite/Magento/Test/Integrity/App/Language/TranslationFilesTest.php

Lines changed: 17 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
namespace Magento\Test\Integrity\App\Language;
77

88
use Magento\Framework\App\Utility\Files;
9-
use Magento\Setup\Module\I18n;
10-
use Magento\Setup\Module\I18n\Pack\Writer;
119
use Magento\Setup\Module\I18n\Dictionary\Options\ResolverFactory;
10+
use Magento\Setup\Module\I18n\Locale;
11+
use Magento\Setup\Module\I18n\Pack\Writer\File\Csv;
1212

1313
/**
1414
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -80,7 +80,7 @@ protected function buildFilePath($phrase, $context)
8080
{
8181
$path = $this->getContext()->buildPathToLocaleDirectoryByContext($phrase->getContextType(), $context);
8282
$sourcePath = Files::init()->getPathToSource();
83-
return $sourcePath . '/' . $path . I18n\Locale::DEFAULT_SYSTEM_LOCALE . '.' . Writer\File\Csv::FILE_EXTENSION;
83+
return $sourcePath . '/' . $path . Locale::DEFAULT_SYSTEM_LOCALE . '.' . Csv::FILE_EXTENSION;
8484
}
8585

8686
/**
@@ -89,7 +89,7 @@ protected function buildFilePath($phrase, $context)
8989
protected function getContext()
9090
{
9191
if ($this->context === null) {
92-
$this->context = new I18n\Context();
92+
$this->context = new \Magento\Setup\Module\I18n\Context();
9393
}
9494
return $this->context;
9595
}
@@ -99,19 +99,23 @@ protected function getContext()
9999
*/
100100
protected function prepareParser()
101101
{
102-
$filesCollector = new I18n\FilesCollector();
102+
$filesCollector = new \Magento\Setup\Module\I18n\FilesCollector();
103103

104-
$phraseCollector = new I18n\Parser\Adapter\Php\Tokenizer\PhraseCollector(
105-
new I18n\Parser\Adapter\Php\Tokenizer()
104+
$phraseCollector = new \Magento\Setup\Module\I18n\Parser\Adapter\Php\Tokenizer\PhraseCollector(
105+
new \Magento\Setup\Module\I18n\Parser\Adapter\Php\Tokenizer()
106106
);
107107
$adapters = [
108-
'php' => new I18n\Parser\Adapter\Php($phraseCollector),
109-
'js' => new I18n\Parser\Adapter\Js(),
110-
'xml' => new I18n\Parser\Adapter\Xml(),
111-
'html' => new I18n\Parser\Adapter\Html(),
108+
'php' => new \Magento\Setup\Module\I18n\Parser\Adapter\Php($phraseCollector),
109+
'js' => new \Magento\Setup\Module\I18n\Parser\Adapter\Js(),
110+
'xml' => new \Magento\Setup\Module\I18n\Parser\Adapter\Xml(),
111+
'html' => new \Magento\Setup\Module\I18n\Parser\Adapter\Html(),
112112
];
113113

114-
$parserContextual = new I18n\Parser\Contextual($filesCollector, new I18n\Factory(), new I18n\Context());
114+
$parserContextual = new \Magento\Setup\Module\I18n\Parser\Contextual(
115+
$filesCollector,
116+
new \Magento\Setup\Module\I18n\Factory(),
117+
new \Magento\Setup\Module\I18n\Context()
118+
);
115119
foreach ($adapters as $type => $adapter) {
116120
$parserContextual->addAdapter($type, $adapter);
117121
}
@@ -137,6 +141,7 @@ protected function eliminateSpecialChars($text)
137141
*/
138142
public function testPhrasePlaceHolders($placePath)
139143
{
144+
$this->markTestSkipped('MAGETWO-26083');
140145
$files = $this->getCsvFiles($placePath);
141146

142147
$failures = [];

0 commit comments

Comments
 (0)