* Adjust unit test case for repo.

module/repo/model.php

@@ -73,6 +73,7 @@ class repoModel extends model
         if($repoID)
         {
             $repo = $this->getByID($repoID);
+            if(!$repo || !$this->checkPriv($repo)) $repoID = 0;
             if(!$repo || !in_array(strtolower($repo->SCM), $this->config->repo->gitServiceList)) unset($this->lang->devops->menu->mr);
         }
 

module/repo/test/model/createrepo.php

@@ -38,4 +38,4 @@ $repo->name = 'unitTestProject17';
 $result = $repoTest->createRepoTest($repo);
 if(is_int($result)) $result = true;
 if(!empty($result['name'][0]) and $result['name'][0] == '已经被使用') $result = true;
-r($result) && p() && e('1');         //通过正确数据创建版本库
+r($result) && p() && e('1');         //通过正确数据创建版本库

module/repo/test/model/getrelationbycommit.php

@@ -33,4 +33,4 @@ $commit = 'c808480afe22d3a55d94e91c59a8f3170212ade0';
 
 r($repo->getRelationByCommit($repoID, $commit, 'task'))  && p('0:type')  && e('task'); //获取任务关联信息
 r($repo->getRelationByCommit($repoID, $commit, 'bug'))   && p('0:id')    && e('4'); //获取任务关联信息
-r($repo->getRelationByCommit($repoID, $commit, 'story')) && p('0:type')  && e('story'); //获取任务关联信息
+r($repo->getRelationByCommit($repoID, $commit, 'story')) && p('0:type')  && e('story'); //获取任务关联信息

module/repo/test/model/savetaskrelation.php

@@ -1,26 +0,0 @@
-#!/usr/bin/env php
-<?php
-include dirname(__FILE__, 5) . '/test/lib/init.php';
-include dirname(__FILE__, 2) . '/repo.class.php';
-su('admin');
-
-/**
-
-title=测试 repoModel->saveTaskRelation();
-timeout=0
-cid=8
-
-- 保存任务和分支的关联关系
- - 属性AID @2
- - 属性BID @1
- - 属性extra @master
-
-*/
-
-$repo = new repoTest();
-
-$repoID = 1;
-$taskID = 2;
-$branch = 'master';
-
-r($repo->saveTaskRelationTest($repoID, $taskID, $branch)) && p('AID,BID,extra') && e('2,1,master'); //保存任务和分支的关联关系

module/repo/test/model/setmenu.php

@@ -12,7 +12,7 @@ cid=1
 
 - 正常设置版本库id @2
 - 设置不存在版本库id @1
-- 无权限用户设置版本库id @1
+- 无权限用户设置版本库id @0
 
 */
 
@@ -33,5 +33,4 @@ r($repo->setMenuTest(10001))   && p() && e('1'); //设置不存在版本库id
 
 su('user19');
 $repoID = 3;
-$result = $repo->setMenuTest($repoID);
-r(strpos($result, '你没有权限访问该代码库') !== false) && p() && e('1'); //无权限用户设置版本库id
+r($repo->setMenuTest($repoID)) && p() && e('0'); //无权限用户设置版本库id

module/repo/test/model/update.php

@@ -41,4 +41,4 @@ $repo = new repoTest();
 r($repo->updateTest(1, $data1, true)) && p('0:field,old,new') && e('name,testHtml,repo1'); //更新版本库1名字
 r($repo->updateTest(1, $data2, true)) && p('0:field,old,new') && e('product,1,2');        //更新版本库1所属产品
 r($repo->updateTest(1, $data3, true)) && p('0:field,old,new') && e('projects,~~,3');      //更新版本库1相关项目
-r($repo->updateTest(1, $data4, true)) && p('webhook:0')       && e('changeServerProject');      //更新版本库1仓库
+r($repo->updateTest(1, $data4, true)) && p('webhook:0')       && e('changeServerProject');      //更新版本库1仓库

module/repo/test/repo.class.php

@@ -732,15 +732,15 @@ class repoTest
         return $result;
     }
 
-    public function saveTaskRelationTest(int $repoID, int $taskID, string $branch)
+    public function saveBranchRelationTest(int $repoID, string $branch, int $objectID, string $objectType)
     {
-        $this->objectModel->saveTaskRelation($repoID, $taskID, $branch);
+        $this->objectModel->saveBranchRelation($repoID, $branch, $objectID, $objectType);
 
         if(dao::isError()) return dao::getError();
 
         return $this->objectModel->dao->select('*')->from(TABLE_RELATION)
-            ->where('AType')->eq('task')
-            ->andWhere('AID')->eq($taskID)
+            ->where('AType')->eq($objectType)
+            ->andWhere('AID')->eq($objectID)
             ->andWhere('BID')->eq($repoID)
             ->andWhere('relation')->eq('linkrepobranch')
             ->andWhere('BType')->eq('repobranch')