Skip to content

Commit 5e10ee6

Browse files
magento-engcom-teammagento-engcom-team
committed
ENGCOM-7617: [Integration] Refactoring some customer fixtures #28498
- Merge Pull Request #28498 from Usik2203/magento2:integration-customer-import-export-fixture - Merged commits: 1. 604b504 2. e7e6c73
2 parents 8513dfd + e7e6c73 commit 5e10ee6

File tree

4 files changed

+191
-260
lines changed

4 files changed

+191
-260
lines changed

‎dev/tests/integration/testsuite/Magento/Customer/_files/import_export/customer.php

Lines changed: 36 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -3,39 +3,41 @@
33
* Copyright © Magento, Inc. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
6-
//Create customer
7-
$customer = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
8-
\Magento\Customer\Model\Customer::class
9-
);
10-
$customer->setWebsiteId(
11-
1
12-
)->setEntityId(
13-
1
14-
)->setEntityTypeId(
15-
1
16-
)->setAttributeSetId(
17-
0
18-
)->setEmail(
19-
'CharlesTAlston@teleworm.us'
20-
)->setPassword(
21-
'password'
22-
)->setGroupId(
23-
1
24-
)->setStoreId(
25-
1
26-
)->setIsActive(
27-
1
28-
)->setFirstname(
29-
'Charles'
30-
)->setLastname(
31-
'Alston'
32-
)->setGender(
33-
'2'
34-
);
6+
7+
declare(strict_types=1);
8+
9+
use Magento\Customer\Model\Address;
10+
use Magento\Customer\Model\Customer;
11+
use Magento\Customer\Model\ResourceModel\Customer as CustomerResource;
12+
use Magento\Framework\Registry;
13+
use Magento\TestFramework\Helper\Bootstrap;
14+
15+
$objectManager = Bootstrap::getObjectManager();
16+
17+
/**
18+
* @var $customer Customer
19+
* @var $customerResource CustomerResource
20+
*/
21+
$customer = $objectManager->create(Customer::class);
22+
$customerResource = $objectManager->create(CustomerResource::class);
23+
24+
$customer->setWebsiteId(1)
25+
->setEntityId(1)
26+
->setEntityTypeId(1)
27+
->setAttributeSetId(0)
28+
->setEmail('CharlesTAlston@teleworm.us')
29+
->setPassword('password')
30+
->setGroupId(1)
31+
->setStoreId(1)
32+
->setIsActive(1)
33+
->setFirstname('Charles')
34+
->setLastname('Alston')
35+
->setGender('2');
36+
3537
$customer->isObjectNew(true);
3638

3739
// Create address
38-
$address = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\Customer\Model\Address::class);
40+
$address = $objectManager->create(Address::class);
3941
// default_billing and default_shipping information would not be saved, it is needed only for simple check
4042
$address->addData(
4143
[
@@ -54,14 +56,12 @@
5456

5557
// Assign customer and address
5658
$customer->addAddress($address);
57-
$customer->save();
59+
$customerResource->save($customer);
5860

5961
// Mark last address as default billing and default shipping for current customer
6062
$customer->setDefaultBilling($address->getId());
6163
$customer->setDefaultShipping($address->getId());
62-
$customer->save();
64+
$customerResource->save($customer);
6365

64-
/** @var $objectManager \Magento\TestFramework\ObjectManager */
65-
$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
66-
$objectManager->get(\Magento\Framework\Registry::class)->unregister('_fixture/Magento_ImportExport_Customer');
67-
$objectManager->get(\Magento\Framework\Registry::class)->register('_fixture/Magento_ImportExport_Customer', $customer);
66+
$objectManager->get(Registry::class)->unregister('_fixture/Magento_ImportExport_Customer');
67+
$objectManager->get(Registry::class)->register('_fixture/Magento_ImportExport_Customer', $customer);

‎dev/tests/integration/testsuite/Magento/Customer/_files/import_export/customer_with_addresses.php

Lines changed: 70 additions & 101 deletions
Original file line numberDiff line numberDiff line change
@@ -3,41 +3,44 @@
33
* Copyright © Magento, Inc. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
6+
7+
declare(strict_types=1);
8+
9+
use Magento\Customer\Model\Address;
10+
use Magento\Customer\Model\Customer;
11+
use Magento\Customer\Model\ResourceModel\Customer as CustomerResource;
12+
use Magento\Framework\Registry;
13+
use Magento\TestFramework\Helper\Bootstrap;
14+
use Magento\TestFramework\ObjectManager;
15+
16+
/** @var $objectManager ObjectManager */
17+
$objectManager = Bootstrap::getObjectManager();
18+
619
$customers = [];
720

8-
//Create customer
9-
$customer = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
10-
\Magento\Customer\Model\Customer::class
11-
);
12-
$customer->setWebsiteId(
13-
1
14-
)->setEntityId(
15-
1
16-
)->setEntityTypeId(
17-
1
18-
)->setAttributeSetId(
19-
0
20-
)->setEmail(
21-
'BetsyParker@example.com'
22-
)->setPassword(
23-
'password'
24-
)->setGroupId(
25-
1
26-
)->setStoreId(
27-
1
28-
)->setIsActive(
29-
1
30-
)->setFirstname(
31-
'Betsy'
32-
)->setLastname(
33-
'Parker'
34-
)->setGender(
35-
2
36-
);
21+
/**
22+
* @var $customer Customer
23+
* @var $customerResource CustomerResource
24+
*/
25+
$customer = $objectManager->create(Customer::class);
26+
$customerResource = $objectManager->create(CustomerResource::class);
27+
28+
$customer->setWebsiteId(1)
29+
->setEntityId(1)
30+
->setEntityTypeId(1)
31+
->setAttributeSetId(0)
32+
->setEmail('BetsyParker@example.com')
33+
->setPassword('password')
34+
->setGroupId(1)
35+
->setStoreId(1)
36+
->setIsActive(1)
37+
->setFirstname('Betsy')
38+
->setLastname('Parker')
39+
->setGender(2);
3740
$customer->isObjectNew(true);
3841

3942
// Create address
40-
$address = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\Customer\Model\Address::class);
43+
$address = $objectManager->create(Address::class);
4144
// default_billing and default_shipping information would not be saved, it is needed only for simple check
4245
$address->addData(
4346
[
@@ -56,46 +59,31 @@
5659

5760
// Assign customer and address
5861
$customer->addAddress($address);
59-
$customer->save();
62+
$customerResource->save($customer);
6063

6164
// Mark last address as default billing and default shipping for current customer
6265
$customer->setDefaultBilling($address->getId());
6366
$customer->setDefaultShipping($address->getId());
64-
$customer->save();
67+
$customerResource->save($customer);
6568

6669
$customers[] = $customer;
6770

68-
$customer = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
69-
\Magento\Customer\Model\Customer::class
70-
);
71-
$customer->setWebsiteId(
72-
1
73-
)->setEntityId(
74-
2
75-
)->setEntityTypeId(
76-
1
77-
)->setAttributeSetId(
78-
0
79-
)->setEmail(
80-
'AnthonyNealy@example.com'
81-
)->setPassword(
82-
'password'
83-
)->setGroupId(
84-
1
85-
)->setStoreId(
86-
1
87-
)->setIsActive(
88-
1
89-
)->setFirstname(
90-
'Anthony'
91-
)->setLastname(
92-
'Nealy'
93-
)->setGender(
94-
1
95-
);
71+
$customer = $objectManager->create(Customer::class);
72+
$customer->setWebsiteId(1)
73+
->setEntityId(2)
74+
->setEntityTypeId(1)
75+
->setAttributeSetId(0)
76+
->setEmail('AnthonyNealy@example.com')
77+
->setPassword('password')
78+
->setGroupId(1)
79+
->setStoreId(1)
80+
->setIsActive(1)
81+
->setFirstname('Anthony')
82+
->setLastname('Nealy')
83+
->setGender(1);
9684
$customer->isObjectNew(true);
9785

98-
$address = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\Customer\Model\Address::class);
86+
$address = $objectManager->create(Address::class);
9987
$address->addData(
10088
[
10189
'firstname' => 'Anthony',
@@ -112,7 +100,7 @@
112100
);
113101
$customer->addAddress($address);
114102

115-
$address = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\Customer\Model\Address::class);
103+
$address = $objectManager->create(Address::class);
116104
$address->addData(
117105
[
118106
'firstname' => 'Anthony',
@@ -129,45 +117,30 @@
129117
);
130118
$customer->addAddress($address);
131119

132-
$customer->save();
120+
$customerResource->save($customer);
133121

134122
$customer->setDefaultBilling($address->getId());
135123
$customer->setDefaultShipping($address->getId());
136-
$customer->save();
124+
$customerResource->save($customer);
137125

138126
$customers[] = $customer;
139127

140-
$customer = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
141-
\Magento\Customer\Model\Customer::class
142-
);
143-
$customer->setWebsiteId(
144-
1
145-
)->setEntityId(
146-
3
147-
)->setEntityTypeId(
148-
1
149-
)->setAttributeSetId(
150-
0
151-
)->setEmail(
152-
'LoriBanks@example.com'
153-
)->setPassword(
154-
'password'
155-
)->setGroupId(
156-
1
157-
)->setStoreId(
158-
1
159-
)->setIsActive(
160-
1
161-
)->setFirstname(
162-
'Lori'
163-
)->setLastname(
164-
'Banks'
165-
)->setGender(
166-
2
167-
);
128+
$customer = $objectManager->create(Customer::class);
129+
$customer->setWebsiteId(1)
130+
->setEntityId(3)
131+
->setEntityTypeId(1)
132+
->setAttributeSetId(0)
133+
->setEmail('LoriBanks@example.com')
134+
->setPassword('password')
135+
->setGroupId(1)
136+
->setStoreId(1)
137+
->setIsActive(1)
138+
->setFirstname('Lori')
139+
->setLastname('Banks')
140+
->setGender(2);
168141
$customer->isObjectNew(true);
169142

170-
$address = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\Customer\Model\Address::class);
143+
$address = $objectManager->create(Address::class);
171144
$address->addData(
172145
[
173146
'firstname' => 'Lori',
@@ -183,17 +156,13 @@
183156
]
184157
);
185158
$customer->addAddress($address);
186-
$customer->save();
159+
$customerResource->save($customer);
187160

188161
$customer->setDefaultBilling($address->getId());
189162
$customer->setDefaultShipping($address->getId());
190-
$customer->save();
163+
$customerResource->save($customer);
191164

192165
$customers[] = $customer;
193166

194-
/** @var $objectManager \Magento\TestFramework\ObjectManager */
195-
$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
196-
$objectManager->get(\Magento\Framework\Registry::class)
197-
->unregister('_fixture/Magento_ImportExport_Customers_Array');
198-
$objectManager->get(\Magento\Framework\Registry::class)
199-
->register('_fixture/Magento_ImportExport_Customers_Array', $customers);
167+
$objectManager->get(Registry::class)->unregister('_fixture/Magento_ImportExport_Customers_Array');
168+
$objectManager->get(Registry::class)->register('_fixture/Magento_ImportExport_Customers_Array', $customers);

0 commit comments

Comments
 (0)