Skip to content

Commit a74eaef

Browse files
magento-engcom-teammagento-engcom-team
committed
ENGCOM-7615: [Integration] Refactoring CheckoutAgreements fixtures #28496
- Merge Pull Request #28496 from Usik2203/magento2:integration-CheckoutAgreements - Merged commits: 1. 1fd5387
2 parents 8513dfd + 1fd5387 commit a74eaef

6 files changed

+111
-32
lines changed

‎dev/tests/integration/testsuite/Magento/CheckoutAgreements/_files/agreement_active_with_html_content.php

+17-4
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,22 @@
33
* Copyright © Magento, Inc. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
6-
$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
7-
/** @var $agreement \Magento\CheckoutAgreements\Model\Agreement */
8-
$agreement = $objectManager->create(\Magento\CheckoutAgreements\Model\Agreement::class);
6+
7+
declare(strict_types=1);
8+
9+
use Magento\CheckoutAgreements\Model\Agreement;
10+
use Magento\CheckoutAgreements\Model\ResourceModel\Agreement as AgreementResource;
11+
use Magento\TestFramework\Helper\Bootstrap;
12+
13+
$objectManager = Bootstrap::getObjectManager();
14+
15+
/**
16+
* @var $agreement Agreement
17+
* @var $agreementResource AgreementResource
18+
*/
19+
$agreement = $objectManager->create(Agreement::class);
20+
$agreementResource = $objectManager->create(AgreementResource::class);
21+
922
$agreement->setData([
1023
'name' => 'Checkout Agreement (active)',
1124
'content' => 'Checkout agreement content: <b>HTML</b>',
@@ -15,4 +28,4 @@
1528
'is_html' => true,
1629
'stores' => [0, 1],
1730
]);
18-
$agreement->save();
31+
$agreementResource->save($agreement);

‎dev/tests/integration/testsuite/Magento/CheckoutAgreements/_files/agreement_active_with_html_content_rollback.php

+18-5
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,23 @@
33
* Copyright © Magento, Inc. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
6-
$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
7-
/** @var $agreement \Magento\CheckoutAgreements\Model\Agreement */
8-
$agreement = $objectManager->create(\Magento\CheckoutAgreements\Model\Agreement::class);
9-
$agreement->load('Checkout Agreement (active)', 'name');
6+
7+
declare(strict_types=1);
8+
9+
use Magento\CheckoutAgreements\Model\Agreement;
10+
use Magento\CheckoutAgreements\Model\ResourceModel\Agreement as AgreementResource;
11+
use Magento\TestFramework\Helper\Bootstrap;
12+
13+
$objectManager = Bootstrap::getObjectManager();
14+
15+
/**
16+
* @var $agreement Agreement
17+
* @var $agreementResource AgreementResource
18+
*/
19+
$agreement = $objectManager->create(Agreement::class);
20+
$agreementResource = $objectManager->create(AgreementResource::class);
21+
22+
$agreementResource->load($agreement, 'Checkout Agreement (active)', 'name');
1023
if ($agreement->getId()) {
11-
$agreement->delete();
24+
$agreementResource->delete($agreement);
1225
}

‎dev/tests/integration/testsuite/Magento/CheckoutAgreements/_files/agreement_inactive_with_text_content.php

+17-4
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,22 @@
33
* Copyright © Magento, Inc. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
6-
$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
7-
/** @var $agreement \Magento\CheckoutAgreements\Model\Agreement */
8-
$agreement = $objectManager->create(\Magento\CheckoutAgreements\Model\Agreement::class);
6+
7+
declare(strict_types=1);
8+
9+
use Magento\CheckoutAgreements\Model\Agreement;
10+
use Magento\CheckoutAgreements\Model\ResourceModel\Agreement as AgreementResource;
11+
use Magento\TestFramework\Helper\Bootstrap;
12+
13+
$objectManager = Bootstrap::getObjectManager();
14+
15+
/**
16+
* @var $agreement Agreement
17+
* @var $agreementResource AgreementResource
18+
*/
19+
$agreement = $objectManager->create(Agreement::class);
20+
$agreementResource = $objectManager->create(AgreementResource::class);
21+
922
$agreement->setData([
1023
'name' => 'Checkout Agreement (inactive)',
1124
'content' => 'Checkout agreement content: TEXT',
@@ -15,4 +28,4 @@
1528
'is_html' => false,
1629
'stores' => [0, 1],
1730
]);
18-
$agreement->save();
31+
$agreementResource->save($agreement);

‎dev/tests/integration/testsuite/Magento/CheckoutAgreements/_files/agreement_inactive_with_text_content_rollback.php

+17-5
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,22 @@
44
* See COPYING.txt for license details.
55
*/
66

7-
$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
8-
/** @var $agreement \Magento\CheckoutAgreements\Model\Agreement */
9-
$agreement = $objectManager->create(\Magento\CheckoutAgreements\Model\Agreement::class);
10-
$agreement->load('Checkout Agreement (inactive)', 'name');
7+
declare(strict_types=1);
8+
9+
use Magento\CheckoutAgreements\Model\Agreement;
10+
use Magento\CheckoutAgreements\Model\ResourceModel\Agreement as AgreementResource;
11+
use Magento\TestFramework\Helper\Bootstrap;
12+
13+
$objectManager = Bootstrap::getObjectManager();
14+
15+
/**
16+
* @var $agreement Agreement
17+
* @var $agreementResource AgreementResource
18+
*/
19+
$agreement = $objectManager->create(Agreement::class);
20+
$agreementResource = $objectManager->create(AgreementResource::class);
21+
22+
$agreementResource->load($agreement, 'Checkout Agreement (inactive)', 'name');
1123
if ($agreement->getId()) {
12-
$agreement->delete();
24+
$agreementResource->delete($agreement);
1325
}

‎dev/tests/integration/testsuite/Magento/CheckoutAgreements/_files/multi_agreements_active_with_text.php

+21-6
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,22 @@
33
* Copyright © Magento, Inc. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
6-
$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
7-
/** @var $agreement \Magento\CheckoutAgreements\Model\Agreement */
8-
$agreement = $objectManager->create(\Magento\CheckoutAgreements\Model\Agreement::class);
6+
7+
declare(strict_types=1);
8+
9+
use Magento\CheckoutAgreements\Model\Agreement;
10+
use Magento\CheckoutAgreements\Model\ResourceModel\Agreement as AgreementResource;
11+
use Magento\TestFramework\Helper\Bootstrap;
12+
13+
$objectManager = Bootstrap::getObjectManager();
14+
15+
/**
16+
* @var $agreement Agreement
17+
* @var $agreementResource AgreementResource
18+
*/
19+
$agreement = $objectManager->create(Agreement::class);
20+
$agreementResource = $objectManager->create(AgreementResource::class);
21+
922
$agreement->setData([
1023
'name' => 'First Checkout Agreement (active)',
1124
'content' => 'Checkout agreement content: TEXT',
@@ -16,8 +29,9 @@
1629
'mode' => 1,
1730
'stores' => [0, 1],
1831
]);
19-
$agreement->save();
20-
$agreement = $objectManager->create(\Magento\CheckoutAgreements\Model\Agreement::class);
32+
$agreementResource->save($agreement);
33+
34+
$agreement = $objectManager->create(Agreement::class);
2135
$agreement->setData([
2236
'name' => 'Second Checkout Agreement (active)',
2337
'content' => 'Checkout agreement content: TEXT',
@@ -28,4 +42,5 @@
2842
'mode' => 1,
2943
'stores' => [0, 1],
3044
]);
31-
$agreement->save();
45+
46+
$agreementResource->save($agreement);

‎dev/tests/integration/testsuite/Magento/CheckoutAgreements/_files/multi_agreements_active_with_text_rollback.php

+21-8
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,28 @@
44
* See COPYING.txt for license details.
55
*/
66

7-
$objectManager = \Magento\TestFramework\Helper\Bootstrap::getObjectManager();
8-
/** @var $agreement \Magento\CheckoutAgreements\Model\Agreement */
9-
$agreement = $objectManager->create(\Magento\CheckoutAgreements\Model\Agreement::class);
10-
$agreement->load('First Checkout Agreement (active)', 'name');
7+
declare(strict_types=1);
8+
9+
use Magento\CheckoutAgreements\Model\Agreement;
10+
use Magento\CheckoutAgreements\Model\ResourceModel\Agreement as AgreementResource;
11+
use Magento\TestFramework\Helper\Bootstrap;
12+
13+
$objectManager = Bootstrap::getObjectManager();
14+
15+
/**
16+
* @var $agreement Agreement
17+
* @var $agreementResource AgreementResource
18+
*/
19+
$agreement = $objectManager->create(Agreement::class);
20+
$agreementResource = $objectManager->create(AgreementResource::class);
21+
22+
$agreementResource->load($agreement, 'First Checkout Agreement (active)', 'name');
1123
if ($agreement->getId()) {
12-
$agreement->delete();
24+
$agreementResource->delete($agreement);
1325
}
14-
$agreement = $objectManager->create(\Magento\CheckoutAgreements\Model\Agreement::class);
15-
$agreement->load('Second Checkout Agreement (active)', 'name');
26+
27+
$agreement = $objectManager->create(Agreement::class);
28+
$agreementResource->load($agreement, 'Second Checkout Agreement (active)', 'name');
1629
if ($agreement->getId()) {
17-
$agreement->delete();
30+
$agreementResource->delete($agreement);
1831
}

0 commit comments

Comments
 (0)