Skip to content

Commit bbe2c45

Browse files
akaashakaash
authored andcommitted
ACQE-4823 | PR Feedback
1 parent c7569f6 commit bbe2c45

File tree

1 file changed

+27
-30
lines changed

1 file changed

+27
-30
lines changed

dev/tests/integration/testsuite/Magento/Store/Model/MultiStoreTest.php

Lines changed: 27 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
use Magento\Customer\Test\Fixture\Customer;
1111
use Magento\Framework\App\Area;
1212
use Magento\Framework\Exception\LocalizedException;
13-
use Magento\Framework\Mail\Template\TransportBuilder;
1413
use Magento\Framework\ObjectManagerInterface;
1514
use Magento\Newsletter\Model\Subscriber;
1615
use Magento\Store\Test\Fixture\Group as StoreGroupFixture;
@@ -20,7 +19,9 @@
2019
use Magento\TestFramework\Fixture\DataFixture;
2120
use Magento\TestFramework\Fixture\DataFixtureStorage;
2221
use Magento\TestFramework\Fixture\DataFixtureStorageManager;
22+
use Magento\TestFramework\Fixture\DbIsolation;
2323
use Magento\TestFramework\Helper\Bootstrap;
24+
use Magento\TestFramework\Mail\Template\TransportBuilderMock;
2425

2526
/**
2627
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
@@ -56,6 +57,7 @@ protected function setUp(): void
5657
* @throws \Magento\Framework\Exception\MailException
5758
*/
5859
#[
60+
DbIsolation(false),
5961
ConfigFixture('system/smtp/transport', 'smtp', 'store'),
6062
DataFixture(WebsiteFixture::class, as: 'website2'),
6163
DataFixture(StoreGroupFixture::class, ['website_id' => '$website2.id$'], 'store_group2'),
@@ -117,37 +119,32 @@ private function subscribeNewsLetterAndAssertFromHeader(
117119
/** @var Subscriber $subscriber */
118120
$subscriber = $this->objectManager->create(Subscriber::class);
119121
$subscriber->subscribe($customerData['email']);
120-
$subscriber->confirm($subscriber->getSubscriberConfirmCode());
121122

122-
/** @var TransportBuilder $transportBuilder */
123-
$transportBuilder = $this->objectManager->get(TransportBuilder::class);
124-
$transport = $transportBuilder->setTemplateIdentifier('newsletter_subscription_confirm_email_template')
125-
->setTemplateOptions(
126-
[
127-
'area' => Area::AREA_FRONTEND,
128-
'store' => (int) $customerData['storeId']
129-
]
130-
)
131-
->setFromByScope(
132-
[
133-
'email' => $customerData['storeEmail'],
134-
'name' => 'Store Email Name'
135-
],
136-
(int) $customerData['storeId']
137-
)
138-
->setTemplateVars(
139-
[
140-
'subscriber_data' => [
141-
'confirmation_link' => $subscriber->getConfirmationLink(),
142-
],
143-
]
144-
)
145-
->addTo($customerData['email'])
146-
->getTransport();
147-
$transport->sendMessage();
123+
/** @var TransportBuilderMock $transportBuilderMock */
124+
$transportBuilderMock = $this->objectManager->get(TransportBuilderMock::class);
125+
$transport = $transportBuilderMock->setTemplateIdentifier(
126+
'customer_password_reset_password_template'
127+
)->setTemplateVars([
128+
'subscriber_data' => [
129+
'confirmation_link' => $subscriber->getConfirmationLink(),
130+
],
131+
])->setTemplateOptions([
132+
'area' => Area::AREA_FRONTEND,
133+
'store' => (int) $customerData['storeId']
134+
])
135+
->setFromByScope(
136+
[
137+
'email' => $customerData['storeEmail'],
138+
'name' => 'Store Email Name'
139+
],
140+
(int) $customerData['storeId']
141+
)
142+
->addTo($customerData['email'])
143+
->getTransport();
144+
148145
$headers = $transport->getMessage()->getHeaders();
149-
$sendMessage = $transport->getMessage();
150-
$this->assertNotNull($sendMessage);
146+
147+
$this->assertNotNull($transport->getMessage());
151148
$this->assertStringContainsString($customerData['storeEmail'], $headers['From']);
152149
}
153150
}

0 commit comments

Comments
 (0)