Skip to content

Commit

Permalink
Latest version updated and fixed tests.
Browse files Browse the repository at this point in the history
Signed-off-by: Dennis Labordus <[email protected]>
  • Loading branch information
Dennis Labordus committed Sep 22, 2022
1 parent c360fb2 commit bca00d1
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 10 deletions.
4 changes: 2 additions & 2 deletions compas/docker-compose-basex.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ services:
scl-data-service:
labels:
compas: true
image: "lfenergy/compas-scl-data-service:0.10.0-basex"
image: "lfenergy/compas-scl-data-service:0.11.0-basex"
ports:
- "9090:8080"
environment:
Expand Down Expand Up @@ -144,7 +144,7 @@ services:
open-scd:
labels:
compas: true
image: "lfenergy/compas-open-scd:v0.24.0.1"
image: "lfenergy/compas-open-scd:v0.24.0.2"
healthcheck:
test: ["CMD", "curl", "-f", "http://localhost/"]
interval: 30s
Expand Down
4 changes: 2 additions & 2 deletions compas/docker-compose-postgresql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ services:
scl-data-service:
labels:
compas: true
image: "lfenergy/compas-scl-data-service:0.10.0-postgresql"
image: "lfenergy/compas-scl-data-service:0.11.0-postgresql"
ports:
- "9090:8080"
environment:
Expand Down Expand Up @@ -151,7 +151,7 @@ services:
open-scd:
labels:
compas: true
image: "lfenergy/compas-open-scd:v0.24.0.1"
image: "lfenergy/compas-open-scd:v0.24.0.2"
healthcheck:
test: ["CMD", "curl", "-f", "http://localhost/"]
interval: 30s
Expand Down
12 changes: 6 additions & 6 deletions integration-testing/TestSuite002-versions-compas.robot
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@ TestCase002-30
# Next select the first version from the list and compare this to the current open edited version.
Click ${compas-versions-editor-selector} mwc-list > mwc-check-list-item:nth-child(1) mwc-checkbox
Click ${compas-versions-editor-selector} mwc-fab[label="Compare version (current)"] > button
Get Text ${dialog-selector} \#wizard-content > mwc-list > mwc-list-item:nth-child(3) >> text=Substation
Get Text ${dialog-selector} div\#wizard-content mwc-list > mwc-list-item > span:has-text("Substation")
Click ${dialog-selector} mwc-button[slot="secondaryAction"] > button
Wait for dialog is closed

Expand All @@ -175,15 +175,15 @@ TestCase002-31
Select Tab CoMPAS Versions
# Now select no versions and try to compare, should show a error dialog.
Click ${compas-versions-editor-selector} mwc-fab[label="Compare version (current)"] > button
Get Text ${dialog-selector} \#wizard-content:has-text("Select maximum one version to compare the current project against.")
Get Text ${dialog-selector} div\#wizard-content > span:has-text("Select maximum one version to compare the current project against.")
Click ${dialog-selector} mwc-button[slot="secondaryAction"] > button
Wait for dialog is closed

# Now select two versions and try to compare, should show a error dialog.
Click ${compas-versions-editor-selector} mwc-list > mwc-check-list-item:nth-child(1) mwc-checkbox
Click ${compas-versions-editor-selector} mwc-list > mwc-check-list-item:nth-child(2) mwc-checkbox
Click ${compas-versions-editor-selector} mwc-fab[label="Compare version (current)"] > button
Get Text ${dialog-selector} \#wizard-content:has-text("Select maximum one version to compare the current project against.")
Get Text ${dialog-selector} div\#wizard-content > span:has-text("Select maximum one version to compare the current project against.")
Click ${dialog-selector} mwc-button[slot="secondaryAction"] > button
Wait for dialog is closed

Expand All @@ -200,7 +200,7 @@ TestCase002-32
Click ${compas-versions-editor-selector} mwc-list > mwc-check-list-item:nth-child(1) mwc-checkbox
Click ${compas-versions-editor-selector} mwc-list > mwc-check-list-item:nth-child(2) mwc-checkbox
Click ${compas-versions-editor-selector} mwc-fab[label="Compare versions"] > button
Get Text ${dialog-selector} \#wizard-content > mwc-list:nth-child(1) > mwc-list-item:nth-child(3) >> text=Substation
Get Text ${dialog-selector} div\#wizard-content mwc-list > mwc-list-item > span:has-text("Substation")
Click ${dialog-selector} mwc-button[slot="secondaryAction"] > button
Wait for dialog is closed

Expand All @@ -221,14 +221,14 @@ TestCase002-33
# Now select one versions and try to compare, should show a error dialog.
Click ${compas-versions-editor-selector} mwc-list > mwc-check-list-item:nth-child(1) mwc-checkbox
Click ${compas-versions-editor-selector} mwc-fab[label="Compare versions"] > button
Get Text ${dialog-selector} \#wizard-content:has-text("Select maximum two versions to compare with each other.")
Get Text ${dialog-selector} div#wizard-content > span:has-text("Select maximum two versions to compare with each other.")
Click ${dialog-selector} mwc-button[slot="secondaryAction"] > button
Wait for dialog is closed

# Now select three versions (first is already selected) and try to compare, should show a error dialog.
Click ${compas-versions-editor-selector} mwc-list > mwc-check-list-item:nth-child(2) mwc-checkbox
Click ${compas-versions-editor-selector} mwc-list > mwc-check-list-item:nth-child(3) mwc-checkbox
Click ${compas-versions-editor-selector} mwc-fab[label="Compare versions"] > button
Get Text ${dialog-selector} \#wizard-content:has-text("Select maximum two versions to compare with each other.")
Get Text ${dialog-selector} div#wizard-content > span:has-text("Select maximum two versions to compare with each other.")
Click ${dialog-selector} mwc-button[slot="secondaryAction"] > button
Wait for dialog is closed

0 comments on commit bca00d1

Please sign in to comment.