Add tests for branch name of PR builds

OndraM · May 7, 2020 · 258293f · 258293f
1 parent 43738e1
commit 258293f
Show file tree

Hide file tree

Showing 8 changed files with 33 additions and 1 deletion.
diff --git a/src/Ci/Bamboo.php b/src/Ci/Bamboo.php
@@ -40,6 +40,10 @@ public function getGitCommit(): string
 
     public function getGitBranch(): string
     {
+        // TODO: While the PR source branch is in `bamboo.repository_pr_sourceBranch`, it cannot be reliably
+        // used, probably because it is environment variables with dot in name.
+        // As a result, returned branch in case of PR build is the target branch (eg. master) not the PR branch.
+
         return $this->env->getString('bamboo_planRepository_branch');
     }
 

diff --git a/tests/phpt/Ci/CiDetector_BambooPullRequest.phpt b/tests/phpt/Ci/CiDetector_BambooPullRequest.phpt
@@ -33,7 +33,7 @@ bamboo_shortJobKey=JOB1
 bamboo_shortJobName=Default Job
 bamboo_shortPlanKey=foo
 bamboo_shortPlanName=Plan Name
-bamboo.repository_pr_sourceBranch=foobar
+bamboo.repository_pr_sourceBranch=pr-branch
 bamboo.repository_pr_targetBranch=branch-name
 
 --FILE--
@@ -44,7 +44,11 @@ require __DIR__ . '/../../../vendor/autoload.php';
 $ci = (new OndraM\CiDetector\CiDetector())->detect();
 echo "Is pull request:\n";
 var_dump($ci->isPullRequest()->describe());
+echo "Git branch:\n";
+var_dump($ci->getGitBranch());
 
 --EXPECT--
 Is pull request:
 string(3) "Yes"
+Git branch:
+string(11) "branch-name"
diff --git a/tests/phpt/Ci/CiDetector_CirclePullRequest.phpt b/tests/phpt/Ci/CiDetector_CirclePullRequest.phpt
@@ -30,7 +30,11 @@ require __DIR__ . '/../../../vendor/autoload.php';
 $ci = (new OndraM\CiDetector\CiDetector())->detect();
 echo "Is pull request:\n";
 var_dump($ci->isPullRequest()->describe());
+echo "Git branch:\n";
+var_dump($ci->getGitBranch());
 
 --EXPECT--
 Is pull request:
 string(3) "Yes"
+Git branch:
+string(13) "test-circleci"
diff --git a/tests/phpt/Ci/CiDetector_CodeshipPullRequest.phpt b/tests/phpt/Ci/CiDetector_CodeshipPullRequest.phpt
@@ -27,7 +27,11 @@ require __DIR__ . '/../../../vendor/autoload.php';
 $ci = (new OndraM\CiDetector\CiDetector())->detect();
 echo "Is pull request:\n";
 var_dump($ci->isPullRequest()->describe());
+echo "Git branch:\n";
+var_dump($ci->getGitBranch());
 
 --EXPECT--
 Is pull request:
 string(3) "Yes"
+Git branch:
+string(13) "test-codeship"
diff --git a/tests/phpt/Ci/CiDetector_ContinuousphpPullRequest.phpt b/tests/phpt/Ci/CiDetector_ContinuousphpPullRequest.phpt
@@ -50,7 +50,11 @@ require __DIR__ . '/../../../vendor/autoload.php';
 $ci = (new OndraM\CiDetector\CiDetector())->detect();
 echo "Is pull request:\n";
 var_dump($ci->isPullRequest()->describe());
+echo "Git branch:\n";
+var_dump($ci->getGitBranch());
 
 --EXPECT--
 Is pull request:
 string(3) "Yes"
+Git branch:
+string(25) "test-continuousphp-branch"
diff --git a/tests/phpt/Ci/CiDetector_DronePullRequest.phpt b/tests/phpt/Ci/CiDetector_DronePullRequest.phpt
@@ -90,7 +90,11 @@ require __DIR__ . '/../../../vendor/autoload.php';
 $ci = (new OndraM\CiDetector\CiDetector())->detect();
 echo "Is pull request:\n";
 var_dump($ci->isPullRequest()->describe());
+echo "Git branch:\n";
+var_dump($ci->getGitBranch());
 
 --EXPECT--
 Is pull request:
 string(3) "Yes"
+Git branch:
+string(10) "test-drone"
diff --git a/tests/phpt/Ci/CiDetector_GitLabExternalPullRequest.phpt b/tests/phpt/Ci/CiDetector_GitLabExternalPullRequest.phpt
@@ -41,7 +41,11 @@ require __DIR__ . '/../../../vendor/autoload.php';
 $ci = (new OndraM\CiDetector\CiDetector())->detect();
 echo "Is pull request:\n";
 var_dump($ci->isPullRequest()->describe());
+echo "Git branch:\n";
+var_dump($ci->getGitBranch());
 
 --EXPECT--
 Is pull request:
 string(3) "Yes"
+Git branch:
+string(11) "test-gitlab"
diff --git a/tests/phpt/Ci/CiDetector_GitLabMergeRequest.phpt b/tests/phpt/Ci/CiDetector_GitLabMergeRequest.phpt
@@ -41,7 +41,11 @@ require __DIR__ . '/../../../vendor/autoload.php';
 $ci = (new OndraM\CiDetector\CiDetector())->detect();
 echo "Is pull request:\n";
 var_dump($ci->isPullRequest()->describe());
+echo "Git branch:\n";
+var_dump($ci->getGitBranch());
 
 --EXPECT--
 Is pull request:
 string(3) "Yes"
+Git branch:
+string(11) "test-gitlab"