Skip to content

Commit a5ccfc5

Browse files
pmclainpmclain
committed
static test fixes
1 parent 2c363e3 commit a5ccfc5

File tree

5 files changed

+56
-101
lines changed

5 files changed

+56
-101
lines changed

‎dev/tests/api-functional/_files/Magento/TestModuleUsps/Model/MockAsyncClient.php

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -50,11 +50,13 @@ public function __construct(
5050
public function request(Request $request): HttpResponseDeferredInterface
5151
{
5252
return new MockDeferredResponse(
53-
$this->responseFactory->create([
54-
'statusCode' => 200,
55-
'headers' => [],
56-
'body' => $this->mockResponseBodyLoader->loadForRequest($request),
57-
])
53+
$this->responseFactory->create(
54+
[
55+
'statusCode' => 200,
56+
'headers' => [],
57+
'body' => $this->mockResponseBodyLoader->loadForRequest($request),
58+
]
59+
)
5860
);
5961
}
6062
}

‎dev/tests/api-functional/_files/Magento/TestModuleUsps/Model/MockResponseBodyLoader.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ public function loadForRequest(Request $request): string
5353
$moduleDir = $this->moduleDirectory->getDir('Magento_TestModuleUsps');
5454

5555
$destination = 'us';
56-
if (strpos($request->getUrl(), 'IntlRateV2Request')) {
56+
if (strpos($request->getUrl(), 'IntlRateV2Request') !== false) {
5757
$destination = 'ca';
5858
}
5959

‎dev/tests/api-functional/_files/Magento/TestModuleUsps/_files/mock_response_ca.xml

Lines changed: 24 additions & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,10 @@
11
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
28
<IntlRateV2Response>
39
<Package ID="0">
410
<Prohibitions>An issue of a publication in which more than 5 percent of its total advertising space is primarily
@@ -205,8 +211,7 @@
205211
</ExtraServices>
206212
<ValueOfContents>20.00</ValueOfContents>
207213
<SvcCommitments>Tue, Jul 02, 2019 Guaranteed</SvcCommitments>
208-
<SvcDescription>Priority Mail Express International&amp;lt;sup&amp;gt;&amp;#8482;&amp;lt;/sup&amp;gt;
209-
</SvcDescription>
214+
<SvcDescription>Priority Mail Express International&amp;lt;sup&amp;gt;&amp;#8482;&amp;lt;/sup&amp;gt;</SvcDescription>
210215
<MaxDimensions>Max. length 42", max. length plus girth combined 79"</MaxDimensions>
211216
<MaxWeight>66</MaxWeight>
212217
<GuaranteeAvailability>07/02/2019</GuaranteeAvailability>
@@ -234,9 +239,7 @@
234239
</ExtraServices>
235240
<ValueOfContents>20.00</ValueOfContents>
236241
<SvcCommitments>Tue, Jul 02, 2019 Guaranteed</SvcCommitments>
237-
<SvcDescription>Priority Mail Express International&amp;lt;sup&amp;gt;&amp;#8482;&amp;lt;/sup&amp;gt; Flat
238-
Rate Envelope
239-
</SvcDescription>
242+
<SvcDescription>Priority Mail Express International&amp;lt;sup&amp;gt;&amp;#8482;&amp;lt;/sup&amp;gt; Flat Rate Envelope</SvcDescription>
240243
<MaxDimensions>USPS-Produced Envelope: 12-1/2" x 9-1/2"&lt;br>Maximum weight 4 pounds.</MaxDimensions>
241244
<MaxWeight>4</MaxWeight>
242245
<GuaranteeAvailability>07/02/2019</GuaranteeAvailability>
@@ -264,9 +267,7 @@
264267
</ExtraServices>
265268
<ValueOfContents>20.00</ValueOfContents>
266269
<SvcCommitments>Tue, Jul 02, 2019 Guaranteed</SvcCommitments>
267-
<SvcDescription>Priority Mail Express International&amp;lt;sup&amp;gt;&amp;#8482;&amp;lt;/sup&amp;gt; Legal
268-
Flat Rate Envelope
269-
</SvcDescription>
270+
<SvcDescription>Priority Mail Express International&amp;lt;sup&amp;gt;&amp;#8482;&amp;lt;/sup&amp;gt; Legal Flat Rate Envelope</SvcDescription>
270271
<MaxDimensions>USPS-Produced Envelope: 15" x 9-1/2"&lt;br>Maximum weight 4 pounds.</MaxDimensions>
271272
<MaxWeight>4</MaxWeight>
272273
<GuaranteeAvailability>07/02/2019</GuaranteeAvailability>
@@ -294,9 +295,7 @@
294295
</ExtraServices>
295296
<ValueOfContents>20.00</ValueOfContents>
296297
<SvcCommitments>Tue, Jul 02, 2019 Guaranteed</SvcCommitments>
297-
<SvcDescription>Priority Mail Express International&amp;lt;sup&amp;gt;&amp;#8482;&amp;lt;/sup&amp;gt; Padded
298-
Flat Rate Envelope
299-
</SvcDescription>
298+
<SvcDescription>Priority Mail Express International&amp;lt;sup&amp;gt;&amp;#8482;&amp;lt;/sup&amp;gt; Padded Flat Rate Envelope</SvcDescription>
300299
<MaxDimensions>USPS-Produced Envelope: 12-1/2" x 9-1/2"&lt;br>Maximum weight 4 pounds.</MaxDimensions>
301300
<MaxWeight>4</MaxWeight>
302301
<GuaranteeAvailability>07/02/2019</GuaranteeAvailability>
@@ -330,8 +329,7 @@
330329
</ExtraServices>
331330
<ValueOfContents>20.00</ValueOfContents>
332331
<SvcCommitments>6 - 10 business days to many major markets</SvcCommitments>
333-
<SvcDescription>Priority Mail International&amp;lt;sup&amp;gt;&amp;#174;&amp;lt;/sup&amp;gt;
334-
</SvcDescription>
332+
<SvcDescription>Priority Mail International&amp;lt;sup&amp;gt;&amp;#174;&amp;lt;/sup&amp;gt;</SvcDescription>
335333
<MaxDimensions>Max. length 79", max. length plus girth 108"</MaxDimensions>
336334
<MaxWeight>66</MaxWeight>
337335
</Service>
@@ -364,9 +362,7 @@
364362
</ExtraServices>
365363
<ValueOfContents>20.00</ValueOfContents>
366364
<SvcCommitments>6 - 10 business days to many major markets</SvcCommitments>
367-
<SvcDescription>Priority Mail International&amp;lt;sup&amp;gt;&amp;#174;&amp;lt;/sup&amp;gt; Large Flat Rate
368-
Box
369-
</SvcDescription>
365+
<SvcDescription>Priority Mail International&amp;lt;sup&amp;gt;&amp;#174;&amp;lt;/sup&amp;gt; Large Flat Rate Box</SvcDescription>
370366
<MaxDimensions>USPS-Produced Box: 23-11/16" x 11-3/4" x 3" or 12" x 12" x 5-1/2"&lt;br>Maximum weight 20
371367
pounds.
372368
</MaxDimensions>
@@ -401,9 +397,7 @@
401397
</ExtraServices>
402398
<ValueOfContents>20.00</ValueOfContents>
403399
<SvcCommitments>6 - 10 business days to many major markets</SvcCommitments>
404-
<SvcDescription>Priority Mail International&amp;lt;sup&amp;gt;&amp;#174;&amp;lt;/sup&amp;gt; Medium Flat
405-
Rate Box
406-
</SvcDescription>
400+
<SvcDescription>Priority Mail International&amp;lt;sup&amp;gt;&amp;#174;&amp;lt;/sup&amp;gt; Medium Flat Rate Box</SvcDescription>
407401
<MaxDimensions>USPS-Produced Box: 13-5/8" x 11-7/8" x 3-3/8" or 11" x 8-1/2" x 5-1/2"&lt;br>Maximum weight
408402
20 pounds.
409403
</MaxDimensions>
@@ -438,9 +432,7 @@
438432
</ExtraServices>
439433
<ValueOfContents>20.00</ValueOfContents>
440434
<SvcCommitments>6 - 10 business days to many major markets</SvcCommitments>
441-
<SvcDescription>Priority Mail International&amp;lt;sup&amp;gt;&amp;#174;&amp;lt;/sup&amp;gt; Small Flat Rate
442-
Box
443-
</SvcDescription>
435+
<SvcDescription>Priority Mail International&amp;lt;sup&amp;gt;&amp;#174;&amp;lt;/sup&amp;gt; Small Flat Rate Box</SvcDescription>
444436
<MaxDimensions>USPS-Produced Box: 8-5/8" x 5-3/8" x 1-5/8"&lt;br>Maximum weight 4 pounds.</MaxDimensions>
445437
<MaxWeight>4</MaxWeight>
446438
</Service>
@@ -473,9 +465,7 @@
473465
</ExtraServices>
474466
<ValueOfContents>20.00</ValueOfContents>
475467
<SvcCommitments>6 - 10 business days to many major markets</SvcCommitments>
476-
<SvcDescription>Priority Mail International&amp;lt;sup&amp;gt;&amp;#174;&amp;lt;/sup&amp;gt; DVD Flat Rate
477-
priced box
478-
</SvcDescription>
468+
<SvcDescription>Priority Mail International&amp;lt;sup&amp;gt;&amp;#174;&amp;lt;/sup&amp;gt; DVD Flat Rate priced box</SvcDescription>
479469
<MaxDimensions>USPS-Produced Box: 7-9/16" x 5-7/16" x 5/8"&lt;br>Maximum weight 4 pounds.</MaxDimensions>
480470
<MaxWeight>4</MaxWeight>
481471
</Service>
@@ -508,9 +498,7 @@
508498
</ExtraServices>
509499
<ValueOfContents>20.00</ValueOfContents>
510500
<SvcCommitments>6 - 10 business days to many major markets</SvcCommitments>
511-
<SvcDescription>Priority Mail International&amp;lt;sup&amp;gt;&amp;#174;&amp;lt;/sup&amp;gt; Large Video
512-
Flat Rate priced box
513-
</SvcDescription>
501+
<SvcDescription>Priority Mail International&amp;lt;sup&amp;gt;&amp;#174;&amp;lt;/sup&amp;gt; Large Video Flat Rate priced box</SvcDescription>
514502
<MaxDimensions>USPS-Produced Box: 9-1/4" x 6-1/4" x 2"&lt;br>Maximum weight 4 pounds.</MaxDimensions>
515503
<MaxWeight>4</MaxWeight>
516504
</Service>
@@ -543,9 +531,7 @@
543531
</ExtraServices>
544532
<ValueOfContents>20.00</ValueOfContents>
545533
<SvcCommitments>6 - 10 business days to many major markets</SvcCommitments>
546-
<SvcDescription>Priority Mail International&amp;lt;sup&amp;gt;&amp;#174;&amp;lt;/sup&amp;gt; Flat Rate
547-
Envelope
548-
</SvcDescription>
534+
<SvcDescription>Priority Mail International&amp;lt;sup&amp;gt;&amp;#174;&amp;lt;/sup&amp;gt; Flat Rate Envelope</SvcDescription>
549535
<MaxDimensions>USPS-Produced Envelope: 12-1/2" x 9-1/2"&lt;br>Maximum weight 4 pounds.</MaxDimensions>
550536
<MaxWeight>4</MaxWeight>
551537
</Service>
@@ -578,9 +564,7 @@
578564
</ExtraServices>
579565
<ValueOfContents>20.00</ValueOfContents>
580566
<SvcCommitments>6 - 10 business days to many major markets</SvcCommitments>
581-
<SvcDescription>Priority Mail International&amp;lt;sup&amp;gt;&amp;#174;&amp;lt;/sup&amp;gt; Legal Flat Rate
582-
Envelope
583-
</SvcDescription>
567+
<SvcDescription>Priority Mail International&amp;lt;sup&amp;gt;&amp;#174;&amp;lt;/sup&amp;gt; Legal Flat Rate Envelope</SvcDescription>
584568
<MaxDimensions>USPS-Produced Envelope: 15" x 9-1/2"&lt;br>Maximum weight 4 pounds.</MaxDimensions>
585569
<MaxWeight>4</MaxWeight>
586570
</Service>
@@ -613,9 +597,7 @@
613597
</ExtraServices>
614598
<ValueOfContents>20.00</ValueOfContents>
615599
<SvcCommitments>6 - 10 business days to many major markets</SvcCommitments>
616-
<SvcDescription>Priority Mail International&amp;lt;sup&amp;gt;&amp;#174;&amp;lt;/sup&amp;gt; Padded Flat
617-
Rate Envelope
618-
</SvcDescription>
600+
<SvcDescription>Priority Mail International&amp;lt;sup&amp;gt;&amp;#174;&amp;lt;/sup&amp;gt; Padded Flat Rate Envelope</SvcDescription>
619601
<MaxDimensions>USPS-Produced Envelope: 12-1/2" x 9-1/2"&lt;br>Maximum weight 4 pounds.</MaxDimensions>
620602
<MaxWeight>4</MaxWeight>
621603
</Service>
@@ -648,9 +630,7 @@
648630
</ExtraServices>
649631
<ValueOfContents>20.00</ValueOfContents>
650632
<SvcCommitments>6 - 10 business days to many major markets</SvcCommitments>
651-
<SvcDescription>Priority Mail International&amp;lt;sup&amp;gt;&amp;#174;&amp;lt;/sup&amp;gt; Gift Card Flat
652-
Rate Envelope
653-
</SvcDescription>
633+
<SvcDescription>Priority Mail International&amp;lt;sup&amp;gt;&amp;#174;&amp;lt;/sup&amp;gt; Gift Card Flat Rate Envelope</SvcDescription>
654634
<MaxDimensions>USPS-Produced Envelope: 10" x 7"&lt;br>Maximum weight 4 pounds.</MaxDimensions>
655635
<MaxWeight>4</MaxWeight>
656636
</Service>
@@ -683,9 +663,7 @@
683663
</ExtraServices>
684664
<ValueOfContents>20.00</ValueOfContents>
685665
<SvcCommitments>6 - 10 business days to many major markets</SvcCommitments>
686-
<SvcDescription>Priority Mail International&amp;lt;sup&amp;gt;&amp;#174;&amp;lt;/sup&amp;gt; Small Flat Rate
687-
Envelope
688-
</SvcDescription>
666+
<SvcDescription>Priority Mail International&amp;lt;sup&amp;gt;&amp;#174;&amp;lt;/sup&amp;gt; Small Flat Rate Envelope</SvcDescription>
689667
<MaxDimensions>USPS-Produced Envelope: 10" x 6"&lt;br>Maximum weight 4 pounds.</MaxDimensions>
690668
<MaxWeight>4</MaxWeight>
691669
</Service>
@@ -718,9 +696,7 @@
718696
</ExtraServices>
719697
<ValueOfContents>20.00</ValueOfContents>
720698
<SvcCommitments>6 - 10 business days to many major markets</SvcCommitments>
721-
<SvcDescription>Priority Mail International&amp;lt;sup&amp;gt;&amp;#174;&amp;lt;/sup&amp;gt; Window Flat
722-
Rate Envelope
723-
</SvcDescription>
699+
<SvcDescription>Priority Mail International&amp;lt;sup&amp;gt;&amp;#174;&amp;lt;/sup&amp;gt; Window Flat Rate Envelope</SvcDescription>
724700
<MaxDimensions>USPS-Produced Envelope: 10" x 5" or 12-1/2" x 9-1/2"&lt;br>Maximum weight 4 pounds.
725701
</MaxDimensions>
726702
<MaxWeight>4</MaxWeight>
@@ -740,9 +716,7 @@
740716
<ExtraServices>
741717
<ExtraService>
742718
<ServiceID>109</ServiceID>
743-
<ServiceName>Electronic USPS Delivery Confirmation&#8482; International (E-USPS DELCON
744-
INTL&#8482;)
745-
</ServiceName>
719+
<ServiceName>Electronic USPS Delivery Confirmation&#8482; International (E-USPS DELCON INTL&#8482;)</ServiceName>
746720
<Available>True</Available>
747721
<Price>0.00</Price>
748722
</ExtraService>
@@ -768,9 +742,7 @@
768742
<ValueOfContents>20.00</ValueOfContents>
769743
<InsComment>SERVICE</InsComment>
770744
<SvcCommitments>Varies by destination</SvcCommitments>
771-
<SvcDescription>First-Class Package International
772-
Service&amp;lt;sup&amp;gt;&amp;#8482;&amp;lt;/sup&amp;gt;
773-
</SvcDescription>
745+
<SvcDescription>First-Class Package International Service&amp;lt;sup&amp;gt;&amp;#8482;&amp;lt;/sup&amp;gt;</SvcDescription>
774746
<MaxDimensions>Other than rolls: Max. length 24", max length, height and depth (thickness) combined 36"&lt;br>Rolls:
775747
Max. length 36". Max length and twice the diameter combined 42"
776748
</MaxDimensions>

0 commit comments

Comments
 (0)