Skip to content

Commit 6f25236

Browse files
Merge pull request #1448 from magento-engcom/develop-prs
[EngCom] Public Pull Requests - MAGETWO-72192 Added ability to set 'rows' property for wysiwyg elements. #10732 - MAGETWO-71697 Fix possible bug when saving address with empty street line #10582 - MAGETWO-71647 Modified Bundle.js because of breaking Encoding in Production Mode. #10563 - MAGETWO-72126 Disabling of randomly failing and timing out Functional Tests
2 parents 2808f2d + 26369d8 commit 6f25236

File tree

11 files changed

+67
-144
lines changed

11 files changed

+67
-144
lines changed

.travis.yml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,7 @@ env:
2929
- TEST_SUITE=integration INTEGRATION_INDEX=1
3030
- TEST_SUITE=integration INTEGRATION_INDEX=2
3131
- TEST_SUITE=integration INTEGRATION_INDEX=3
32-
- TEST_SUITE=functional ACCEPTANCE_INDEX=1
33-
- TEST_SUITE=functional ACCEPTANCE_INDEX=2
32+
- TEST_SUITE=functional
3433
matrix:
3534
exclude:
3635
- php: 7.0
@@ -40,9 +39,7 @@ matrix:
4039
- php: 7.0
4140
env: TEST_SUITE=js GRUNT_COMMAND=static
4241
- php: 7.0
43-
env: TEST_SUITE=functional ACCEPTANCE_INDEX=1
44-
- php: 7.0
45-
env: TEST_SUITE=functional ACCEPTANCE_INDEX=2
42+
env: TEST_SUITE=functional
4643
cache:
4744
apt: true
4845
directories:

app/code/Magento/Customer/Model/Address/AbstractAddress.php

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -269,7 +269,7 @@ public function setData($key, $value = null)
269269
{
270270
if (is_array($key)) {
271271
$key = $this->_implodeArrayField($key);
272-
} elseif (is_array($value) && !empty($value) && $this->isAddressMultilineAttribute($key)) {
272+
} elseif (is_array($value) && $this->isAddressMultilineAttribute($key)) {
273273
$value = $this->_implodeArrayValues($value);
274274
}
275275
return parent::setData($key, $value);
@@ -309,7 +309,11 @@ protected function _implodeArrayField(array $data)
309309
*/
310310
protected function _implodeArrayValues($value)
311311
{
312-
if (is_array($value) && count($value)) {
312+
if (is_array($value)) {
313+
if (!count($value)) {
314+
return '';
315+
}
316+
313317
$isScalar = false;
314318
foreach ($value as $val) {
315319
if (is_scalar($val)) {

app/code/Magento/Customer/Test/Unit/Model/Address/AbstractAddressTest.php

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -366,6 +366,15 @@ public function testGetStreetFullAlwaysReturnsString($expectedResult, $street)
366366
$this->assertEquals($expectedResult, $this->model->getStreetFull());
367367
}
368368

369+
/**
370+
* @dataProvider getStreetFullDataProvider
371+
*/
372+
public function testSetDataStreetAlwaysConvertedToString($expectedResult, $street)
373+
{
374+
$this->model->setData('street', $street);
375+
$this->assertEquals($expectedResult, $this->model->getData('street'));
376+
}
377+
369378
/**
370379
* @return array
371380
*/

app/code/Magento/Deploy/Package/Bundle/RequireJs.php

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -240,9 +240,12 @@ private function endBundleFile(WriteInterface $bundleFile, array $contents)
240240
private function getFileContent($sourcePath)
241241
{
242242
if (!isset($this->fileContent[$sourcePath])) {
243-
$this->fileContent[$sourcePath] = utf8_encode(
244-
$this->staticDir->readFile($this->minification->addMinifiedSign($sourcePath))
245-
);
243+
$content = $this->staticDir->readFile($this->minification->addMinifiedSign($sourcePath));
244+
if (mb_detect_encoding($content) !== "UTF-8") {
245+
$content = mb_convert_encoding($content, "UTF-8");
246+
}
247+
248+
$this->fileContent[$sourcePath] = $content;
246249
}
247250
return $this->fileContent[$sourcePath];
248251
}

app/code/Magento/Quote/Test/Unit/Model/Quote/AddressTest.php

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333
* Test class for sales quote address model
3434
*
3535
* @see \Magento\Quote\Model\Quote\Address
36+
* @SuppressWarnings(PHPMD.TooManyFields)
3637
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
3738
*/
3839
class AddressTest extends \PHPUnit\Framework\TestCase
@@ -47,6 +48,11 @@ class AddressTest extends \PHPUnit\Framework\TestCase
4748
*/
4849
private $quote;
4950

51+
/**
52+
* @var \Magento\Quote\Model\Quote\Address\CustomAttributeListInterface | \PHPUnit_Framework_MockObject_MockObject
53+
*/
54+
private $attributeList;
55+
5056
/**
5157
* @var \Magento\Framework\App\Config | \PHPUnit_Framework_MockObject_MockObject
5258
*/
@@ -165,9 +171,13 @@ protected function setUp()
165171
->disableOriginalConstructor()
166172
->getMock();
167173

174+
$this->attributeList = $this->createMock(\Magento\Quote\Model\Quote\Address\CustomAttributeListInterface::class);
175+
$this->attributeList->method('getAttributes')->willReturn([]);
176+
168177
$this->address = $objectManager->getObject(
169178
\Magento\Quote\Model\Quote\Address::class,
170179
[
180+
'attributeList' => $this->attributeList,
171181
'scopeConfig' => $this->scopeConfig,
172182
'serializer' => $this->serializer,
173183
'storeManager' => $this->storeManager,

app/code/Magento/Ui/Component/Form/Element/Wysiwyg.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ public function __construct(
5555
\Magento\Framework\Data\Form\Element\Editor::class,
5656
[
5757
'force_load' => true,
58-
'rows' => 20,
58+
'rows' => isset($config['rows']) ? $config['rows'] : 20,
5959
'name' => $data['name'],
6060
'config' => $wysiwygConfig->getConfig($wysiwygConfigData),
6161
'wysiwyg' => isset($config['wysiwyg']) ? $config['wysiwyg'] : null,
Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
<?xml version="1.0"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9+
xsi:noNamespaceSchemaLocation="../../../../../vendor/magento/mtf/Magento/Mtf/TestRunner/etc/testRunner.xsd">
10+
<rule scope="testcase">
11+
<allow>
12+
<tag group="test_type" value="acceptance_test" />
13+
</allow>
14+
<deny>
15+
<tag group="stable" value="no" />
16+
</deny>
17+
</rule>
18+
<rule scope="variation">
19+
<allow>
20+
<tag group="test_type" value="acceptance_test" />
21+
<tag group="severity" value="S0, S1" />
22+
</allow>
23+
<deny>
24+
<tag group="stable" value="no" />
25+
</deny>
26+
</rule>
27+
</config>

dev/tests/functional/testsuites/Magento/Mtf/TestSuite/InjectableTests/travis_acceptance_1.xml

Lines changed: 0 additions & 65 deletions
This file was deleted.

dev/tests/functional/testsuites/Magento/Mtf/TestSuite/InjectableTests/travis_acceptance_2.xml

Lines changed: 0 additions & 66 deletions
This file was deleted.

dev/travis/before_script.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ case $TEST_SUITE in
126126

127127
cp ./phpunit.xml.dist ./phpunit.xml
128128
sed -e "s?127.0.0.1?${MAGENTO_HOST_NAME}?g" --in-place ./phpunit.xml
129-
sed -e "s?basic?travis_acceptance_${ACCEPTANCE_INDEX}?g" --in-place ./phpunit.xml
129+
sed -e "s?basic?travis_acceptance?g" --in-place ./phpunit.xml
130130
cp ./.htaccess.sample ./.htaccess
131131
cd ./utils
132132
php -f mtf troubleshooting:check-all

lib/internal/Magento/Framework/View/Asset/Bundle.php

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,11 @@ protected function getAssetContent(LocalInterface $asset)
212212
$assetContentType = $asset->getContentType();
213213
$assetKey = $this->getAssetKey($asset);
214214
if (!isset($this->assetsContent[$assetContextCode][$assetContentType][$assetKey])) {
215-
$this->assetsContent[$assetContextCode][$assetContentType][$assetKey] = utf8_encode($asset->getContent());
215+
$content = $asset->getContent();
216+
if (mb_detect_encoding($content) !== "UTF-8") {
217+
$content = mb_convert_encoding($content, "UTF-8");
218+
}
219+
$this->assetsContent[$assetContextCode][$assetContentType][$assetKey] = $content;
216220
}
217221

218222
return $this->assetsContent[$assetContextCode][$assetContentType][$assetKey];

0 commit comments

Comments
 (0)