test-version22
/
MeterSphere
mirror of https://gitee.com/fit2cloud-feizhiyun/MeterSphere.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/metersphere/metersphere

This commit is contained in:
fit2-zhao 2020-10-19 17:55:56 +08:00
parent f64e4e7b32 b5b09842e7
commit 07c108f85a
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
backend/src/main/java/io/metersphere/track/service/TestReviewTestCaseService.java
View File

@ -110,12 +110,6 @@ public class TestReviewTestCaseService {
MSException.throwException("非此用例的评审人员！"); MSException.throwException("非此用例的评审人员！");
} }
TestCaseReview testCaseReview = testCaseReviewMapper.selectByPrimaryKey(reviewId);
Long endTime = testCaseReview.getEndTime();
if (System.currentTimeMillis() > endTime) {
MSException.throwException("此用例评审已到截止时间！");
}
// 记录测试用例评审状态变更 // 记录测试用例评审状态变更
testCaseReviewTestCase.setStatus(testCaseReviewTestCase.getStatus()); testCaseReviewTestCase.setStatus(testCaseReviewTestCase.getStatus());
testCaseReviewTestCase.setReviewer(SessionUtils.getUser().getId()); testCaseReviewTestCase.setReviewer(SessionUtils.getUser().getId());

4
frontend/src/business/components/api/test/components/request/ApiTcpRequestForm.vue
View File

@ -124,7 +124,7 @@
</template> </template>
<script> <script>
import {Scenario, TCPRequest} from "@/business/components/api/test/model/ScenarioModel"; import {Scenario, TCPConfig, TCPRequest} from "@/business/components/api/test/model/ScenarioModel";
import MsApiAssertions from "@/business/components/api/test/components/assertion/ApiAssertions"; import MsApiAssertions from "@/business/components/api/test/components/assertion/ApiAssertions";
import MsApiExtract from "@/business/components/api/test/components/extract/ApiExtract"; import MsApiExtract from "@/business/components/api/test/components/extract/ApiExtract";
import MsJsr233Processor from "@/business/components/api/test/components/processor/Jsr233Processor"; import MsJsr233Processor from "@/business/components/api/test/components/processor/Jsr233Processor";
@ -143,7 +143,7 @@ export default {
data() { data() {
return { return {
activeName: "assertions", activeName: "assertions",
classes: TCPRequest.CLASSES, classes: TCPConfig.CLASSES,
rules: { rules: {
server: [ server: [
{ {

10
frontend/src/business/components/track/review/view/components/TestReviewTestCaseEdit.vue
View File

@ -38,10 +38,12 @@
@click="handleNext()"/> @click="handleNext()"/>
<el-divider direction="vertical"></el-divider> <el-divider direction="vertical"></el-divider>
<el-button type="success" size="mini" :disabled="isReadOnly" plain @click="saveCase('Pass')"> <el-button type="success" size="mini"
:disabled="isReadOnly" :plain="testCase.reviewStatus !== 'Pass'" @click="saveCase('Pass')">
{{ $t('test_track.review.pass') }} {{ $t('test_track.review.pass') }}
</el-button> </el-button>
<el-button type="danger" size="mini" :disabled="isReadOnly" plain @click="saveCase('UnPass')"> <el-button type="danger" size="mini"
:disabled="isReadOnly" :plain="testCase.reviewStatus !== 'UnPass'" @click="saveCase('UnPass')">
{{ $t('test_track.review.un_pass') }} {{ $t('test_track.review.un_pass') }}
</el-button> </el-button>
</el-col> </el-col>
@ -290,6 +292,10 @@ export default {
this.$success(this.$t('commons.save_success')); this.$success(this.$t('commons.save_success'));
this.updateTestCases(param); this.updateTestCases(param);
this.setReviewStatus(this.testCase.reviewId); this.setReviewStatus(this.testCase.reviewId);
// 修改当前用例的评审状态
this.testCase.reviewStatus = status;
// 修改当前用例在整个用例列表的状态
this.testCases[this.index].reviewStatus = status;
}); });
}, },
updateTestCases(param) { updateTestCases(param) {