Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion compas/docker-compose-postgresql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ services:
open-scd:
labels:
compas: true
image: "lfenergy/compas-open-scd:v0.38.0.4"
image: "lfenergy/compas-open-scd:v0.38.0.5"
depends_on:
- scl-data-service
- cim-mapping
Expand Down
5 changes: 4 additions & 1 deletion compas/reverse-proxy/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,10 @@ RUN apk add --no-cache openssl-dev
RUN apk add --no-cache git
RUN apk add --no-cache gcc

RUN luarocks install lua-resty-openidc
# We are using fixed version of the lua repository, because the current version is too large and throws an exception during install,
# see issue https://github.com/luarocks/luarocks/issues/1797
# Once the issue is fixed we should remove --only-server ... workaround
RUN luarocks install lua-resty-openidc --only-server https://raw.githubusercontent.com/rocks-moonscript-org/moonrocks-mirror/daab2726276e3282dc347b89a42a5107c3500567

RUN mkdir -p /etc/nginx/include

Expand Down
27 changes: 18 additions & 9 deletions integration-testing/include/general-compas.robot
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@ Documentation Generic variables and Keywords to work with the OpenSCD CoMPAS C
Resource ./general-config.robot
Resource ./general-openscd.robot

*** Variables ***
${compas-save-dialog-selector} mwc-dialog#compas-save-dlg

*** Keywords ***
Initialize and Start OpenSCD
Set global variables
Expand All @@ -25,20 +28,24 @@ Open from CoMPAS

Add to CoMPAS
[Arguments] ${initialValue} ${name} ${type} ${expectedVersion}
# Wait for compas save dialog to open
Sleep 0.5s Wait for dialog to be open
# Make sure the initial value is entered. so we can continue.
Get Text mwc-dialog#compas-save-dlg > compas-save mwc-textfield#name label > input == ${initialValue}
Fill Text mwc-dialog#compas-save-dlg > compas-save mwc-textfield#name label > input ${name}-${current-date}
Click mwc-dialog#compas-save-dlg > compas-save compas-scltype-select mwc-select
Click mwc-dialog#compas-save-dlg > compas-save compas-scltype-select mwc-select > mwc-list-item[value="${type.upper()}"]
Add label mwc-dialog#compas-save-dlg > compas-save ${type}_${current-date}
Click mwc-dialog#compas-save-dlg > mwc-button[slot="primaryAction"] > button
Get Text ${compas-save-dialog-selector} > compas-save mwc-textfield#name label > input == ${initialValue}
Fill Text ${compas-save-dialog-selector} > compas-save mwc-textfield#name label > input ${name}-${current-date}
Click ${compas-save-dialog-selector} > compas-save compas-scltype-select mwc-select
Click ${compas-save-dialog-selector} > compas-save compas-scltype-select mwc-select > mwc-list-item[value="${type.upper()}"]
Add label ${compas-save-dialog-selector} > compas-save ${type}_${current-date}
Click ${compas-save-dialog-selector} > mwc-button[slot="primaryAction"] > button
Wait for dialog is closed
Close Menu
# check if the title (filename) changed to the new expected one.
Check Title Filename ${name}-${current-date}-${expectedVersion} ${type}

Save as to CoMPAS
[Arguments] ${initialValue} ${name} ${type} ${expectedVersion}
# Wait for compas save dialog to open
Sleep 0.5s Wait for dialog to be open
# Make sure the initial value is entered. so we can continue.
Get Text mwc-dialog#compas-save-as-dlg > compas-save mwc-textfield#name label > input == ${initialValue}
Fill Text mwc-dialog#compas-save-as-dlg > compas-save mwc-textfield#name label > input ${name}-${current-date}
Expand All @@ -53,9 +60,11 @@ Save as to CoMPAS

Update in CoMPAS
[Arguments] ${changeType} ${name} ${type} ${expectedVersion}
Click mwc-dialog#compas-save-dlg > compas-save compas-changeset-radiogroup mwc-list > mwc-radio-list-item[value="${changeType.upper()}"]
Add label mwc-dialog#compas-save-dlg > compas-save ${type}_${current-date}_${expectedVersion.replace('.', '')}
Click mwc-dialog#compas-save-dlg > mwc-button[slot="primaryAction"] > button
# Wait for compas save dialog to open
Sleep 0.5s Wait for dialog to be open
Click ${compas-save-dialog-selector} > compas-save compas-changeset-radiogroup mwc-list > mwc-radio-list-item[value="${changeType.upper()}"]
Add label ${compas-save-dialog-selector} > compas-save ${type}_${current-date}_${expectedVersion.replace('.', '')}
Click ${compas-save-dialog-selector} > mwc-button[slot="primaryAction"] > button
Wait for dialog is closed
Close Menu
# check if the title (filename) changed to the new expected one.
Expand Down