Skip to content

Commit 208ebd4

Browse files
bexsoftbexsoft
authored
Merge branch 'master' into multi-sel-dl-zip
2 parents 35ba64e + 0d628f5 commit 208ebd4

File tree

2 files changed

+54
-33
lines changed

2 files changed

+54
-33
lines changed

‎.github/workflows/jobs.yaml‎

Lines changed: 53 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -238,10 +238,11 @@ jobs:
238238
run: |
239239
(./console server) & (make initialize-permissions)
240240
241+
- name: Install TestCafe
242+
run: npm install testcafe@3.0.0
243+
241244
- name: Run TestCafe Tests
242-
uses: DevExpress/testcafe-action@latest
243-
with:
244-
args: '"firefox --headless --no-sandbox" portal-ui/tests/permissions-1/ --skip-js-errors -c 3'
245+
run: npx testcafe "chrome:headless" portal-ui/tests/permissions-1/ -q --skip-js-errors -c 3
245246

246247
- name: Clean up users & policies
247248
run: |
@@ -284,10 +285,11 @@ jobs:
284285
run: |
285286
(./console server) & (make initialize-permissions)
286287
288+
- name: Install TestCafe
289+
run: npm install testcafe@3.0.0
290+
287291
- name: Run TestCafe Tests
288-
uses: DevExpress/testcafe-action@latest
289-
with:
290-
args: '"firefox --headless --no-sandbox" portal-ui/tests/permissions-2/ --skip-js-errors -c 3'
292+
run: npx testcafe "chrome:headless" portal-ui/tests/permissions-2/ -q --skip-js-errors -c 3
291293

292294
- name: Clean up users & policies
293295
run: |
@@ -330,10 +332,11 @@ jobs:
330332
run: |
331333
(./console server) & (make initialize-permissions)
332334
335+
- name: Install TestCafe
336+
run: npm install testcafe@3.0.0
337+
333338
- name: Run TestCafe Tests
334-
uses: DevExpress/testcafe-action@latest
335-
with:
336-
args: '"firefox --headless --no-sandbox" portal-ui/tests/permissions-3/ --skip-js-errors -c 3'
339+
run: npx testcafe "chrome:headless" portal-ui/tests/permissions-3/ -q --skip-js-errors -c 3
337340

338341
- name: Clean up users & policies
339342
run: |
@@ -375,11 +378,14 @@ jobs:
375378
- name: Start Console, front-end app and initialize users/policies
376379
run: |
377380
(./console server) & (make initialize-permissions)
381+
382+
- name: Install TestCafe
383+
run: npm install testcafe@3.0.0
384+
378385
- name: Run TestCafe Tests
379386
timeout-minutes: 10
380-
uses: DevExpress/testcafe-action@latest
381-
with:
382-
args: '"firefox --headless --no-sandbox" portal-ui/tests/permissions-4/ --skip-js-errors'
387+
run: npx testcafe "chrome:headless" portal-ui/tests/permissions-4/ --skip-js-errors
388+
383389
all-permissions-5:
384390
name: Permissions Tests Part 5
385391
needs:
@@ -415,11 +421,14 @@ jobs:
415421
- name: Start Console, front-end app and initialize users/policies
416422
run: |
417423
(./console server) & (make initialize-permissions)
424+
425+
- name: Install TestCafe
426+
run: npm install testcafe@3.0.0
427+
418428
- name: Run TestCafe Tests
419429
timeout-minutes: 5
420-
uses: DevExpress/testcafe-action@latest
421-
with:
422-
args: '"firefox --headless --no-sandbox" portal-ui/tests/permissions-5/ --skip-js-errors'
430+
run: npx testcafe "chrome:headless" portal-ui/tests/permissions-5/ --skip-js-errors
431+
423432
all-permissions-6:
424433
name: Permissions Tests Part 6
425434
needs:
@@ -455,11 +464,14 @@ jobs:
455464
- name: Start Console, front-end app and initialize users/policies
456465
run: |
457466
(./console server) & (make initialize-permissions)
467+
468+
- name: Install TestCafe
469+
run: npm install testcafe@3.0.0
470+
458471
- name: Run TestCafe Tests
459472
timeout-minutes: 5
460-
uses: DevExpress/testcafe-action@latest
461-
with:
462-
args: '"firefox --headless --no-sandbox" portal-ui/tests/permissions-6/ --skip-js-errors'
473+
run: npx testcafe "chrome:headless" portal-ui/tests/permissions-6/ --skip-js-errors
474+
463475
all-permissions-7:
464476
name: Permissions Tests Part 7
465477
needs:
@@ -495,11 +507,13 @@ jobs:
495507
- name: Start Console, front-end app and initialize users/policies
496508
run: |
497509
(./console server) & (make initialize-permissions)
510+
- name: Install TestCafe
511+
run: npm install testcafe@3.0.0
512+
498513
- name: Run TestCafe Tests
499514
timeout-minutes: 5
500-
uses: DevExpress/testcafe-action@latest
501-
with:
502-
args: '"firefox --headless --no-sandbox" portal-ui/tests/permissions-7/ --skip-js-errors'
515+
run: npx testcafe "chrome:headless" portal-ui/tests/permissions-7/ --skip-js-errors
516+
503517
all-permissions-8:
504518
name: Permissions Tests Part 8
505519
needs:
@@ -535,11 +549,14 @@ jobs:
535549
- name: Start Console, front-end app and initialize users/policies
536550
run: |
537551
(./console server) & (make initialize-permissions)
552+
553+
- name: Install TestCafe
554+
run: npm install testcafe@3.0.0
555+
538556
- name: Run TestCafe Tests
539557
timeout-minutes: 5
540-
uses: DevExpress/testcafe-action@latest
541-
with:
542-
args: '"chrome --headless --no-sandbox" portal-ui/tests/permissions-8/ --skip-js-errors'
558+
run: npx testcafe "chrome:headless" portal-ui/tests/permissions-8/ --skip-js-errors
559+
543560
all-permissions-9:
544561
name: Permissions Tests Part 9
545562
needs:
@@ -576,10 +593,11 @@ jobs:
576593
run: |
577594
(./console server) & (make initialize-permissions)
578595
596+
- name: Install TestCafe
597+
run: npm install testcafe@3.0.0
598+
579599
- name: Run TestCafe Tests
580-
uses: DevExpress/testcafe-action@latest
581-
with:
582-
args: '"firefox --headless --no-sandbox" portal-ui/tests/permissions-9/ --skip-js-errors -c 3'
600+
run: npx testcafe "chrome:headless" portal-ui/tests/permissions-9/ --skip-js-errors -c 3
583601

584602
- name: Clean up users & policies
585603
run: |
@@ -621,10 +639,11 @@ jobs:
621639
run: |
622640
(./console server) & (make initialize-permissions)
623641
642+
- name: Install TestCafe
643+
run: npm install testcafe@3.0.0
644+
624645
- name: Run TestCafe Tests
625-
uses: DevExpress/testcafe-action@latest
626-
with:
627-
args: '"firefox --headless --no-sandbox" portal-ui/tests/permissions-A/ --skip-js-errors -c 3'
646+
run: npx testcafe "chrome:headless" portal-ui/tests/permissions-A/ --skip-js-errors -c 3
628647

629648
- name: Clean up users & policies
630649
run: |
@@ -666,10 +685,11 @@ jobs:
666685
run: |
667686
(./console server) & (make initialize-permissions)
668687
688+
- name: Install TestCafe
689+
run: npm install testcafe@3.0.0
690+
669691
- name: Run TestCafe Tests
670-
uses: DevExpress/testcafe-action@latest
671-
with:
672-
args: '"firefox --headless --no-sandbox" portal-ui/tests/permissions-B/ --skip-js-errors -c 3'
692+
run: npx testcafe "chrome:headless" portal-ui/tests/permissions-B/ --skip-js-errors -c 3
673693

674694
- name: Clean up users & policies
675695
run: |

‎portal-ui/src/screens/Console/EventDestinations/ConfTargetGeneric.tsx‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,7 @@ const ConfTargetGeneric = ({
9898

9999
const setValueElement = (key: string, value: string, index: number) => {
100100
const valuesDup = [...valueHolder];
101+
value = value.trim();
101102
valuesDup[index] = { key, value };
102103

103104
setValueHolder(valuesDup);

0 commit comments

Comments
 (0)