| mr->reviewType;?> | -mr->reviewTypeList, 'bug', "class='form-control' onchange=changeReviewType(this)")?> | +mr->reviewType;?> | +mr->reviewTypeList, 'bug', "class='form-control' onchange=changeReviewType(this)")?> | ++ | |
|---|---|---|---|---|---|
| repo->product?> | -+ |
@@ -161,7 +163,7 @@ js::set('revision', '');
diff --git a/module/upgrade/model.php b/module/upgrade/model.php
index 3ee0d81265..479f87c305 100644
--- a/module/upgrade/model.php
+++ b/module/upgrade/model.php
@@ -735,6 +735,10 @@ class upgradeModel extends model
$this->updateObjectBranch();
$this->updateProjectStories();
$this->appendExec('15_7_1');
+ case '16_0_beta1':
+ $this->saveLogs('Execute 16_0_beta1');
+ $this->adjustPriv16_0_beta1();
+ $this->appendExec('16_0_beta1');
}
$this->deletePatch();
@@ -5404,4 +5408,24 @@ class upgradeModel extends model
return true;
}
+
+ /**
+ * Adjust priv 16_0_beta1.
+ *
+ * @access public
+ * @return bool
+ */
+ public function adjustPriv16_0_beta1()
+ {
+ $groups = $this->dao->select('`group`')->from(TABLE_GROUPPRIV)->where('module')->eq('mr')->andWhere('method')->eq('addBug')->fetchPairs('group', 'group');
+ foreach($groups as $groupID)
+ {
+ $groupPriv = new stdclass();
+ $groupPriv->group = $groupID;
+ $groupPriv->module = 'mr';
+ $groupPriv->method = 'addReview';
+ $this->dao->replace(TABLE_GROUPPRIV)->data($groupPriv)->exec();
+ }
+ return true;
+ }
}
diff --git a/test/model/mr/getdiffs.php b/test/model/mr/getdiffs.php
new file mode 100644
index 0000000000..dadb786506
--- /dev/null
+++ b/test/model/mr/getdiffs.php
@@ -0,0 +1,30 @@
+#!/usr/bin/env php
+> return null
+使用正确的MR >> return normal
+
+*/
+
+$mrModel = $tester->loadModel('mr');
+
+$MR = '';
+$result = $mrModel->getDiffs($MR);
+if(empty($result)) $result = 'return null';
+r($result) && p() && e('return null'); //使用空的MR
+
+$MR = $tester->dao->select('*')->from(TABLE_MR)->orderBy('id_desc')->limit(1)->fetch();
+$result = $mrModel->getDiffs($MR);
+if(!empty($result))
+{
+ $first = reset($result);
+ if(isset($first->fileName) and is_array($first->contents)) $result = 'return normal';
+}
+r($result) && p() && e('return normal'); //使用正确的MR
diff --git a/test/model/mr/getlastreviewinfo.php b/test/model/mr/getlastreviewinfo.php
new file mode 100644
index 0000000000..f09591e8a8
--- /dev/null
+++ b/test/model/mr/getlastreviewinfo.php
@@ -0,0 +1,26 @@
+#!/usr/bin/env php
+> return null
+使用正确的repoID >> return normal
+
+*/
+
+$mrModel = $tester->loadModel('mr');
+
+$repoID = 0;
+$result = $mrModel->getLastReviewInfo($repoID);
+if(empty($result)) $result = 'return null';
+r($result) && p() && e('return null'); //使用空的repoID
+
+$repo = $tester->dao->select('*')->from(TABLE_REPO)->orderBy('id_desc')->limit(1)->fetch();
+$result = $mrModel->getLastReviewInfo($repo->id);
+if(isset($result->bug) and isset($result->task)) $result = 'return normal';
+r($result) && p() && e('return normal'); //使用正确的repoID
diff --git a/test/model/mr/getreview.php b/test/model/mr/getreview.php
new file mode 100644
index 0000000000..adb4f46df4
--- /dev/null
+++ b/test/model/mr/getreview.php
@@ -0,0 +1,41 @@
+#!/usr/bin/env php
+> return null
+使用正确的repoID, MRID >> return normal
+使用正确的repoID, MRID, 错误的revision >> return null
+
+*/
+
+$mrModel = $tester->loadModel('mr');
+
+$repoID = 0;
+$MRID = 0;
+$revision = '';
+
+$result = $mrModel->getReview($repoID, $MRID, $revision);
+if(empty($result)) $result = 'return null';
+r($result) && p() && e('return null'); //使用空的repoID, MRID, revision
+
+$MR = $tester->dao->select('*')->from(TABLE_MR)->orderBy('id_desc')->limit(1)->fetch();
+$repoID = $MR->repoID;
+$MRID = $MR->id;
+$result = $mrModel->getReview($repoID, $MRID, $revision);
+if(!empty($result))
+{
+ $first = reset($result);
+ if(isset($first['bug']) or isset($first['task'])) $result = 'return normal';
+}
+r($result) && p() && e('return normal'); //使用正确的repoID, MRID
+
+$revision = '123qwe';
+$result = $mrModel->getReview($repoID, $MRID, $revision);
+if(empty($result)) $result = 'return null';
+r($result) && p() && e('return null'); //使用正确的repoID, MRID, 错误的revision
diff --git a/test/model/mr/savebug.php b/test/model/mr/savebug.php
new file mode 100644
index 0000000000..db9118a8ec
--- /dev/null
+++ b/test/model/mr/savebug.php
@@ -0,0 +1,44 @@
+#!/usr/bin/env php
+> return false
+使用正确的repoID, MRID。空的title。 >> return false
+使用正确的repoID, MRID。POST数据正确。 >> Test Bug Review
+
+*/
+
+$mrModel = $tester->loadModel('mr');
+
+$_POST = array();
+$_POST['title'] = 'Test Bug Review';
+$_POST['commentText'] = 'Test Bug Review';
+$_POST['module'] = '1';
+$_POST['begin'] = '8';
+$_POST['end'] = '8';
+$_POST['product'] = '1';
+$_POST['assignedTo'] = '';
+
+$repoID = 0;
+$MRID = 0;
+$v1 = 0;
+$v2 = '';
+$result = $mrModel->saveBug($repoID, $MRID, $v1, $v2);
+if($result['result'] == 'fail' and isset($result['message']['mr']) and isset($result['message']['repo'])) $result = 'return false';
+r($result) && p() && e('return false'); //使用空的repoID, MRID
+
+$_POST['title'] = '';
+$MR = $tester->dao->select('*')->from(TABLE_MR)->orderBy('id_desc')->limit(1)->fetch();
+$result = $mrModel->saveBug($MR->repoID, $MR->id, $v1, $v2);
+if($result['result'] == 'fail' and isset($result['message']['title'])) $result = 'return false';
+r($result) && p() && e('return false'); //使用正确的repoID, MRID。空的title。
+
+$_POST['title'] = 'Test Bug Review';
+$result = $mrModel->saveBug($MR->repoID, $MR->id, $v1, $v2);
+r($result) && p('title') && e('Test Bug Review'); //使用正确的repoID, MRID。POST数据正确。
diff --git a/test/model/mr/savetask.php b/test/model/mr/savetask.php
new file mode 100644
index 0000000000..5889dd4902
--- /dev/null
+++ b/test/model/mr/savetask.php
@@ -0,0 +1,45 @@
+#!/usr/bin/env php
+> return false
+使用正确的repoID, MRID。空的title。 >> return false
+使用正确的repoID, MRID。POST数据正确。 >> Test Task Review
+
+*/
+
+$mrModel = $tester->loadModel('mr');
+
+$_POST = array();
+$_POST['title'] = 'Test Task Review';
+$_POST['commentText'] = 'Test Task Review';
+$_POST['taskModule'] = '1';
+$_POST['taskExecution'] = '1';
+$_POST['begin'] = '8';
+$_POST['end'] = '8';
+$_POST['taskAssignedTo'] = '';
+$_POST['entry'] = '';
+
+$repoID = 0;
+$MRID = 0;
+$v1 = 0;
+$v2 = '';
+$result = $mrModel->saveTask($repoID, $MRID, $v1, $v2);
+if($result['result'] == 'fail' and isset($result['message']['mr']) and isset($result['message']['repo'])) $result = 'return false';
+r($result) && p() && e('return false'); //使用空的repoID, MRID
+
+$_POST['title'] = '';
+$MR = $tester->dao->select('*')->from(TABLE_MR)->orderBy('id_desc')->limit(1)->fetch();
+$result = $mrModel->saveTask($MR->repoID, $MR->id, $v1, $v2);
+if($result['result'] == 'fail' and isset($result['message']['name'])) $result = 'return false';
+r($result) && p() && e('return false'); //使用正确的repoID, MRID。空的title。
+
+$_POST['title'] = 'Test Task Review';
+$result = $mrModel->saveTask($MR->repoID, $MR->id, $v1, $v2);
+r($result) && p('title') && e('Test Task Review'); //使用正确的repoID, MRID。POST数据正确。
|