Merge branch 'MC-40387' of https://github.com/magento-l3/magento2ce into TANGO_PR-02-03-2021_24

Author: thiaramus

app/code/Magento/Directory/etc/zip_codes.xml

@@ -103,6 +103,7 @@
         <codes>
             <code id="pattern_1" active="true" example="A1B 2C3">^[a-zA-z]{1}[0-9]{1}[a-zA-z]{1}\s[0-9]{1}[a-zA-z]{1}[0-9]{1}$</code>
             <code id="pattern_2" active="true" example="A1B2C3">^[a-zA-z]{1}[0-9]{1}[a-zA-z]{1}[0-9]{1}[a-zA-z]{1}[0-9]{1}$</code>
+            <code id="pattern_3" active="true" example="A1B">^[a-zA-z]{1}[0-9]{1}[a-zA-z]{1}$</code>
         </codes>
     </zip>
     <zip countryCode="CC">

dev/tests/integration/testsuite/Magento/Directory/Model/Country/Postcode/ValidatorTest.php

@@ -80,8 +80,10 @@ public function getCanadaValidPostCodes()
         return [
             ['countryId' => 'CA', 'postcode' => 'A1B2C3'],
             ['countryId' => 'CA', 'postcode' => 'A1B 2C3'],
+            ['countryId' => 'CA', 'postcode' => 'A1B'],
             ['countryId' => 'CA', 'postcode' => 'Z9Y 8X7'],
             ['countryId' => 'CA', 'postcode' => 'Z9Y8X7'],
+            ['countryId' => 'CA', 'postcode' => 'Z9Y'],
         ];
     }