Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Integration] Refactoring some customer fixtures #28498

Merged
merged 2 commits into from
Jun 12, 2020
Merged

[Integration] Refactoring some customer fixtures #28498

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
604b504
refactoring customer fixtures
Usik2203 Jun 3, 2020
e7e6c73
Merge branch '2.4-develop' into integration-customer-import-export-fi…
Usik2203 Jun 3, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
72 changes: 36 additions & 36 deletions dev/tests/integration/testsuite/Magento/Customer/_files/import_export/customer.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,39 +3,41 @@
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/
//Create customer
$customer = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
\Magento\Customer\Model\Customer::class
);
$customer->setWebsiteId(
1
)->setEntityId(
1
)->setEntityTypeId(
1
)->setAttributeSetId(
0
)->setEmail(
'CharlesTAlston@teleworm.us'
)->setPassword(
'password'
)->setGroupId(
1
)->setStoreId(
1
)->setIsActive(
1
)->setFirstname(
'Charles'
)->setLastname(
'Alston'
)->setGender(
'2'
);

declare(strict_types=1);

use Magento\Customer\Model\Address;
use Magento\Customer\Model\Customer;
use Magento\Customer\Model\ResourceModel\Customer as CustomerResource;
use Magento\Framework\Registry;
use Magento\TestFramework\Helper\Bootstrap;

$objectManager = Bootstrap::getObjectManager();

/**
* @var $customer Customer
* @var $customerResource CustomerResource
*/
$customer = $objectManager->create(Customer::class);
$customerResource = $objectManager->create(CustomerResource::class);

$customer->setWebsiteId(1)
->setEntityId(1)
->setEntityTypeId(1)
->setAttributeSetId(0)
->setEmail('CharlesTAlston@teleworm.us')
->setPassword('password')
->setGroupId(1)
->setStoreId(1)
->setIsActive(1)
->setFirstname('Charles')
->setLastname('Alston')
->setGender('2');

$customer->isObjectNew(true);

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

// Assign customer and address
$customer->addAddress($address);
$customer->save();
$customerResource->save($customer);

// Mark last address as default billing and default shipping for current customer
$customer->setDefaultBilling($address->getId());
$customer->setDefaultShipping($address->getId());
$customer->save();
$customerResource->save($customer);

/** @var $objectManager \Magento\TestFramework\ObjectManager */
$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
$objectManager->get(\Magento\Framework\Registry::class)->unregister('_fixture/Magento_ImportExport_Customer');
$objectManager->get(\Magento\Framework\Registry::class)->register('_fixture/Magento_ImportExport_Customer', $customer);
$objectManager->get(Registry::class)->unregister('_fixture/Magento_ImportExport_Customer');
$objectManager->get(Registry::class)->register('_fixture/Magento_ImportExport_Customer', $customer);
171 changes: 70 additions & 101 deletions ...s/integration/testsuite/Magento/Customer/_files/import_export/customer_with_addresses.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,41 +3,44 @@
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/

declare(strict_types=1);

use Magento\Customer\Model\Address;
use Magento\Customer\Model\Customer;
use Magento\Customer\Model\ResourceModel\Customer as CustomerResource;
use Magento\Framework\Registry;
use Magento\TestFramework\Helper\Bootstrap;
use Magento\TestFramework\ObjectManager;

/** @var $objectManager ObjectManager */
$objectManager = Bootstrap::getObjectManager();

$customers = [];

//Create customer
$customer = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
\Magento\Customer\Model\Customer::class
);
$customer->setWebsiteId(
1
)->setEntityId(
1
)->setEntityTypeId(
1
)->setAttributeSetId(
0
)->setEmail(
'BetsyParker@example.com'
)->setPassword(
'password'
)->setGroupId(
1
)->setStoreId(
1
)->setIsActive(
1
)->setFirstname(
'Betsy'
)->setLastname(
'Parker'
)->setGender(
2
);
/**
* @var $customer Customer
* @var $customerResource CustomerResource
*/
$customer = $objectManager->create(Customer::class);
$customerResource = $objectManager->create(CustomerResource::class);

$customer->setWebsiteId(1)
->setEntityId(1)
->setEntityTypeId(1)
->setAttributeSetId(0)
->setEmail('BetsyParker@example.com')
->setPassword('password')
->setGroupId(1)
->setStoreId(1)
->setIsActive(1)
->setFirstname('Betsy')
->setLastname('Parker')
->setGender(2);
$customer->isObjectNew(true);

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

// Assign customer and address
$customer->addAddress($address);
$customer->save();
$customerResource->save($customer);

// Mark last address as default billing and default shipping for current customer
$customer->setDefaultBilling($address->getId());
$customer->setDefaultShipping($address->getId());
$customer->save();
$customerResource->save($customer);

$customers[] = $customer;

$customer = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
\Magento\Customer\Model\Customer::class
);
$customer->setWebsiteId(
1
)->setEntityId(
2
)->setEntityTypeId(
1
)->setAttributeSetId(
0
)->setEmail(
'AnthonyNealy@example.com'
)->setPassword(
'password'
)->setGroupId(
1
)->setStoreId(
1
)->setIsActive(
1
)->setFirstname(
'Anthony'
)->setLastname(
'Nealy'
)->setGender(
1
);
$customer = $objectManager->create(Customer::class);
$customer->setWebsiteId(1)
->setEntityId(2)
->setEntityTypeId(1)
->setAttributeSetId(0)
->setEmail('AnthonyNealy@example.com')
->setPassword('password')
->setGroupId(1)
->setStoreId(1)
->setIsActive(1)
->setFirstname('Anthony')
->setLastname('Nealy')
->setGender(1);
$customer->isObjectNew(true);

$address = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\Customer\Model\Address::class);
$address = $objectManager->create(Address::class);
$address->addData(
[
'firstname' => 'Anthony',
Expand All @@ -112,7 +100,7 @@
);
$customer->addAddress($address);

$address = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\Customer\Model\Address::class);
$address = $objectManager->create(Address::class);
$address->addData(
[
'firstname' => 'Anthony',
Expand All @@ -129,45 +117,30 @@
);
$customer->addAddress($address);

$customer->save();
$customerResource->save($customer);

$customer->setDefaultBilling($address->getId());
$customer->setDefaultShipping($address->getId());
$customer->save();
$customerResource->save($customer);

$customers[] = $customer;

$customer = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(
\Magento\Customer\Model\Customer::class
);
$customer->setWebsiteId(
1
)->setEntityId(
3
)->setEntityTypeId(
1
)->setAttributeSetId(
0
)->setEmail(
'LoriBanks@example.com'
)->setPassword(
'password'
)->setGroupId(
1
)->setStoreId(
1
)->setIsActive(
1
)->setFirstname(
'Lori'
)->setLastname(
'Banks'
)->setGender(
2
);
$customer = $objectManager->create(Customer::class);
$customer->setWebsiteId(1)
->setEntityId(3)
->setEntityTypeId(1)
->setAttributeSetId(0)
->setEmail('LoriBanks@example.com')
->setPassword('password')
->setGroupId(1)
->setStoreId(1)
->setIsActive(1)
->setFirstname('Lori')
->setLastname('Banks')
->setGender(2);
$customer->isObjectNew(true);

$address = \Magento\TestFramework\Helper\Bootstrap::getObjectManager()->create(\Magento\Customer\Model\Address::class);
$address = $objectManager->create(Address::class);
$address->addData(
[
'firstname' => 'Lori',
Expand All @@ -183,17 +156,13 @@
]
);
$customer->addAddress($address);
$customer->save();
$customerResource->save($customer);

$customer->setDefaultBilling($address->getId());
$customer->setDefaultShipping($address->getId());
$customer->save();
$customerResource->save($customer);

$customers[] = $customer;

/** @var $objectManager \Magento\TestFramework\ObjectManager */
$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
$objectManager->get(\Magento\Framework\Registry::class)
->unregister('_fixture/Magento_ImportExport_Customers_Array');
$objectManager->get(\Magento\Framework\Registry::class)
->register('_fixture/Magento_ImportExport_Customers_Array', $customers);
$objectManager->get(Registry::class)->unregister('_fixture/Magento_ImportExport_Customers_Array');
$objectManager->get(Registry::class)->register('_fixture/Magento_ImportExport_Customers_Array', $customers);
Loading