Skip to content

Commit 82c4e8a

Browse files
committed
Add version 2.1.9
1 parent bbbfb81 commit 82c4e8a

File tree

320 files changed

+4817
-4321
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

320 files changed

+4817
-4321
lines changed

composer.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@
22
"name": "magento/project-community-edition",
33
"description": "eCommerce Platform for Growth (Community Edition)",
44
"type": "project",
5-
"version": "2.1.8",
5+
"version": "2.1.9",
66
"license": [
77
"OSL-3.0",
88
"AFL-3.0"
99
],
1010
"require": {
11-
"magento/product-community-edition": "2.1.8",
11+
"magento/product-community-edition": "2.1.9",
1212
"composer/composer": "@alpha"
1313
},
1414
"require-dev": {

composer.lock

Lines changed: 190 additions & 190 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dev/tests/functional/tests/app/Magento/Braintree/Test/TestCase/CreateOrderWithPayPalBraintreeVaultBackendTest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/variations.xsd">
99
<testCase name="Magento\Braintree\Test\TestCase\CreateOrderWithPayPalBraintreeVaultBackendTest" summary="Checkout with PayPal Braintree Vault token from Admin">
1010
<variation name="CreateOrderWithPayPalBraintreeVaultBackendTestVariation1" summary="Checkout with PayPal Braintree Vault token from Admin" ticketId="MAGETWO-59259">
11-
<data name="tag" xsi:type="string">est_type:3rd_party_test, severity:S0</data>
11+
<data name="tag" xsi:type="string">test_type:3rd_party_test, severity:S0</data>
1212
<data name="products/0" xsi:type="string">catalogProductSimple::product_10_dollar</data>
1313
<data name="customer/dataset" xsi:type="string">default</data>
1414
<data name="shippingAddress/dataset" xsi:type="string">US_address_1_without_email</data>

dev/tests/functional/tests/app/Magento/Catalog/Test/Block/Adminhtml/Product/Grid.php

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
* Copyright © 2013-2017 Magento, Inc. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
6-
76
namespace Magento\Catalog\Test\Block\Adminhtml\Product;
87

98
use Magento\Ui\Test\Block\Adminhtml\DataGrid;
@@ -88,10 +87,23 @@ public function updateAttributes(array $items = [])
8887
* Get base image source link.
8988
*
9089
* @return string
90+
* @deprecated for general get attribute method
91+
* @see getBaseImageAttribute
9192
*/
9293
public function getBaseImageSource()
94+
{
95+
return $this->getBaseImageAttribute('src');
96+
}
97+
98+
/**
99+
* Get attribute from base image component.
100+
*
101+
* @param string $attributeName
102+
* @return string
103+
*/
104+
public function getBaseImageAttribute($attributeName)
93105
{
94106
$baseImage = $this->_rootElement->find($this->baseImage);
95-
return $baseImage->isVisible() ? $baseImage->getAttribute('src') : '';
107+
return $baseImage->isVisible() ? $baseImage->getAttribute($attributeName) : '';
96108
}
97109
}

dev/tests/functional/tests/app/Magento/Catalog/Test/Constraint/AssertProductNoImageInGrid.php

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
* Copyright © 2013-2017 Magento, Inc. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
6-
76
namespace Magento\Catalog\Test\Constraint;
87

98
use Magento\Mtf\Fixture\InjectableFixture;
@@ -29,17 +28,15 @@ public function processAssert(
2928
$filter = ['sku' => $product->getSku()];
3029
$productGrid->open();
3130
$productGrid->getProductGrid()->search($filter);
32-
$src = $productGrid->getProductGrid()->getBaseImageSource();
31+
$src = $productGrid->getProductGrid()->getBaseImageAttribute('src');
3332
\PHPUnit_Framework_Assert::assertTrue(
3433
strpos($src, '/placeholder/') !== false,
3534
'Product image is displayed in product grid when it should not'
3635
);
3736
}
3837

3938
/**
40-
* Returns a string representation of the object.
41-
*
42-
* @return string
39+
* @inheritdoc
4340
*/
4441
public function toString()
4542
{

dev/tests/functional/tests/app/Magento/Customer/Test/Repository/AddressSecurity.xml

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

dev/tests/functional/tests/app/Magento/Customer/Test/Repository/CustomerSecurity.xml

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

dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/CreateCustomerBackendWithSpecialCaseLastNameEntityTest.php

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

dev/tests/functional/tests/app/Magento/Customer/Test/TestCase/CreateCustomerBackendWithSpecialCaseLastNameEntityTest.xml

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

dev/tests/functional/tests/app/Magento/Security/Test/Constraint/AssertCustomerIsLocked.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
class AssertCustomerIsLocked extends AbstractConstraint
1616
{
1717
const CUSTOMER_LOCKED_MESSAGE =
18-
'The account is locked. Please wait and try again or contact hello@example.com.';
18+
'Invalid login or password.';
1919

2020
/**
2121
* Assert that customer locked message is present on customer login page.

0 commit comments

Comments
 (0)