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

refactor(接口测试): 支持断言同级添加步骤和请求同逻辑

This commit is contained in:
fit2-zhao 2022-05-20 10:46:41 +08:00 committed by f2c-ci-robot[bot]
parent 8f05c26b56
commit 049903b7f7
3 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
frontend/src/business/components/api/automation/scenario/EditApiScenario.vue
View File

@ -1171,7 +1171,7 @@ export default {
} else { } else {
this.operatingElements = []; this.operatingElements = [];
} }
if ((!this.operatingElements && this.stepFilter)|| this.stepFilter.get("AllSamplerProxy").indexOf(data.type) !== -1) { if ((!this.operatingElements && this.stepFilter)|| this.stepFilter.get("SpecialSteps").indexOf(data.type) !== -1) {
this.operatingElements = this.stepFilter.get("ALL"); this.operatingElements = this.stepFilter.get("ALL");
} }
this.selectedTreeNode = data; this.selectedTreeNode = data;
@ -1242,7 +1242,7 @@ export default {
this.customizeVisible = false; this.customizeVisible = false;
request.enable === undefined ? request.enable = true : request.enable; request.enable === undefined ? request.enable = true : request.enable;
if(this.selectedTreeNode !== undefined){ if(this.selectedTreeNode !== undefined){
if(this.stepFilter.get("AllSamplerProxy").indexOf(this.selectedTreeNode.type) !== -1){ if(this.stepFilter.get("SpecialSteps").indexOf(this.selectedTreeNode.type) !== -1){
this.scenarioDefinition.splice(this.selectedTreeNode.index,0,request); this.scenarioDefinition.splice(this.selectedTreeNode.index,0,request);
this.$store.state.forceRerenderIndex = getUUID(); this.$store.state.forceRerenderIndex = getUUID();
}else{ }else{
@ -1270,7 +1270,7 @@ export default {
item.enable === undefined ? item.enable = true : item.enable; item.enable === undefined ? item.enable = true : item.enable;
item.variableEnable = item.variableEnable === undefined ? true : item.variableEnable; item.variableEnable = item.variableEnable === undefined ? true : item.variableEnable;
if(this.selectedTreeNode !== undefined){ if(this.selectedTreeNode !== undefined){
if(this.stepFilter.get("AllSamplerProxy").indexOf(this.selectedTreeNode.type) !== -1){ if(this.stepFilter.get("SpecialSteps").indexOf(this.selectedTreeNode.type) !== -1){
this.scenarioDefinition.splice(this.selectedTreeNode.index,0,item); this.scenarioDefinition.splice(this.selectedTreeNode.index,0,item);
this.$store.state.forceRerenderIndex = getUUID(); this.$store.state.forceRerenderIndex = getUUID();
}else{ }else{
@ -1322,7 +1322,7 @@ export default {
this.recursiveSorting(request.hashTree); this.recursiveSorting(request.hashTree);
} }
if(this.selectedTreeNode !== undefined){ if(this.selectedTreeNode !== undefined){
if(this.stepFilter.get("AllSamplerProxy").indexOf(this.selectedTreeNode.type) !== -1){ if(this.stepFilter.get("SpecialSteps").indexOf(this.selectedTreeNode.type) !== -1){
this.scenarioDefinition.splice(this.selectedTreeNode.index,0,request); this.scenarioDefinition.splice(this.selectedTreeNode.index,0,request);
this.$store.state.forceRerenderIndex = getUUID(); this.$store.state.forceRerenderIndex = getUUID();
}else{ }else{

1
frontend/src/business/components/api/automation/scenario/Setting.js
View File

@ -23,6 +23,7 @@ export function STEP() {
['CustomizeReq', getDefaultSamplerMenu()], ['CustomizeReq', getDefaultSamplerMenu()],
['MaxSamplerProxy', getDefaultSamplerMenu()], ['MaxSamplerProxy', getDefaultSamplerMenu()],
['GenericController', getAll()], ['GenericController', getAll()],
['SpecialSteps', ['HTTPSamplerProxy', 'Assertions', 'DubboSampler', 'JDBCSampler', 'TCPSampler', 'Sampler', 'AbstractSampler', 'JSR223Processor', 'API', 'MsUiCommand']],
['AllSamplerProxy', ['HTTPSamplerProxy', 'DubboSampler', 'JDBCSampler', 'TCPSampler', 'Sampler', 'AbstractSampler', 'JSR223Processor', 'API', 'MsUiCommand']], ['AllSamplerProxy', ['HTTPSamplerProxy', 'DubboSampler', 'JDBCSampler', 'TCPSampler', 'Sampler', 'AbstractSampler', 'JSR223Processor', 'API', 'MsUiCommand']],
['DEFINITION', ['HTTPSamplerProxy', 'DubboSampler', 'JDBCSampler', 'TCPSampler']], ['DEFINITION', ['HTTPSamplerProxy', 'DubboSampler', 'JDBCSampler', 'TCPSampler']],
['ALlSamplerStep', ['JSR223PreProcessor', 'JSR223PostProcessor', 'JDBCPreProcessor', 'JDBCPostProcessor', 'Assertions', 'Extract', 'ConstantTimer']], ['ALlSamplerStep', ['JSR223PreProcessor', 'JSR223PostProcessor', 'JDBCPreProcessor', 'JDBCPostProcessor', 'Assertions', 'Extract', 'ConstantTimer']],

2
frontend/src/business/components/api/automation/scenario/menu/Menu.js
View File

@ -147,7 +147,7 @@ export function buttons(this_) {
} }
export function setNode(_this,node) { export function setNode(_this,node) {
if(_this.selectedTreeNode !== undefined){ if(_this.selectedTreeNode !== undefined){
if(_this.stepFilter.get("AllSamplerProxy").indexOf(_this.selectedTreeNode.type) !== -1){ if(_this.stepFilter.get("SpecialSteps").indexOf(_this.selectedTreeNode.type) !== -1){
_this.scenarioDefinition.splice(_this.selectedTreeNode.index,0,node); _this.scenarioDefinition.splice(_this.selectedTreeNode.index,0,node);
_this.$store.state.forceRerenderIndex = getUUID(); _this.$store.state.forceRerenderIndex = getUUID();
}else{ }else{