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

Merge branch 'devops20_liyuchun' into 'master'

Browse Source 
* Adjsut unit cases.

See merge request easycorp/zentaopms!1669
This commit is contained in:
孙广明
2022-01-27 05:04:51 +00:00
parent d1cc0d0161 4b9ee0cc3c
commit 307184ea77
17 changed files with 204 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
test/model/gitlab/apicreatebranch.php
+2 -2
View File
@@ -30,7 +30,7 @@ $branch->branch = 'test_branch17';
$branch->ref = 'master';
$result = $gitlab->apiCreateBranch($gitlabID, $projectID, $branch);
if($result === null) $result = 'return null';
r($result) && p() && e('return false'); //使用空的gitlabID、projectID,正确的分支对象创建GitLab分支
r($result) && p() && e('return null'); //使用空的gitlabID、projectID,正确的分支对象创建GitLab分支
$gitlabID = 1;
r($gitlab->apiCreateBranch($gitlabID, $projectID, $branch)) && p('message') && e('404 Project Not Found'); //使用正确的gitlabID、分支信息，错误的projectID创建分支
@@ -39,5 +39,5 @@ $projectID = 1555;
$result = $gitlab->apiCreateBranch($gitlabID, $projectID, $branch);
if(!empty($result->name) and $result->name == $branch->branch) $result = true;
if(!empty($result->message) and $result->message == 'Branch already exists') $result = true;
r($result) && p() && e(1); //通过gitlabID,projectID,分支对象正确创建GitLab分支
r($result) && p() && e('1'); //通过gitlabID,projectID,分支对象正确创建GitLab分支
r($gitlab->apiCreateBranch($gitlabID, $projectID, $branch)) && p('message') && e('Branch already exists'); //使用重复的分支信息创建分支
test/model/gitlab/apicreatebranchpriv.php
+1 -1
View File
@@ -41,6 +41,6 @@ r($result) && p() && e('return false'); //使用正确的gitlabID、保护分支
$projectID = 966;
$gitlab->apiDeleteBranchPriv($gitlabID, $projectID, $branch->name);
r($gitlab->apiCreateBranchPriv($gitlabID, $projectID, $branch)) && p('name') && e($branch->name); //通过gitlabID,projectID,保护分支对象正确创建GitLab保护分支
r($gitlab->apiCreateBranchPriv($gitlabID, $projectID, $branch)) && p('name') && e('master'); //通过gitlabID,projectID,保护分支对象正确创建GitLab保护分支
r($gitlab->apiCreateBranchPriv($gitlabID, $projectID, $branch)) && p('message') && e("Protected branch 'master' already exists"); //使用重复的保护分支信息创建保护分支
test/model/gitlab/apigetbranches.php
+3 -3
View File
@@ -21,12 +21,12 @@ $gitlab = $tester->loadModel('gitlab');
$gitlabID = 1;
$projectID = 1552;
$result = $gitlab->apiGetBranches($gitlabID, $projectID);
r(isset(array_shift($result)->name)) && p() && e(1); //通过gitlabID,projectID,获取GitLab分支列表
r(count($result) > 0) && p() && e(1); //通过gitlabID,projectID,获取GitLab分支数量
r(isset(array_shift($result)->name)) && p() && e('1'); //通过gitlabID,projectID,获取GitLab分支列表
r(count($result) > 0) && p() && e('1'); //通过gitlabID,projectID,获取GitLab分支数量
$gitlabID = 1;
$projectID = 959;
r(count($gitlab->apiGetBranches($gitlabID, $projectID))) && p() && e(0); //当前项目没有分支时,获取GitLab分支列表
r(count($gitlab->apiGetBranches($gitlabID, $projectID))) && p() && e('0'); //当前项目没有分支时,获取GitLab分支列表
$gitlabID = 1;
$projectID = 0;
test/model/gitlab/apigetbranchprivs.php
+4 -4
View File
@@ -8,7 +8,7 @@ title=测试 gitlabModel::apiGetBranchPrivs();
cid=1
pid=1
获取指定项目下受保护分支列表 >> master
获取指定项目下受保护分支列表 >> master
获取指定项目下受保护分支数量 >> 3
获取无保护分支的项目下受保护分支数量 >> 0
通过不存在projectID,获取受保护分支列表 >> 404 Project Not Found
@@ -23,11 +23,11 @@ $projectID = 961;
$keyword = '';
$orderBy = 'name_desc';
$result = $gitlab->apiGetBranchPrivs($gitlabID, $projectID, $keyword, $orderBy);
r($result) && p('master:name') && e('master'); //获取指定项目下受保护分支列表
r(count($result)) && p() && e(3); //获取指定项目下受保护分支数量
r($result) && p('master:name') && e('master'); //获取指定项目下受保护分支列表
r(count($result)) && p() && e('3'); //获取指定项目下受保护分支数量
$projectID = 1572;
r(count($gitlab->apiGetBranchPrivs($gitlabID, $projectID))) && p() && e(0); //获取无保护分支的项目下受保护分支数量
r(count($gitlab->apiGetBranchPrivs($gitlabID, $projectID))) && p() && e('0'); //获取无保护分支的项目下受保护分支数量
$projectID = 0;
r($gitlab->apiGetBranchPrivs($gitlabID, $projectID)) && p('message') && e('404 Project Not Found'); //通过不存在projectID,获取受保护分支列表
test/model/gitlab/apigettagprivs.php
+3 -3
View File
@@ -21,12 +21,12 @@ $gitlab = $tester->loadModel('gitlab');
$gitlabID = 1;
$projectID = 1552;
$result = $gitlab->apiGetTagPrivs($gitlabID, $projectID);
r(isset(array_shift($result)->name)) && p() && e(1); //通过gitlabID,projectID,获取GitLab标签保护列表
r(count($result) > 0) && p() && e(1); //通过gitlabID,projectID,获取GitLab标签保护数量
r(isset(array_shift($result)->name)) && p() && e('1'); //通过gitlabID,projectID,获取GitLab标签保护列表
r(count($result) > 0) && p() && e('1'); //通过gitlabID,projectID,获取GitLab标签保护数量
$gitlabID = 1;
$projectID = 1570;
r(count($gitlab->apiGetTagPrivs($gitlabID, $projectID))) && p() && e(0); //当前项目没有标签保护时,获取GitLab标签保护列表
r(count($gitlab->apiGetTagPrivs($gitlabID, $projectID))) && p() && e('0'); //当前项目没有标签保护时,获取GitLab标签保护列表
$gitlabID = 1;
$projectID = 0;
test/model/gitlab/apigettags.php
+3 -3
View File
@@ -24,12 +24,12 @@ $gitlab = $tester->loadModel('gitlab');
$gitlabID = 1;
$projectID = 1552;
$result = $gitlab->apiGetTags($gitlabID, $projectID);
r(isset($result[0]->name)) && p() && e(1); //通过gitlabID,projectID,获取GitLab标签列表
r(count($result) > 0) && p() && e(1); //通过gitlabID,projectID,获取GitLab标签数量
r(isset($result[0]->name)) && p() && e('1'); //通过gitlabID,projectID,获取GitLab标签列表
r(count($result) > 0) && p() && e('1'); //通过gitlabID,projectID,获取GitLab标签数量
$gitlabID = 1;
$projectID = 1570;
r(count($gitlab->apiGetTags($gitlabID, $projectID))) && p() && e(0); //当前项目没有标签时,获取GitLab标签列表
r(count($gitlab->apiGetTags($gitlabID, $projectID))) && p() && e('0'); //当前项目没有标签时,获取GitLab标签列表
$gitlabID = 1;
$projectID = 0;
test/model/gitlab/createtagpriv.php
+1 -3
View File
@@ -16,15 +16,13 @@ pid=1
*/
global $lang;
$gitlab = $tester->loadModel('gitlab');
$gitlabID = 0;
$projectID = 0;
$gitlab->createTagPriv($gitlabID, $projectID);
r(dao::getError()) && p('name:0') && e($lang->gitlab->tag->emptyPrivNameError); //使用空的gitlabID,projectID,保护标签对象创建GitLab保护标签
r(dao::getError()) && p('name:0') && e('标签不能为空'); //使用空的gitlabID,projectID,保护标签对象创建GitLab保护标签
$_POST['name'] = 'test_tag1';
$_POST['create_access_level'] = '40';