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

Merge remote-tracking branch 'origin/master'

This commit is contained in:
Captain.B 2021-03-25 10:15:50 +08:00
parent 0db75e1b12 b1e48675c1
commit c6319bf763
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend/src/main/java/io/metersphere/api/dto/definition/request/MsScenario.java
View File

@ -138,7 +138,7 @@ public class MsScenario extends MsTestElement {
// 场景变量和环境变量 // 场景变量和环境变量
Arguments arguments = arguments(config); Arguments arguments = arguments(config);
if (arguments != null) { if (arguments != null) {
tree.add(config.valueSupposeMock(arguments)); tree.add(ParameterConfig.valueSupposeMock(arguments));
} }
this.addCsvDataSet(tree, variables,config); this.addCsvDataSet(tree, variables,config);
this.addCounter(tree, variables); this.addCounter(tree, variables);

6
backend/src/main/java/io/metersphere/api/dto/definition/request/MsTestElement.java
View File

@ -288,13 +288,13 @@ public abstract class MsTestElement {
if (MsTestElementConstants.LoopController.name().equals(parent.getType())) { if (MsTestElementConstants.LoopController.name().equals(parent.getType())) {
MsLoopController loopController = (MsLoopController) parent; MsLoopController loopController = (MsLoopController) parent;
if (StringUtils.equals(loopController.getLoopType(), LoopConstants.WHILE.name()) && loopController.getWhileController() != null) { if (StringUtils.equals(loopController.getLoopType(), LoopConstants.WHILE.name()) && loopController.getWhileController() != null) {
return "While 循环-" + "${LoopCounterConfigXXX}"; return "While 循环-" + "${MS_LOOP_CONTROLLER_CONFIG}";
} }
if (StringUtils.equals(loopController.getLoopType(), LoopConstants.FOREACH.name()) && loopController.getForEachController() != null) { if (StringUtils.equals(loopController.getLoopType(), LoopConstants.FOREACH.name()) && loopController.getForEachController() != null) {
return "ForEach 循环-" + "${LoopCounterConfigXXX}"; return "ForEach 循环-" + "${MS_LOOP_CONTROLLER_CONFIG}";
} }
if (StringUtils.equals(loopController.getLoopType(), LoopConstants.LOOP_COUNT.name()) && loopController.getCountController() != null) { if (StringUtils.equals(loopController.getLoopType(), LoopConstants.LOOP_COUNT.name()) && loopController.getCountController() != null) {
return "次数循环-" + "${LoopCounterConfigXXX}"; return "次数循环-" + "${MS_LOOP_CONTROLLER_CONFIG}";
} }
} }
// 获取全路径以备后面使用 // 获取全路径以备后面使用

2
backend/src/main/java/io/metersphere/api/dto/definition/request/controller/MsLoopController.java
View File

@ -87,7 +87,7 @@ public class MsLoopController extends MsTestElement {
private CounterConfig addCounterConfig() { private CounterConfig addCounterConfig() {
CounterConfig counterConfig = new CounterConfig(); CounterConfig counterConfig = new CounterConfig();
counterConfig.setVarName("LoopCounterConfigXXX"); counterConfig.setVarName("MS_LOOP_CONTROLLER_CONFIG");
counterConfig.setName("数循结果统计计数器"); counterConfig.setName("数循结果统计计数器");
counterConfig.setEnabled(true); counterConfig.setEnabled(true);
counterConfig.setProperty(TestElement.TEST_CLASS, CounterConfig.class.getName()); counterConfig.setProperty(TestElement.TEST_CLASS, CounterConfig.class.getName());

2
frontend/src/business/components/xpack

@ -1 +1 @@
Subproject commit 2115bd28a90854d2b6276a90878934715498c584 Subproject commit 07951ba17aef6f29e50cfd68e40de3266f9a60cd