From 340fdc8efaa65b86457b2ac22d473f70404a9d70 Mon Sep 17 00:00:00 2001 From: Christopher Lepski Date: Thu, 26 Sep 2024 09:27:28 +0200 Subject: [PATCH 01/10] chore: Bump compas open scd version to 0.35.0.1 Signed-off-by: Christopher Lepski --- compas/docker-compose-postgresql.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compas/docker-compose-postgresql.yml b/compas/docker-compose-postgresql.yml index 3bcf452..54ccaa3 100644 --- a/compas/docker-compose-postgresql.yml +++ b/compas/docker-compose-postgresql.yml @@ -151,7 +151,7 @@ services: open-scd: labels: compas: true - image: "lfenergy/compas-open-scd:v0.33.0.7" + image: "lfenergy/compas-open-scd:v0.35.0.1" depends_on: - scl-data-service - cim-mapping From 538bedbf84e59d4ad2f973449843c9d81639cf00 Mon Sep 17 00:00:00 2001 From: Christopher Lepski Date: Thu, 26 Sep 2024 11:11:39 +0200 Subject: [PATCH 02/10] chore: Adjust query selector to new dom structure Signed-off-by: Christopher Lepski --- integration-testing/include/general-openscd.robot | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/integration-testing/include/general-openscd.robot b/integration-testing/include/general-openscd.robot index 0cc735c..c731fbb 100644 --- a/integration-testing/include/general-openscd.robot +++ b/integration-testing/include/general-openscd.robot @@ -8,7 +8,9 @@ Resource ./general-config.robot *** Variables *** # Variables of Selectors commonly used. -${menu-selector} mwc-drawer[id="menu"] +${base-selector} dom:document.querySelector("open-scd").shadowRoot.querySelector("compas-layout").shadowRoot +${menu-selector} ${base-selector}.querySelector(mwc-drawer[id="menu"]) +${menu-button} ${base-selector}.querySelector(mwc-icon-button [label="Menu"]) ${nav-selector} mwc-top-app-bar-fixed ${dialog-selector} wizard-dialog ${substation-editor-selector} substation-editor:first-child > action-pane @@ -42,7 +44,7 @@ Check Browser Title Open Menu [Arguments] ${menuItemTitle} - Click ${menu-selector} mwc-icon-button[label="Menu"] > button + Click ${menu-button} > button Click ${menu-selector} mwc-list > mwc-list-item >> span:text-is("${menuItemTitle}") Open Navigation Menu From 71b4632abec50f5bc4be9c6fdcb62d3377c0a905 Mon Sep 17 00:00:00 2001 From: Christopher Lepski Date: Thu, 26 Sep 2024 11:21:44 +0200 Subject: [PATCH 03/10] debug: Adjust query selector Signed-off-by: Christopher Lepski --- integration-testing/include/general-openscd.robot | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/integration-testing/include/general-openscd.robot b/integration-testing/include/general-openscd.robot index c731fbb..12e7d5f 100644 --- a/integration-testing/include/general-openscd.robot +++ b/integration-testing/include/general-openscd.robot @@ -44,7 +44,7 @@ Check Browser Title Open Menu [Arguments] ${menuItemTitle} - Click ${menu-button} > button + Click ${menu-button}.querySelector('button') Click ${menu-selector} mwc-list > mwc-list-item >> span:text-is("${menuItemTitle}") Open Navigation Menu From 752d4708ad7f50c48b148c45c58f81714b6fa36d Mon Sep 17 00:00:00 2001 From: Christopher Lepski Date: Thu, 26 Sep 2024 11:28:53 +0200 Subject: [PATCH 04/10] debug: Adjust query Signed-off-by: Christopher Lepski --- integration-testing/include/general-openscd.robot | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/integration-testing/include/general-openscd.robot b/integration-testing/include/general-openscd.robot index 12e7d5f..9485d08 100644 --- a/integration-testing/include/general-openscd.robot +++ b/integration-testing/include/general-openscd.robot @@ -8,9 +8,9 @@ Resource ./general-config.robot *** Variables *** # Variables of Selectors commonly used. -${base-selector} dom:document.querySelector("open-scd").shadowRoot.querySelector("compas-layout").shadowRoot -${menu-selector} ${base-selector}.querySelector(mwc-drawer[id="menu"]) -${menu-button} ${base-selector}.querySelector(mwc-icon-button [label="Menu"]) +${base-selector} dom:document.querySelector('open-scd').shadowRoot.querySelector('compas-layout').shadowRoot +${menu-selector} ${base-selector}.querySelector(mwc-drawer[id='menu']) +${menu-button} ${base-selector}.querySelector(mwc-icon-button [label='Menu']) ${nav-selector} mwc-top-app-bar-fixed ${dialog-selector} wizard-dialog ${substation-editor-selector} substation-editor:first-child > action-pane From 9179c150d644ca4ab91d302cadd3bbfadd98735b Mon Sep 17 00:00:00 2001 From: Christopher Lepski Date: Thu, 26 Sep 2024 12:12:17 +0200 Subject: [PATCH 05/10] debug: Try another selector Signed-off-by: Christopher Lepski --- integration-testing/include/general-openscd.robot | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/integration-testing/include/general-openscd.robot b/integration-testing/include/general-openscd.robot index 9485d08..401643d 100644 --- a/integration-testing/include/general-openscd.robot +++ b/integration-testing/include/general-openscd.robot @@ -8,7 +8,7 @@ Resource ./general-config.robot *** Variables *** # Variables of Selectors commonly used. -${base-selector} dom:document.querySelector('open-scd').shadowRoot.querySelector('compas-layout').shadowRoot +${base-selector} document.querySelector('open-scd').shadowRoot.querySelector('compas-layout').shadowRoot ${menu-selector} ${base-selector}.querySelector(mwc-drawer[id='menu']) ${menu-button} ${base-selector}.querySelector(mwc-icon-button [label='Menu']) ${nav-selector} mwc-top-app-bar-fixed @@ -44,7 +44,7 @@ Check Browser Title Open Menu [Arguments] ${menuItemTitle} - Click ${menu-button}.querySelector('button') + Click mwc-icon-button[label="Menu"] > button Click ${menu-selector} mwc-list > mwc-list-item >> span:text-is("${menuItemTitle}") Open Navigation Menu From 12d8db068dec2de9fd5a76bfad53b5e34718335d Mon Sep 17 00:00:00 2001 From: Christopher Lepski Date: Thu, 26 Sep 2024 12:19:37 +0200 Subject: [PATCH 06/10] debug: Adjust queries Signed-off-by: Christopher Lepski --- integration-testing/include/general-openscd.robot | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/integration-testing/include/general-openscd.robot b/integration-testing/include/general-openscd.robot index 401643d..e14eb6a 100644 --- a/integration-testing/include/general-openscd.robot +++ b/integration-testing/include/general-openscd.robot @@ -8,9 +8,8 @@ Resource ./general-config.robot *** Variables *** # Variables of Selectors commonly used. -${base-selector} document.querySelector('open-scd').shadowRoot.querySelector('compas-layout').shadowRoot -${menu-selector} ${base-selector}.querySelector(mwc-drawer[id='menu']) -${menu-button} ${base-selector}.querySelector(mwc-icon-button [label='Menu']) +${menu-selector} mwc-drawer[id='menu'] +${menu-button} mwc-icon-button[label="Menu"] ${nav-selector} mwc-top-app-bar-fixed ${dialog-selector} wizard-dialog ${substation-editor-selector} substation-editor:first-child > action-pane @@ -44,7 +43,7 @@ Check Browser Title Open Menu [Arguments] ${menuItemTitle} - Click mwc-icon-button[label="Menu"] > button + Click ${menu-button} > button Click ${menu-selector} mwc-list > mwc-list-item >> span:text-is("${menuItemTitle}") Open Navigation Menu From a820e5feff3fc170dae65d3bea3263298755bd1e Mon Sep 17 00:00:00 2001 From: Christopher Lepski Date: Thu, 26 Sep 2024 12:27:57 +0200 Subject: [PATCH 07/10] chore: Adjust progress bar selector Signed-off-by: Christopher Lepski --- integration-testing/include/general-openscd.robot | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/integration-testing/include/general-openscd.robot b/integration-testing/include/general-openscd.robot index e14eb6a..a23c694 100644 --- a/integration-testing/include/general-openscd.robot +++ b/integration-testing/include/general-openscd.robot @@ -101,7 +101,7 @@ Wait for dialog is closed Wait For Elements State ${dialog-selector} hidden Wait until executed - Wait For Function element => element.className.indexOf('mdc-linear-progress--closed') >= 0 open-scd > mwc-linear-progress > div[role="progressbar"] timeout=30s + Wait For Function element => element.className.indexOf('mdc-linear-progress--closed') >= 0 oscd-waiter > mwc-linear-progress > div[role="progressbar"] timeout=30s Close Issues Snackbar ${snackbarVisible}= Get Element States mwc-snackbar#issue > mwc-icon-button[slot="dismiss"] > button *= visible From be218fac3fc15e8b7d190148bc325560197f7863 Mon Sep 17 00:00:00 2001 From: Christopher Lepski Date: Thu, 26 Sep 2024 12:36:05 +0200 Subject: [PATCH 08/10] chore: Adjust drawer selector Signed-off-by: Christopher Lepski --- integration-testing/include/general-openscd.robot | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/integration-testing/include/general-openscd.robot b/integration-testing/include/general-openscd.robot index a23c694..b841920 100644 --- a/integration-testing/include/general-openscd.robot +++ b/integration-testing/include/general-openscd.robot @@ -94,7 +94,7 @@ Save to local file Check Title Filename [Arguments] ${filename} ${scltype} - Get Text open-scd > mwc-drawer div#title == ${filename}.${scltype.lower()} + Get Text compas-layout > mwc-drawer div#title == ${filename}.${scltype.lower()} Wait for dialog is closed Wait until executed From 7bf4680cd9fd44f777f7d89f76e4cad0035f7ae1 Mon Sep 17 00:00:00 2001 From: Christopher Lepski Date: Thu, 26 Sep 2024 12:47:00 +0200 Subject: [PATCH 09/10] chore: Adjust selector Signed-off-by: Christopher Lepski --- integration-testing/include/general-openscd.robot | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/integration-testing/include/general-openscd.robot b/integration-testing/include/general-openscd.robot index b841920..535ffdb 100644 --- a/integration-testing/include/general-openscd.robot +++ b/integration-testing/include/general-openscd.robot @@ -94,7 +94,7 @@ Save to local file Check Title Filename [Arguments] ${filename} ${scltype} - Get Text compas-layout > mwc-drawer div#title == ${filename}.${scltype.lower()} + Get Text compas-layout > mwc-drawer span[slot="subtitle"] == ${filename}.${scltype.lower()} Wait for dialog is closed Wait until executed From e1db0ff2bbc5fa9ed815992f0a4b30e18280629f Mon Sep 17 00:00:00 2001 From: Christopher Lepski Date: Thu, 26 Sep 2024 13:22:25 +0200 Subject: [PATCH 10/10] chore: Adjust single line plugin selector Signed-off-by: Christopher Lepski --- integration-testing/TestSuite004-auto-alignment.robot | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/integration-testing/TestSuite004-auto-alignment.robot b/integration-testing/TestSuite004-auto-alignment.robot index 1107025..9190254 100644 --- a/integration-testing/TestSuite004-auto-alignment.robot +++ b/integration-testing/TestSuite004-auto-alignment.robot @@ -10,7 +10,7 @@ Test Setup Initialize and Start OpenSCD Test Teardown Make screenshot and Stop OpenSCD *** Variables *** -${single-line-diagram-selector} oscd-plugin5f1cbbcb9fada7d8 +${single-line-diagram-selector} oscd-plugin54a33cdb5f615be0 ${substation1} _af9a4ae3-ba2e-4c34-8e47-5af894ee20f4 ${substation1VoltageLevel} ${substation1}>S1 110kV