MAGECLOUD-1493: URL Update Flow is Working not as Expected (#138)

Author: oshmyheliuk

src/Config/Environment.php

@@ -18,7 +18,13 @@ class Environment
     const MAGENTO_PRODUCTION_MODE = 'production';
     const MAGENTO_DEVELOPER_MODE = 'developer';
 
-    const GIT_MASTER_BRANCH_RE = '/^master(?:-[a-z0-9]+)?$/i';
+    /**
+     * Regex pattern for detecting main branch.
+     * The name of the main branch must be started from one of three prefixes:
+     *   master - is for integration environment;
+     *   production and staging are for production and staging environments respectively.
+     */
+    const GIT_MASTER_BRANCH_RE = '/^(master|production|staging)(?:-[a-z0-9]+)?$/i';
 
     const CLOUD_MODE_ENTERPRISE = 'enterprise';
 
@@ -278,6 +284,9 @@ public function getDefaultCurrency(): string
     }
 
     /**
+     * Checks that environment uses the main branch depending on environment variable MAGENTO_CLOUD_ENVIRONMENT
+     * which contains the name of the git branch.
+     *
      * @return bool
      */
     public function isMasterBranch(): bool

src/Test/Unit/Config/EnvironmentTest.php

@@ -161,37 +161,43 @@ public function testGetDefaultCurrency()
         );
     }
 
+    /**
+     * @param bool $expectedResult
+     * @param string $branchName
+     * @dataProvider isMasterBranchDataProvider
+     */
+    public function testIsMasterBranch(bool $expectedResult, string $branchName)
+    {
+        $_ENV['MAGENTO_CLOUD_ENVIRONMENT'] = $branchName;
+
+        $this->assertSame(
+            $expectedResult,
+            $this->environment->isMasterBranch()
+        );
+    }
+
     /**
      * @return array
      */
-    public function getCronConsumersRunnerDataProvider(): array
+    public function isMasterBranchDataProvider(): array
     {
         return [
-            ['variables' => [], 'expectedResult' => []],
-            [
-                'variables' => [
-                    'CRON_CONSUMERS_RUNNER' => [
-                        'cron_run' => 'false',
-                        'max_messages' => '100',
-                        'consumers' => ['test'],
-                    ],
-                ],
-                'expectedResult' => [
-                    'cron_run' => 'false',
-                    'max_messages' => '100',
-                    'consumers' => ['test'],
-                ],
-            ],
-            [
-                'variables' => [
-                    'CRON_CONSUMERS_RUNNER' => '{"cron_run":"false", "max_messages":"100", "consumers":["test"]}',
-                ],
-                'expectedResult' => [
-                    'cron_run' => 'false',
-                    'max_messages' => '100',
-                    'consumers' => ['test'],
-                ],
-            ],
+            [false, 'branch213'],
+            [false, 'prod-branch'],
+            [false, 'stage'],
+            [false, 'branch-production-lad13m'],
+            [false, 'branch-staging-lad13m'],
+            [false, 'branch-master-lad13m'],
+            [false, 'branch-production'],
+            [false, 'branch-staging'],
+            [false, 'branch-master'],
+            [false, 'product'],
+            [true, 'staging'],
+            [true, 'staging-ba3ma'],
+            [true, 'master'],
+            [true, 'master-ad123m'],
+            [true, 'production'],
+            [true, 'production-lad13m'],
         ];
     }
 }