Merge branch 'master' of https://github.com/metersphere/metersphere
This commit is contained in:
shiziyuan9527
commit
a9f918716a
|
|
@ -158,7 +158,8 @@ public class MsHTTPSamplerProxy extends MsTestElement {
|
|||
if (!path.startsWith("/")) {
|
||||
path = "/" + path;
|
||||
}
|
||||
path = sampler.getProtocol() + "://" + sampler.getDomain() + ":" + sampler.getPort() + path;
|
||||
String port = sampler.getPort() != 80 ? ":" + sampler.getPort() : "";
|
||||
path = sampler.getProtocol() + "://" + sampler.getDomain() + port + path;
|
||||
}
|
||||
sampler.setPath(path);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@
|
|||
</div>
|
||||
</el-row>
|
||||
|
||||
<el-dialog :title="$t('api_test.request.assertions.script')" :visible.sync="visible" width="900px">
|
||||
<el-dialog :title="$t('api_test.request.assertions.script')" :visible.sync="visible" width="900px" append-to-body>
|
||||
<el-row type="flex" justify="space-between" align="middle" class="quick-script-block">
|
||||
<div class="assertion-item input">
|
||||
<el-input size="small" v-model="assertion.variable"
|
||||
|
|
@ -55,206 +55,206 @@
|
|||
</template>
|
||||
|
||||
<script>
|
||||
import {AssertionJSR223} from "../../model/ApiTestModel";
|
||||
import MsDialogFooter from "@/business/components/common/components/MsDialogFooter";
|
||||
import MsJsr233Processor from "../../../automation/scenario/component/Jsr233Processor";
|
||||
import {AssertionJSR223} from "../../model/ApiTestModel";
|
||||
import MsDialogFooter from "@/business/components/common/components/MsDialogFooter";
|
||||
import MsJsr233Processor from "../../../automation/scenario/common/Jsr233ProcessorContent";
|
||||
|
||||
export default {
|
||||
name: "MsApiAssertionJsr223",
|
||||
components: {MsJsr233Processor, MsDialogFooter},
|
||||
props: {
|
||||
assertion: {
|
||||
default: () => {
|
||||
return new AssertionJSR223();
|
||||
}
|
||||
},
|
||||
edit: {
|
||||
type: Boolean,
|
||||
default: false
|
||||
},
|
||||
index: Number,
|
||||
list: Array,
|
||||
callback: Function,
|
||||
isReadOnly: {
|
||||
type: Boolean,
|
||||
default: false
|
||||
}
|
||||
},
|
||||
|
||||
data() {
|
||||
return {
|
||||
visible: false,
|
||||
operators: {
|
||||
EQ: {
|
||||
label: "commons.adv_search.operators.equals",
|
||||
value: "=="
|
||||
},
|
||||
NE: {
|
||||
label: "commons.adv_search.operators.not_equals",
|
||||
value: "!="
|
||||
},
|
||||
CONTAINS: {
|
||||
label: "commons.adv_search.operators.like",
|
||||
value: "contains"
|
||||
},
|
||||
NOT_CONTAINS: {
|
||||
label: "commons.adv_search.operators.not_like",
|
||||
value: "not contains"
|
||||
},
|
||||
GT: {
|
||||
label: "commons.adv_search.operators.gt",
|
||||
value: ">"
|
||||
},
|
||||
LT: {
|
||||
label: "commons.adv_search.operators.lt",
|
||||
value: "<"
|
||||
},
|
||||
IS_EMPTY: {
|
||||
label: "commons.adv_search.operators.is_empty",
|
||||
value: "is empty"
|
||||
},
|
||||
IS_NOT_EMPTY: {
|
||||
label: "commons.adv_search.operators.is_not_empty",
|
||||
value: "is not empty"
|
||||
export default {
|
||||
name: "MsApiAssertionJsr223",
|
||||
components: {MsJsr233Processor, MsDialogFooter},
|
||||
props: {
|
||||
assertion: {
|
||||
default: () => {
|
||||
return new AssertionJSR223();
|
||||
}
|
||||
},
|
||||
templates: [
|
||||
{
|
||||
title: this.$t('api_test.request.assertions.set_failure_status'),
|
||||
value: 'AssertionResult.setFailure(true)',
|
||||
edit: {
|
||||
type: Boolean,
|
||||
default: false
|
||||
},
|
||||
index: Number,
|
||||
list: Array,
|
||||
callback: Function,
|
||||
isReadOnly: {
|
||||
type: Boolean,
|
||||
default: false
|
||||
}
|
||||
},
|
||||
|
||||
data() {
|
||||
return {
|
||||
visible: false,
|
||||
operators: {
|
||||
EQ: {
|
||||
label: "commons.adv_search.operators.equals",
|
||||
value: "=="
|
||||
},
|
||||
NE: {
|
||||
label: "commons.adv_search.operators.not_equals",
|
||||
value: "!="
|
||||
},
|
||||
CONTAINS: {
|
||||
label: "commons.adv_search.operators.like",
|
||||
value: "contains"
|
||||
},
|
||||
NOT_CONTAINS: {
|
||||
label: "commons.adv_search.operators.not_like",
|
||||
value: "not contains"
|
||||
},
|
||||
GT: {
|
||||
label: "commons.adv_search.operators.gt",
|
||||
value: ">"
|
||||
},
|
||||
LT: {
|
||||
label: "commons.adv_search.operators.lt",
|
||||
value: "<"
|
||||
},
|
||||
IS_EMPTY: {
|
||||
label: "commons.adv_search.operators.is_empty",
|
||||
value: "is empty"
|
||||
},
|
||||
IS_NOT_EMPTY: {
|
||||
label: "commons.adv_search.operators.is_not_empty",
|
||||
value: "is not empty"
|
||||
}
|
||||
},
|
||||
{
|
||||
title: this.$t('api_test.request.assertions.set_failure_msg'),
|
||||
value: 'AssertionResult.setFailureMessage("msg")',
|
||||
templates: [
|
||||
{
|
||||
title: this.$t('api_test.request.assertions.set_failure_status'),
|
||||
value: 'AssertionResult.setFailure(true)',
|
||||
},
|
||||
{
|
||||
title: this.$t('api_test.request.assertions.set_failure_msg'),
|
||||
value: 'AssertionResult.setFailureMessage("msg")',
|
||||
}
|
||||
],
|
||||
}
|
||||
},
|
||||
|
||||
methods: {
|
||||
add() {
|
||||
this.list.push(new AssertionJSR223(this.assertion));
|
||||
this.callback();
|
||||
},
|
||||
remove() {
|
||||
this.list.splice(this.index, 1);
|
||||
},
|
||||
changeOperator(value) {
|
||||
if (value.indexOf("empty") > 0 && !!this.assertion.value) {
|
||||
this.assertion.value = "";
|
||||
}
|
||||
],
|
||||
}
|
||||
},
|
||||
this.quickScript();
|
||||
},
|
||||
quickScript() {
|
||||
if (this.assertion.variable && this.assertion.operator) {
|
||||
let variable = this.assertion.variable;
|
||||
let operator = this.assertion.operator;
|
||||
let value = this.assertion.value || "";
|
||||
let desc = "${" + variable + "} " + operator + " '" + value + "'";
|
||||
let script = "value = vars.get(\"" + variable + "\");\n"
|
||||
switch (this.assertion.operator) {
|
||||
case "==":
|
||||
script += "result = \"" + value + "\".equals(value);\n";
|
||||
break;
|
||||
case "!=":
|
||||
script += "result = !\"" + value + "\".equals(value);\n";
|
||||
break;
|
||||
case "contains":
|
||||
script += "result = value.contains(\"" + value + "\");\n";
|
||||
break;
|
||||
case "not contains":
|
||||
script += "result = !value.contains(\"" + value + "\");\n";
|
||||
break;
|
||||
case ">":
|
||||
desc = "${" + variable + "} " + operator + " " + value;
|
||||
script += "number = Integer.parseInt(value);\n" +
|
||||
"result = number > " + value + ";\n";
|
||||
break;
|
||||
case "<":
|
||||
desc = "${" + variable + "} " + operator + " " + value;
|
||||
script += "number = Integer.parseInt(value);\n" +
|
||||
"result = number < " + value + ";\n";
|
||||
break;
|
||||
case "is empty":
|
||||
desc = "${" + variable + "} " + operator
|
||||
script += "result = value == void || value.length() == 0;\n";
|
||||
break;
|
||||
case "is not empty":
|
||||
desc = "${" + variable + "} " + operator
|
||||
script += "result = value != void && value.length() > 0;\n";
|
||||
break;
|
||||
}
|
||||
let msg = "assertion [" + desc + "]: false;"
|
||||
script += "if (!result){\n" +
|
||||
"\tmsg = \"" + msg + "\";\n" +
|
||||
"\tAssertionResult.setFailureMessage(msg);\n" +
|
||||
"\tAssertionResult.setFailure(true);\n" +
|
||||
"}";
|
||||
|
||||
methods: {
|
||||
add() {
|
||||
this.list.push(new AssertionJSR223(this.assertion));
|
||||
this.callback();
|
||||
},
|
||||
remove() {
|
||||
this.list.splice(this.index, 1);
|
||||
},
|
||||
changeOperator(value) {
|
||||
if (value.indexOf("empty") > 0 && !!this.assertion.value) {
|
||||
this.assertion.value = "";
|
||||
}
|
||||
this.quickScript();
|
||||
},
|
||||
quickScript() {
|
||||
if (this.assertion.variable && this.assertion.operator) {
|
||||
let variable = this.assertion.variable;
|
||||
let operator = this.assertion.operator;
|
||||
let value = this.assertion.value || "";
|
||||
let desc = "${" + variable + "} " + operator + " '" + value + "'";
|
||||
let script = "value = vars.get(\"" + variable + "\");\n"
|
||||
switch (this.assertion.operator) {
|
||||
case "==":
|
||||
script += "result = \"" + value + "\".equals(value);\n";
|
||||
break;
|
||||
case "!=":
|
||||
script += "result = !\"" + value + "\".equals(value);\n";
|
||||
break;
|
||||
case "contains":
|
||||
script += "result = value.contains(\"" + value + "\");\n";
|
||||
break;
|
||||
case "not contains":
|
||||
script += "result = !value.contains(\"" + value + "\");\n";
|
||||
break;
|
||||
case ">":
|
||||
desc = "${" + variable + "} " + operator + " " + value;
|
||||
script += "number = Integer.parseInt(value);\n" +
|
||||
"result = number > " + value + ";\n";
|
||||
break;
|
||||
case "<":
|
||||
desc = "${" + variable + "} " + operator + " " + value;
|
||||
script += "number = Integer.parseInt(value);\n" +
|
||||
"result = number < " + value + ";\n";
|
||||
break;
|
||||
case "is empty":
|
||||
desc = "${" + variable + "} " + operator
|
||||
script += "result = value == void || value.length() == 0;\n";
|
||||
break;
|
||||
case "is not empty":
|
||||
desc = "${" + variable + "} " + operator
|
||||
script += "result = value != void && value.length() > 0;\n";
|
||||
break;
|
||||
this.assertion.desc = desc;
|
||||
this.assertion.script = script;
|
||||
this.$refs.jsr233.reload();
|
||||
}
|
||||
let msg = "assertion [" + desc + "]: false;"
|
||||
script += "if (!result){\n" +
|
||||
"\tmsg = \"" + msg + "\";\n" +
|
||||
"\tAssertionResult.setFailureMessage(msg);\n" +
|
||||
"\tAssertionResult.setFailure(true);\n" +
|
||||
"}";
|
||||
|
||||
this.assertion.desc = desc;
|
||||
this.assertion.script = script;
|
||||
this.$refs.jsr233.reload();
|
||||
},
|
||||
detail() {
|
||||
this.visible = true;
|
||||
},
|
||||
close() {
|
||||
this.visible = false;
|
||||
},
|
||||
confirm() {
|
||||
if (!this.edit) {
|
||||
this.add();
|
||||
}
|
||||
if (!this.assertion.desc) {
|
||||
this.assertion.desc = this.assertion.script;
|
||||
}
|
||||
this.close();
|
||||
}
|
||||
},
|
||||
|
||||
},
|
||||
detail() {
|
||||
this.visible = true;
|
||||
},
|
||||
close() {
|
||||
this.visible = false;
|
||||
},
|
||||
confirm() {
|
||||
if (!this.edit) {
|
||||
this.add();
|
||||
computed: {
|
||||
hasEmptyOperator() {
|
||||
return !!this.assertion.operator && this.assertion.operator.indexOf("empty") > 0;
|
||||
}
|
||||
if (!this.assertion.desc) {
|
||||
this.assertion.desc = this.assertion.script;
|
||||
}
|
||||
this.close();
|
||||
}
|
||||
},
|
||||
|
||||
computed: {
|
||||
hasEmptyOperator() {
|
||||
return !!this.assertion.operator && this.assertion.operator.indexOf("empty") > 0;
|
||||
}
|
||||
}
|
||||
}
|
||||
</script>
|
||||
|
||||
<style scoped>
|
||||
.assertion-item {
|
||||
display: inline-block;
|
||||
}
|
||||
.assertion-item {
|
||||
display: inline-block;
|
||||
}
|
||||
|
||||
.assertion-item + .assertion-item {
|
||||
margin-left: 10px;
|
||||
}
|
||||
.assertion-item + .assertion-item {
|
||||
margin-left: 10px;
|
||||
}
|
||||
|
||||
.assertion-item.input {
|
||||
width: 100%;
|
||||
}
|
||||
.assertion-item.input {
|
||||
width: 100%;
|
||||
}
|
||||
|
||||
.assertion-item.select {
|
||||
min-width: 150px;
|
||||
}
|
||||
.assertion-item.select {
|
||||
min-width: 150px;
|
||||
}
|
||||
|
||||
.assertion-item.label {
|
||||
white-space: nowrap;
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
}
|
||||
.assertion-item.label {
|
||||
white-space: nowrap;
|
||||
overflow: hidden;
|
||||
text-overflow: ellipsis;
|
||||
}
|
||||
|
||||
.assertion-item.btn {
|
||||
min-width: 130px;
|
||||
}
|
||||
.assertion-item.btn {
|
||||
min-width: 130px;
|
||||
}
|
||||
|
||||
.assertion-item.btn.circle {
|
||||
text-align: right;
|
||||
min-width: 80px;
|
||||
}
|
||||
.assertion-item.btn.circle {
|
||||
text-align: right;
|
||||
min-width: 80px;
|
||||
}
|
||||
|
||||
.quick-script-block {
|
||||
margin-bottom: 10px;
|
||||
}
|
||||
.quick-script-block {
|
||||
margin-bottom: 10px;
|
||||
}
|
||||
</style>
|
||||
|
|
|
|||
|
|
@ -180,10 +180,10 @@
|
|||
}
|
||||
},
|
||||
//创建根目录的模块---供父类使用
|
||||
createRootModel(){
|
||||
createRootModel() {
|
||||
let dataArr = this.$refs.nodeTree.extendTreeNodes;
|
||||
if(dataArr.length>0){
|
||||
this.$refs.nodeTree.append({},dataArr[0]);
|
||||
if (dataArr.length > 0) {
|
||||
this.$refs.nodeTree.append({}, dataArr[0]);
|
||||
}
|
||||
},
|
||||
exportAPI() {
|
||||
|
|
@ -197,7 +197,6 @@
|
|||
},
|
||||
refresh() {
|
||||
this.list();
|
||||
this.$emit("refreshTable");
|
||||
},
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue