Skip to content

Commit b0ee7e0

Browse files
author
Alexander Paliarush
committed
MAGETWO-53003: System Upgrade Test does not support RC version
1 parent c100f06 commit b0ee7e0

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

dev/tests/functional/tests/app/Magento/Upgrade/Test/TestCase/UpgradeSystemTest.php

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -73,12 +73,13 @@ public function test(
7373
);
7474
$version = $upgrade['upgradeVersion'];
7575

76+
$suffix = "( (CE|EE))$";
7677
$normalVersion = '(0|[1-9]\d*)';
77-
$preReleaseVersion = '((0(?!\d+(\.|\+|$))|[1-9A-Za-z])[0-9A-Za-z-]*)';
78+
$preReleaseVersion = "((0(?!\\d+(\\.|\\+|{$suffix}))|[1-9A-Za-z])[0-9A-Za-z-]*)";
7879
$buildVersion = '([0-9A-Za-z][0-9A-Za-z-]*)';
79-
$versionPattern = "/^$normalVersion(\\.$normalVersion){2}"
80-
. "(-$preReleaseVersion(\\.$preReleaseVersion)*)?"
81-
. "(\\+$buildVersion(\\.$buildVersion)*)?$/";
80+
$versionPattern = "/^{$normalVersion}(\\.{$normalVersion}){2}"
81+
. "(-{$preReleaseVersion}(\\.{$preReleaseVersion})*)?"
82+
. "(\\+{$buildVersion}(\\.{$buildVersion})*)?{$suffix}/";
8283

8384
if (preg_match($versionPattern, $version, $out)) {
8485
$version = array_shift($out);

0 commit comments

Comments
 (0)