Skip to content

Commit c360fb2

Browse files
author
Dennis Labordus
committed
Updated test to save files.
Signed-off-by: Dennis Labordus <[email protected]>
1 parent ebce26b commit c360fb2

File tree

6 files changed

+16
-14
lines changed

6 files changed

+16
-14
lines changed

‎compas/docker-compose-basex.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,7 @@ services:
144144
open-scd:
145145
labels:
146146
compas: true
147-
image: "lfenergy/compas-open-scd:v0.24.0.0"
147+
image: "lfenergy/compas-open-scd:v0.24.0.1"
148148
healthcheck:
149149
test: ["CMD", "curl", "-f", "http://localhost/"]
150150
interval: 30s

‎compas/docker-compose-postgresql.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ services:
151151
open-scd:
152152
labels:
153153
compas: true
154-
image: "lfenergy/compas-open-scd:v0.24.0.0"
154+
image: "lfenergy/compas-open-scd:v0.24.0.1"
155155
healthcheck:
156156
test: ["CMD", "curl", "-f", "http://localhost/"]
157157
interval: 30s

‎integration-testing/TestSuite001-basic-compas.robot‎

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ TestCase001-02
3333
Set Test Variable ${scltype} CID
3434

3535
Open Menu Save project
36-
Add to CoMPAS MiniGrid.scd ${sclname} ${scltype} 1.0.0
36+
Add to CoMPAS MiniGrid ${sclname} ${scltype} 1.0.0
3737

3838
Select Tab Substation
3939
Get Text ${substation-editor-selector} section > h1:has-text("Sub1")
@@ -51,7 +51,7 @@ TestCase001-03
5151
Set Test Variable ${scltype} CID
5252

5353
Open Menu Save project
54-
Add to CoMPAS MiniGrid.scd ${sclname} ${scltype} 1.0.0
54+
Add to CoMPAS MiniGrid ${sclname} ${scltype} 1.0.0
5555

5656
Close OpenSCD
5757
Open OpenSCD and Login
@@ -75,7 +75,7 @@ TestCase001-04
7575
Set Test Variable ${scltype} CID
7676

7777
Open Menu Save project
78-
Add to CoMPAS MiniGrid.scd ${sclname} ${scltype} 1.0.0
78+
Add to CoMPAS MiniGrid ${sclname} ${scltype} 1.0.0
7979

8080
Open Menu Save project
8181
Save to local file ${sclname} ${scltype}
@@ -94,12 +94,13 @@ TestCase001-05
9494
Set Test Variable ${scltype} CID
9595

9696
Open Menu Save project
97-
Get Text ${dialog-selector} compas-save mwc-textfield#name input == MiniGrid.scd
98-
Fill Text ${dialog-selector} compas-save mwc-textfield#name input ${sclname}
99-
Click ${dialog-selector} compas-save compas-scltype-radiogroup mwc-list > mwc-radio-list-item[value="${scltype}"]
100-
Click ${dialog-selector} mwc-button[slot="primaryAction"] > button
97+
Get Text mwc-dialog#compas-save-dlg > compas-save mwc-textfield#name label > input == MiniGrid
98+
Fill Text mwc-dialog#compas-save-dlg > compas-save mwc-textfield#name label > input ${sclname}
99+
Click mwc-dialog#compas-save-dlg > compas-save compas-scltype-select mwc-select
100+
Click mwc-dialog#compas-save-dlg > compas-save compas-scltype-select mwc-select > mwc-list-item[value="${scltype}"]
101+
Click mwc-dialog#compas-save-dlg > mwc-button[slot="primaryAction"] > button
101102
Wait until executed
102-
Click ${dialog-selector} mwc-button[slot="secondaryAction"] > button
103+
Click mwc-dialog#compas-save-dlg > mwc-button[slot="secondaryAction"] > button
103104
Wait for dialog is closed
104105
Close Menu
105106

‎integration-testing/TestSuite002-versions-compas.robot‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ Initialize Versions
3838
Set Test Variable ${scltype} CID
3939

4040
Open Menu Save project
41-
Add to CoMPAS MiniGrid.scd ${sclname} ${scltype} 1.0.0
41+
Add to CoMPAS MiniGrid ${sclname} ${scltype} 1.0.0
4242

4343
Select Tab CoMPAS Versions
4444
Get Element Count ${compas-versions-editor-selector} mwc-list > mwc-check-list-item == 1

‎integration-testing/include/general-compas.robot‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,9 @@ Add to CoMPAS
2222
# Make sure the initial value is entered. so we can continue.
2323
Get Text mwc-dialog#compas-save-dlg > compas-save mwc-textfield#name label > input == ${initialValue}
2424
Fill Text mwc-dialog#compas-save-dlg > compas-save mwc-textfield#name label > input ${name}-${current-date}
25+
Click mwc-dialog#compas-save-dlg > compas-save compas-scltype-select mwc-select
2526
Click mwc-dialog#compas-save-dlg > compas-save compas-scltype-select mwc-select > mwc-list-item[value="${type.upper()}"]
26-
Click mwc-dialog#compas-save-dlg mwc-button[slot="primaryAction"] > button
27+
Click mwc-dialog#compas-save-dlg > mwc-button[slot="primaryAction"] > button
2728
Wait for dialog is closed
2829
Close Menu
2930
# check if the title (filename) changed to the new expected one.
@@ -32,7 +33,7 @@ Add to CoMPAS
3233
Update in CoMPAS
3334
[Arguments] ${changeType} ${name} ${type} ${expectedVersion}
3435
Click mwc-dialog#compas-save-dlg > compas-save compas-changeset-radiogroup mwc-list > mwc-radio-list-item[value="${changeType.upper()}"]
35-
Click mwc-dialog#compas-save-dlg mwc-button[slot="primaryAction"] > button
36+
Click mwc-dialog#compas-save-dlg > mwc-button[slot="primaryAction"] > button
3637
Wait for dialog is closed
3738
Close Menu
3839
# check if the title (filename) changed to the new expected one.

‎integration-testing/include/general-openscd.robot‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ Open local file
8484
Save to local file
8585
[Arguments] ${name} ${type}
8686
${dl_promise}= Promise To Wait For Download ${OUTPUT DIR}/saved-files/${name}-${current-date}.${type.lower()}
87-
Click mwc-dialog compas-save mwc-button[label="Save to file..."] button
87+
Click mwc-dialog#compas-save-dlg > compas-save mwc-button[label="Save to file..."] button
8888
${file_obj}= Wait For ${dl_promise}
8989
File Should Exist ${file_obj}[saveAs]
9090
Wait for dialog is closed

0 commit comments

Comments
 (0)