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

Revert "Merge branch 'devops18_caoyanyi' into 'master'"

Browse Source 
This reverts commit 41004048b2, reversing
changes made to 86fb6e2680.
This commit is contained in:
Hao Sun
2021-12-31 17:22:32 +08:00
parent 3bf672f1f3
commit 3a0ec82016
2 changed files with 8 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/gitlab/model.php
+1 -2
View File
@@ -2539,8 +2539,7 @@ class gitlabModel extends model
*/
public function apiCreateBranchPriv($gitlabID, $projectID, $priv)
{
if(empty($gitlabID)) return false;
if(empty($projectID)) return false;
if(empty($gitlabID)) return false;
if(empty($priv->name)) return false;
$url = sprintf($this->getApiRoot($gitlabID), "/projects/" . $projectID . '/protected_branches');
return json_decode(commonModel::http($url, $priv));
test/model/gitlab/apicreatebranchpriv.php
+7 -9
View File
@@ -9,10 +9,10 @@ cid=1
pid=1
使用空的gitlabID、projectID、保护分支对象创建GitLab保护分支 >> return false
使用空的gitlabID、projectID，正确的保护分支对象创建GitLab保护分支 >> return false
使用正确的gitlabID、保护分支信息，错误的projectID创建保护分支 >> return false
使用正确的gitlabID,projectID，保护分支对象创建GitLab保护分支 >> master
使用重复的保护分支信息创建保护分支 >> Protected branch 'master' already exists
使用空的gitlabID、projectID，正确的保护分支对象创建GitLab保护分支 >> return null
使用正确的gitlabID、保护分支信息，错误的projectID创建保护分支 >> 404 Project Not Found
使用正确的gitlabID,projectID，保护分支对象创建GitLab保护分支 >> master
使用重复的保护分支信息创建保护分支 >> Protected branch 'master' already exists
*/
@@ -31,15 +31,13 @@ $branch->name = 'master';
$branch->merge_access_level = '40';
$branch->push_access_level = '40';
$result = $gitlab->apiCreateBranchPriv($gitlabID, $projectID, $branch);
if($result === false) $result = 'return false';
if($result === null) $result = 'return null';
r($result) && p() && e('return false'); //使用空的gitlabID、projectID,正确的保护分支对象创建GitLab保护分支
$gitlabID = 1;
$result = $gitlab->apiCreateBranchPriv($gitlabID, $projectID, $branch);
if($result === false) $result = 'return false';
r($result) && p() && e('return false'); //使用正确的gitlabID、保护分支信息，错误的projectID创建保护分支
r($gitlab->apiCreateBranchPriv($gitlabID, $projectID, $branch)) && p('message') && e('404 Project Not Found'); //使用正确的gitlabID、保护分支信息，错误的projectID创建保护分支
$projectID = 966;
r($gitlab->apiCreateBranchPriv($gitlabID, $projectID, $branch)) && p('name') && e($branch->name); //通过gitlabID,projectID,保护分支对象正确创建GitLab保护分支
r($gitlab->apiCreateBranchPriv($gitlabID, $projectID, $branch)) && p('name') && e($branch->name); //通过gitlabID,projectID,保护分支对象正确创建GitLab保护分支
r($gitlab->apiCreateBranchPriv($gitlabID, $projectID, $branch)) && p('message') && e("Protected branch 'master' already exists"); //使用重复的保护分支信息创建保护分支