Skip to content

Commit 0366aa3

Browse files
committed
github 32996 - fix tests
1 parent 83edaf4 commit 0366aa3

File tree

3 files changed

+22
-2
lines changed

3 files changed

+22
-2
lines changed

app/code/Magento/Directory/Model/RegionProvider.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ public function getRegionJson(): string
4545
/**
4646
* @return array
4747
*/
48-
protected function getRegions() : array
48+
private function getRegions() : array
4949
{
5050
if (!$this->regions) {
5151
$regions = $this->directoryHelper->getRegionData();

app/code/Magento/Directory/view/frontend/requirejs-config.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
var config = {
77
map: {
88
'*': {
9-
directoryRegionUpdater: 'Magento_Directory/js/region-updater',
9+
directoryRegionUpdater: 'Magento_Directory/js/region-updater'
1010
}
1111
}
1212
};

dev/tests/integration/testsuite/Magento/Customer/Block/Form/RegisterTest.php

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
namespace Magento\Customer\Block\Form;
77

88
use Magento\Customer\Block\DataProviders\AddressAttributeData;
9+
use Magento\Customer\ViewModel\Address\RegionProvider;
910
use Magento\Framework\View\Element\Template;
1011
use Magento\TestFramework\Helper\Bootstrap;
1112

@@ -28,6 +29,7 @@ public function testCompanyDefault(): void
2829
->setTemplate('Magento_Customer::form/register.phtml')
2930
->setShowAddressFields(true);
3031
$this->setAttributeDataProvider($block);
32+
$this->setRegionProvider($block);
3133

3234
$this->assertStringContainsString('title="Company"', $block->toHtml());
3335
}
@@ -45,6 +47,7 @@ public function testTelephoneDefault(): void
4547
)->setTemplate('Magento_Customer::form/register.phtml')
4648
->setShowAddressFields(true);
4749
$this->setAttributeDataProvider($block);
50+
$this->setRegionProvider($block);
4851

4952
$this->assertStringContainsString('title="Phone Number"', $block->toHtml());
5053
}
@@ -62,6 +65,7 @@ public function testFaxDefault(): void
6265
)->setTemplate('Magento_Customer::form/register.phtml')
6366
->setShowAddressFields(true);
6467
$this->setAttributeDataProvider($block);
68+
$this->setRegionProvider($block);
6569

6670
$this->assertStringNotContainsString('title="Fax"', $block->toHtml());
6771
}
@@ -86,6 +90,7 @@ public function testCompanyDisabled(): void
8690
)->setTemplate('Magento_Customer::form/register.phtml')
8791
->setShowAddressFields(true);
8892
$this->setAttributeDataProvider($block);
93+
$this->setRegionProvider($block);
8994

9095
$this->assertStringNotContainsString('title="Company"', $block->toHtml());
9196
}
@@ -110,6 +115,7 @@ public function testTelephoneDisabled(): void
110115
)->setTemplate('Magento_Customer::form/register.phtml')
111116
->setShowAddressFields(true);
112117
$this->setAttributeDataProvider($block);
118+
$this->setRegionProvider($block);
113119

114120
$this->assertStringNotContainsString('title="Phone Number"', $block->toHtml());
115121
}
@@ -134,6 +140,7 @@ public function testFaxEnabled(): void
134140
)->setTemplate('Magento_Customer::form/register.phtml')
135141
->setShowAddressFields(true);
136142
$this->setAttributeDataProvider($block);
143+
$this->setRegionProvider($block);
137144

138145
$this->assertStringContainsString('title="Fax"', $block->toHtml());
139146
}
@@ -149,6 +156,7 @@ public function testCityWithStoreLabel(): void
149156
)->setTemplate('Magento_Customer::form/register.phtml')
150157
->setShowAddressFields(true);
151158
$this->setAttributeDataProvider($block);
159+
$this->setRegionProvider($block);
152160

153161
$this->assertStringNotContainsString('title="City"', $block->toHtml());
154162
$this->assertStringContainsString('title="Suburb"', $block->toHtml());
@@ -175,4 +183,16 @@ private function setAttributeDataProvider(Template $block): void
175183
$attributeData = Bootstrap::getObjectManager()->get(AddressAttributeData::class);
176184
$block->setAttributeData($attributeData);
177185
}
186+
187+
/**
188+
* Set Region Provider View Model.
189+
*
190+
* @param Template $block
191+
* @return void
192+
*/
193+
private function setRegionProvider(Template $block): void
194+
{
195+
$regionProvider = Bootstrap::getObjectManager()->create(RegionProvider::class);
196+
$block->setRegionProvider($regionProvider);
197+
}
178198
}

0 commit comments

Comments
 (0)