Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* [unittest] fix aftermerge error.

Browse Source
This commit is contained in:
tianshujie
2025-06-06 14:46:35 +08:00
parent 666c42906d
commit e8ed0ac208
1 changed files with 9 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/branch/test/tao/aftermerge.php
Regular → Executable
+9 -1
View File
@@ -23,6 +23,12 @@ title=测试 branchModel->afterMerge();
timeout=0
cid=1
- 测试合并分支1 到 分支2 @0
- 测试合并分支4 到 新建分支 @1
- 测试合并分支6 到 分支2 @0
- 测试合并分支6 到 分支2 @0
- 测试合并分支6 到 主干 @1
*/
$productID = array(6, 7);
@@ -48,4 +54,6 @@ $mergeBranch3->targetBranch = 0;
$branchTester = new branchTest();
r($branchTester->afterMergeTest($productID[0], $mergedBranches[0], $mergeBranch1)) && p() && e('0'); // 测试合并分支1 到 分支2
r($branchTester->afterMergeTest($productID[0], $mergedBranches[1], $mergeBranch2)) && p() && e('1'); // 测试合并分支4 到 新建分支
r($branchTester->afterMergeTest($productID[1], $mergedBranches[2], $mergeBranch3)) && p() && e('1'); // 测试合并分支6 到 主干
r($branchTester->afterMergeTest($productID[1], $mergedBranches[0], $mergeBranch1)) && p() && e('0'); // 测试合并分支6 到 分支2
r($branchTester->afterMergeTest($productID[1], $mergedBranches[1], $mergeBranch1)) && p() && e('0'); // 测试合并分支6 到 分支2
r($branchTester->afterMergeTest($productID[1], $mergedBranches[2], $mergeBranch3)) && p() && e('1'); // 测试合并分支6 到 主干