From 3a0ec82016f990a486a3caf352f48be4e3c98949 Mon Sep 17 00:00:00 2001 From: Hao Sun Date: Fri, 31 Dec 2021 17:22:32 +0800 Subject: [PATCH] Revert "Merge branch 'devops18_caoyanyi' into 'master'" This reverts commit 41004048b2c76b0b8f1a9dd70bdd59e054a6d856, reversing changes made to 86fb6e2680f0675a062c9a9b564058f46571d327. --- module/gitlab/model.php | 3 +-- test/model/gitlab/apicreatebranchpriv.php | 16 +++++++--------- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/module/gitlab/model.php b/module/gitlab/model.php index 9188186bed..321c72ad72 100644 --- a/module/gitlab/model.php +++ b/module/gitlab/model.php @@ -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)); diff --git a/test/model/gitlab/apicreatebranchpriv.php b/test/model/gitlab/apicreatebranchpriv.php index 5199077991..31bfc13038 100755 --- a/test/model/gitlab/apicreatebranchpriv.php +++ b/test/model/gitlab/apicreatebranchpriv.php @@ -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"); //使用重复的保护分支信息创建保护分支