Skip to content

Commit 5a42198

Browse files
committed
MAGETWO-60962: New attribute is not visible when create new address
1 parent 050bd3a commit 5a42198

File tree

7 files changed

+69
-51
lines changed

7 files changed

+69
-51
lines changed

dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Onepage/Shipping.php

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,13 @@ class Shipping extends Form
3636
*/
3737
private $addressModalBlock = '//*[@id="opc-new-shipping-address"]/../..';
3838

39+
/**
40+
* Selected Shipping Address block CSS Selector
41+
*
42+
* @var string
43+
*/
44+
private $selectedShippingAddressBlock = '.shipping-address-item.selected-item';
45+
3946
/**
4047
* Click on "New Address" button.
4148
*
@@ -69,4 +76,14 @@ public function getRequiredFields()
6976
{
7077
return $this->_rootElement->getElements("div .field._required");
7178
}
79+
80+
/**
81+
* Get content of selected Shipping Address Block.
82+
*
83+
* @return string
84+
*/
85+
public function getSelectedShippingAddressContent()
86+
{
87+
return $this->_rootElement->find($this->selectedShippingAddressBlock)->getText();
88+
}
7289
}

dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Onepage/Shipping/AddressModal.php

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,4 +65,20 @@ public function getErrorMessages()
6565

6666
return $result;
6767
}
68+
69+
/**
70+
* Fixture mapping.
71+
*
72+
* @param array|null $fields
73+
* @param string|null $parent
74+
* @return array
75+
*/
76+
protected function dataMapping(array $fields = null, $parent = null)
77+
{
78+
if (isset($fields['custom_attribute'])) {
79+
$this->placeholders = ['attribute_code' => $fields['custom_attribute']['code']];
80+
$this->applyPlaceholders();
81+
}
82+
return parent::dataMapping($fields, $parent);
83+
}
6884
}

dev/tests/functional/tests/app/Magento/Checkout/Test/Block/Onepage/Shipping/AddressModal.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,5 +22,8 @@
2222
</country_id>
2323
<telephone />
2424
<postcode />
25+
<custom_attribute>
26+
<selector>[name="custom_attributes[%attribute_code%]"]</selector>
27+
</custom_attribute>
2528
</fields>
2629
</mapping>

dev/tests/functional/tests/app/Magento/Customer/Test/Block/Address/Edit.php

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,4 +61,20 @@ public function saveAddress()
6161
{
6262
$this->_rootElement->find($this->saveAddress)->click();
6363
}
64+
65+
/**
66+
* Fixture mapping.
67+
*
68+
* @param array|null $fields
69+
* @param string|null $parent
70+
* @return array
71+
*/
72+
protected function dataMapping(array $fields = null, $parent = null)
73+
{
74+
if (isset($fields['custom_attribute'])) {
75+
$this->placeholders = ['attribute_code' => $fields['custom_attribute']['code']];
76+
$this->applyPlaceholders();
77+
}
78+
return parent::dataMapping($fields, $parent);
79+
}
6480
}

dev/tests/functional/tests/app/Magento/Customer/Test/Block/Address/Edit.xml

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,5 +26,10 @@
2626
<postcode>
2727
<selector>#zip</selector>
2828
</postcode>
29+
<!--
30+
<custom_attribute>
31+
<selector>[id="%attribute_code%"]</selector>
32+
</custom_attribute>
33+
-->
2934
</fields>
3035
</mapping>

dev/tests/functional/tests/app/Magento/Customer/Test/Page/CustomerAddressEdit.php

Lines changed: 0 additions & 51 deletions
This file was deleted.
Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<!--
3+
/**
4+
* Copyright © 2016 Magento. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../../../../../vendor/magento/mtf/etc/pages.xsd">
9+
<page name="CustomerAddressEdit" mca="customer/address/edit" module="Magento_Customer">
10+
<block name="editForm" class="Magento\Customer\Test\Block\Address\Edit" locator="#form-validate" strategy="css selector" />
11+
</page>
12+
</config>

0 commit comments

Comments
 (0)