Skip to content

Commit 16d6a48

Browse files
glo60612glo60612
committed
AC-15627::[Integration Tests] Composer Build Failure - 2.4.9-alpha3
1 parent ae0c0ec commit 16d6a48

File tree

17 files changed

+191
-53
lines changed

17 files changed

+191
-53
lines changed

‎dev/tests/integration/testsuite/Magento/Catalog/Model/Product/Option/Type/DateTest.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22
/**
3-
* Copyright © Magento, Inc. All rights reserved.
4-
* See COPYING.txt for license details.
3+
* Copyright 2016 Adobe
4+
* All Rights Reserved.
55
*/
66

77
namespace Magento\Catalog\Model\Product\Option\Type;

‎dev/tests/integration/testsuite/Magento/Catalog/Ui/DataProvider/Product/Form/Modifier/EavTest.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22
/**
3-
* Copyright © Magento, Inc. All rights reserved.
4-
* See COPYING.txt for license details.
3+
* Copyright 2016 Adobe
4+
* All Rights Reserved.
55
*/
66
declare(strict_types=1);
77

‎dev/tests/integration/testsuite/Magento/CatalogSearch/Controller/Advanced/ResultTest.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22
/**
3-
* Copyright © Magento, Inc. All rights reserved.
4-
* See COPYING.txt for license details.
3+
* Copyright 2019 Adobe
4+
* All Rights Reserved.
55
*/
66
declare(strict_types=1);
77

‎dev/tests/integration/testsuite/Magento/Cms/Model/BlockTest.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22
/**
3-
* Copyright © Magento, Inc. All rights reserved.
4-
* See COPYING.txt for license details.
3+
* Copyright 2017 Adobe
4+
* All Rights Reserved.
55
*/
66
namespace Magento\Cms\Model;
77

‎dev/tests/integration/testsuite/Magento/Cms/Model/PageTest.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22
/**
3-
* Copyright © Magento, Inc. All rights reserved.
4-
* See COPYING.txt for license details.
3+
* Copyright 2014 Adobe
4+
* All Rights Reserved.
55
*/
66
namespace Magento\Cms\Model;
77

‎dev/tests/integration/testsuite/Magento/Cms/Model/Wysiwyg/Images/StorageTest.php‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
<?php
22
/**
3-
* Copyright © Magento, Inc. All rights reserved.
4-
* See COPYING.txt for license details.
5-
*
3+
* Copyright 2013 Adobe
4+
* All Rights Reserved.
65
*/
76
namespace Magento\Cms\Model\Wysiwyg\Images;
87

‎dev/tests/integration/testsuite/Magento/ImportExport/Controller/Adminhtml/Export/File/DeleteTest.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22
/**
3-
* Copyright © Magento, Inc. All rights reserved.
4-
* See COPYING.txt for license details.
3+
* Copyright 2019 Adobe
4+
* All Rights Reserved.
55
*/
66
declare(strict_types=1);
77

‎dev/tests/integration/testsuite/Magento/ImportExport/Controller/Adminhtml/Export/File/DownloadTest.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22
/**
3-
* Copyright © Magento, Inc. All rights reserved.
4-
* See COPYING.txt for license details.
3+
* Copyright 2019 Adobe
4+
* All Rights Reserved.
55
*/
66
declare(strict_types=1);
77

‎dev/tests/integration/testsuite/Magento/Quote/Model/ShippingMethodManagementTest.php‎

Lines changed: 159 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -148,17 +148,93 @@ public function testTableRateWithoutIncludingVirtualProduct()
148148
ConfigFixture('carriers/flatrate/active', '0', 'store', 'default'),
149149
ConfigFixture('carriers/freeshipping/active', '0', 'store', 'default'),
150150
ConfigFixture('carriers/tablerate/condition_name', 'package_value_with_discount', 'store'),
151-
DataFixture(CategoryFixture::class, ['name' => 'Category 1', 'parent_id' => 2], 'cat3'),
152-
DataFixture(CategoryFixture::class, ['name' => 'Category 2', 'parent_id' => 2], 'cat6'),
153-
DataFixture(ProductFixture::class, ['sku' => 'simple-tablerate-1', 'price' => 30, 'category_ids' => ['$cat3.id$']], 'p1'),
154-
DataFixture(ProductFixture::class, ['sku' => 'simple-tablerate-2', 'price' => 40, 'category_ids' => ['$cat6.id$']], 'p2'),
155-
DataFixture(ProductFixture::class, ['sku' => 'simple-tablerate-3', 'price' => 50, 'category_ids' => ['$cat6.id$']], 'p3'),
156-
DataFixture(GuestCartFixture::class, ['reserved_order_id' => 'tableRate'], 'cart'),
157-
DataFixture(AddProductToCartFixture::class, ['cart_id' => '$cart.id$', 'product_id' => '$p1.id$']),
158-
DataFixture(AddProductToCartFixture::class, ['cart_id' => '$cart.id$', 'product_id' => '$p2.id$']),
159-
DataFixture(AddProductToCartFixture::class, ['cart_id' => '$cart.id$', 'product_id' => '$p3.id$']),
160-
DataFixture(SetBillingAddressFixture::class, ['cart_id' => '$cart.id$']),
161-
DataFixture(SetShippingAddressFixture::class, ['cart_id' => '$cart.id$']),
151+
DataFixture(
152+
CategoryFixture::class,
153+
[
154+
'name' => 'Category 1',
155+
'parent_id' => 2
156+
],
157+
'cat3'
158+
),
159+
DataFixture(
160+
CategoryFixture::class,
161+
[
162+
'name' => 'Category 2',
163+
'parent_id' => 2
164+
],
165+
'cat6'
166+
),
167+
168+
DataFixture(
169+
ProductFixture::class,
170+
[
171+
'sku' => 'simple-tablerate-1',
172+
'price' => 30,
173+
'category_ids' => ['$cat3.id$']
174+
],
175+
'p1'
176+
),
177+
DataFixture(
178+
ProductFixture::class,
179+
[
180+
'sku' => 'simple-tablerate-2',
181+
'price' => 40,
182+
'category_ids' => ['$cat6.id$']
183+
],
184+
'p2'
185+
),
186+
DataFixture(
187+
ProductFixture::class,
188+
[
189+
'sku' => 'simple-tablerate-3',
190+
'price' => 50,
191+
'category_ids' => ['$cat6.id$']
192+
],
193+
'p3'
194+
),
195+
196+
DataFixture(
197+
GuestCartFixture::class,
198+
[
199+
'reserved_order_id' => 'tableRate'
200+
],
201+
'cart'
202+
),
203+
204+
DataFixture(
205+
AddProductToCartFixture::class,
206+
[
207+
'cart_id' => '$cart.id$',
208+
'product_id' => '$p1.id$'
209+
]
210+
),
211+
DataFixture(
212+
AddProductToCartFixture::class,
213+
[
214+
'cart_id' => '$cart.id$',
215+
'product_id' => '$p2.id$'
216+
]
217+
),
218+
DataFixture(
219+
AddProductToCartFixture::class,
220+
[
221+
'cart_id' => '$cart.id$',
222+
'product_id' => '$p3.id$'
223+
]
224+
),
225+
226+
DataFixture(
227+
SetBillingAddressFixture::class,
228+
[
229+
'cart_id' => '$cart.id$'
230+
]
231+
),
232+
DataFixture(
233+
SetShippingAddressFixture::class,
234+
[
235+
'cart_id' => '$cart.id$'
236+
]
237+
),
162238
DataFixture(
163239
RuleFixture::class,
164240
[
@@ -174,9 +250,30 @@ public function testTableRateWithoutIncludingVirtualProduct()
174250
]
175251
]
176252
),
177-
DataFixture(TablerateFixture::class, ['condition_name' => 'package_value_with_discount', 'condition_value' => 0.00, 'price' => 15]),
178-
DataFixture(TablerateFixture::class, ['condition_name' => 'package_value_with_discount', 'condition_value' => 50.00, 'price' => 10]),
179-
DataFixture(TablerateFixture::class, ['condition_name' => 'package_value_with_discount', 'condition_value' => 100.00, 'price' => 5]),
253+
DataFixture(
254+
TablerateFixture::class,
255+
[
256+
'condition_name' => 'package_value_with_discount',
257+
'condition_value' => 0.00,
258+
'price' => 15
259+
]
260+
),
261+
DataFixture(
262+
TablerateFixture::class,
263+
[
264+
'condition_name' => 'package_value_with_discount',
265+
'condition_value' => 50.00,
266+
'price' => 10
267+
]
268+
),
269+
DataFixture(
270+
TablerateFixture::class,
271+
[
272+
'condition_name' => 'package_value_with_discount',
273+
'condition_value' => 100.00,
274+
'price' => 5
275+
]
276+
)
180277
]
181278
public function testTableRateWithCartRuleForFreeShipping()
182279
{
@@ -216,11 +313,25 @@ public function testTableRateWithCartRuleForFreeShipping()
216313
* @throws NoSuchEntityException
217314
*/
218315
#[
219-
DataFixture(RuleFixture::class, ['discount_amount' => 100, 'simple_action' => 'by_percent', 'apply_to_shipping' => 1, 'simple_free_shipping' => 1]),
316+
DataFixture(
317+
RuleFixture::class,
318+
[
319+
'discount_amount' => 100,
320+
'simple_action' => 'by_percent',
321+
'apply_to_shipping' => 1,
322+
'simple_free_shipping' => 1
323+
]
324+
),
220325
DataFixture(ProductFixture::class, as: 'prod'),
221326
DataFixture(CustomerFixture::class, ['email' => 'customer@example.com'], 'customer'),
222327
DataFixture(CustomerCartFixture::class, ['customer_id' => '$customer.id$'], 'ccart'),
223-
DataFixture(AddProductToCartFixture::class, ['cart_id' => '$ccart.id$', 'product_id' => '$prod.id$']),
328+
DataFixture(
329+
AddProductToCartFixture::class,
330+
[
331+
'cart_id' => '$ccart.id$',
332+
'product_id' => '$prod.id$'
333+
]
334+
),
224335
]
225336
public function testRateAppliedToShipping(): void
226337
{
@@ -520,7 +631,14 @@ private function executeTestFlow($flatRateAmount, $tableRateAmount)
520631
], 'customer'),
521632

522633
// Customer cart with reserved order id and one physical item
523-
DataFixture(CustomerCartFixture::class, ['customer_id' => '$customer.id$', 'reserved_order_id' => 'test01'], 'cart'),
634+
DataFixture(
635+
CustomerCartFixture::class,
636+
[
637+
'customer_id' => '$customer.id$',
638+
'reserved_order_id' => 'test01'
639+
],
640+
'cart'
641+
),
524642
DataFixture(ProductFixture::class, ['sku' => 'vat-simple', 'price' => 10], 'p1'),
525643
DataFixture(AddProductToCartFixture::class, ['cart_id' => '$cart.id$', 'product_id' => '$p1.id$']),
526644
]
@@ -721,9 +839,30 @@ private function setConfig(int $customerGroupId, int $productTaxClassId): void
721839
['stop_rules_processing' => 0, 'coupon_code' => '123', 'discount_amount' => 20],
722840
'r_discount'
723841
),
724-
DataFixture(TablerateFixture::class, ['condition_name' => 'package_value_with_discount', 'condition_value' => 0.00, 'price' => 15]),
725-
DataFixture(TablerateFixture::class, ['condition_name' => 'package_value_with_discount', 'condition_value' => 50.00, 'price' => 10]),
726-
DataFixture(TablerateFixture::class, ['condition_name' => 'package_value_with_discount', 'condition_value' => 100.00, 'price' => 5]),
842+
DataFixture(
843+
TablerateFixture::class,
844+
[
845+
'condition_name' => 'package_value_with_discount',
846+
'condition_value' => 0.00,
847+
'price' => 15
848+
]
849+
),
850+
DataFixture(
851+
TablerateFixture::class,
852+
[
853+
'condition_name' => 'package_value_with_discount',
854+
'condition_value' => 50.00,
855+
'price' => 10
856+
]
857+
),
858+
DataFixture(
859+
TablerateFixture::class,
860+
[
861+
'condition_name' => 'package_value_with_discount',
862+
'condition_value' => 100.00,
863+
'price' => 5
864+
]
865+
),
727866
]
728867
public function testTableRateWithZeroPriceShownWhenDiscountCouponAndFreeShippingCartRuleApplied()
729868
{

‎dev/tests/integration/testsuite/Magento/TestModuleOverrideConfig/MagentoAdminConfigFixture/AddFixtureTest.php‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22
/**
3-
* Copyright © Magento, Inc. All rights reserved.
4-
* See COPYING.txt for license details.
3+
* Copyright 2020 Adobe
4+
* All Rights Reserved.
55
*/
66
declare(strict_types=1);
77

0 commit comments

Comments
 (0)