Skip to content

Commit 96f4f98

Browse files
committed
Fix ui tests
1 parent 87af898 commit 96f4f98

File tree

6 files changed

+18
-14
lines changed

6 files changed

+18
-14
lines changed

ui/components/config/BasicConfig.vue

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,10 +137,12 @@
137137
:key="parameter"
138138
class="parameter-group"
139139
>
140-
<b-input-group-text class="parameter-label basic-config-label shapeflow-form-label">
140+
<b-input-group-text v-if="features.parameters[feature][parameter] !== undefined"
141+
class="parameter-label basic-config-label shapeflow-form-label">
141142
{{ features.parameters[feature][parameter].description }}
142143
</b-input-group-text>
143144
<SchemaField
145+
v-if="features.parameters[feature][parameter] !== undefined"
144146
:class_="'parameter-field'"
145147
:type="features.parameters[feature][parameter].type"
146148
:value="config.feature_parameters[index][parameter]"

ui/components/config/__tests__/BasicConfig.test.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -446,7 +446,7 @@ describe('features', () => {
446446
w.destroy();
447447
}
448448

449-
for (let i = 0; i < OPTIONS.length; i++) {
449+
for (let i = 0; i < OPTIONS.length-1; i++) {
450450
await _test(i);
451451
}
452452
});
@@ -559,7 +559,7 @@ describe('output', () => {
559559
console.log(input.classes());
560560

561561
// mock a value change & emit focusout
562-
input.setProps({ value: undefined });
562+
input.vm.$props.value = undefined;
563563
input.vm.$parent.$data.valueOut = undefined; // pass this.valueOut !== this.value check in SchemaField
564564
await input.vm.$emit('focusout');
565565

@@ -574,7 +574,7 @@ describe('output', () => {
574574
console.log(input.classes());
575575

576576
// mock a value change & emit keyup Enter
577-
input.setProps({ value: undefined });
577+
input.vm.$props.value = undefined;
578578
input.vm.$parent.$data.valueOut = undefined; // pass this.valueOut !== this.value check in SchemaField
579579
await input.trigger('keyup.enter');
580580

@@ -589,7 +589,7 @@ describe('output', () => {
589589
console.log(field.classes());
590590

591591
// mock a value change & emit keyup Enter
592-
field.setProps({ value: undefined });
592+
field.vm.$props.value = undefined;
593593
field.vm.$parent.$data.valueOut = undefined; // pass this.valueOut !== this.value check in SchemaField
594594
await field.trigger('change');
595595

ui/src/__tests__/api.test.js

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,13 @@ import {
55
import {startServer, killServer, checkIfListening} from "../shapeflow";
66
import {test, describe, beforeEach, afterEach} from "@jest/globals";
77

8-
beforeEach(startServer)
9-
afterEach(killServer)
8+
beforeEach(() => {
9+
startServer();
10+
});
11+
12+
afterEach(() => {
13+
killServer();
14+
});
1015

1116
function run(test) {
1217
expect(checkIfListening()).toBe(true);

ui/src/__tests__/map.test.js

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,9 @@ var MAP = undefined;
1515

1616
beforeAll(async () => {
1717
startServer();
18-
1918
MAP = await retryOnce(api.map);
2019
killServer();
21-
})
20+
});
2221

2322
test('validate map', () => {
2423
for (const rule in MAP) {

ui/src/shapeflow.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import {execSync, spawn} from "child_process";
1+
import {execSync, spawn, kill} from "child_process";
22

33
export function waitSync(ms) {
44
const end = Date.now() + ms;
@@ -10,8 +10,8 @@ export function startServer() {
1010
'python3', ['sf.py', '--background'],
1111
{cwd: '..', shell: false, detached: false}
1212
);
13+
SERVER.unref();
1314
waitSync(2000);
14-
return SERVER;
1515
}
1616

1717
export function checkIfListening() {

ui/store/__tests__/schemas.test.js

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ import { api } from '../../src/api'
33

44
import {startServer, killServer} from "../../src/shapeflow";
55

6-
import {exec, execSync, spawn, spawnSync} from 'child_process';
76
import {test, describe, beforeEach, afterEach, beforeAll, afterAll} from "@jest/globals";
87

98
import {createLocalVue} from "@vue/test-utils";
@@ -14,10 +13,9 @@ var SCHEMAS = undefined;
1413

1514
beforeAll(async () => {
1615
startServer();
17-
1816
SCHEMAS = await retryOnce(api.schemas);
17+
killServer();
1918
});
20-
afterAll(killServer);
2119

2220

2321
test('state', () => {

0 commit comments

Comments
 (0)