diff --git a/.drone.star b/.drone.star index f134cef71..488f1b952 100644 --- a/.drone.star +++ b/.drone.star @@ -552,6 +552,7 @@ def accountsUITests(ctx, phoenixBranch, phoenixCommit, storage = 'owncloud'): ] if phoenixCommit != '' else []) + [ 'yarn install-all', 'cd /drone/src/accounts', + 'yarn install --all', 'make test-acceptance-webui' ], 'volumes': [{ @@ -1356,7 +1357,6 @@ def ocisServer(storage): 'KONNECTD_IDENTIFIER_REGISTRATION_CONF': '/drone/src/ocis/tests/config/drone/identifier-registration.yml', 'KONNECTD_ISS': 'https://ocis-server:9200', 'KONNECTD_TLS': 'true', - 'ACCOUNTS_DATA_PATH': '/srv/app/tmp/ocis-accounts/', }, 'commands': [ 'apk add mailcap', # install /etc/mime.types diff --git a/accounts/ui/tests/config/drone/identifier-registration.yml b/accounts/ui/tests/config/drone/identifier-registration.yml deleted file mode 100644 index a45a83f78..000000000 --- a/accounts/ui/tests/config/drone/identifier-registration.yml +++ /dev/null @@ -1,16 +0,0 @@ ---- - -# OpenID Connect client registry. -clients: - - id: phoenix - name: OCIS - application_type: web - insecure: yes - trusted: yes - redirect_uris: - - https://ocis-server:9200/oidc-callback.html - - https://ocis-server:9200/ - origins: - - https://ocis-server:9200 - -authorities: diff --git a/accounts/ui/tests/config/drone/ocis-config.json b/accounts/ui/tests/config/drone/ocis-config.json deleted file mode 100644 index b68b4a087..000000000 --- a/accounts/ui/tests/config/drone/ocis-config.json +++ /dev/null @@ -1,27 +0,0 @@ -{ - "server": "https://ocis-server:9200", - "theme": "owncloud", - "version": "0.1.0", - "openIdConnect": { - "metadata_url": "https://ocis-server:9200/.well-known/openid-configuration", - "authority": "https://ocis-server:9200", - "client_id": "phoenix", - "response_type": "code", - "scope": "openid profile email" - }, - "apps": [ - "files", - "draw-io", - "markdown-editor", - "media-viewer" - ], - "external_apps": [ - { - "id": "accounts", - "path": "https://ocis-server:9200/accounts.js", - "config": { - "url": "https://ocis-server:9200" - } - } - ] -} diff --git a/ocis/tests/config/drone/ocis-config.json b/ocis/tests/config/drone/ocis-config.json index e0b74d544..b8c5b416c 100644 --- a/ocis/tests/config/drone/ocis-config.json +++ b/ocis/tests/config/drone/ocis-config.json @@ -14,5 +14,15 @@ "draw-io", "markdown-editor", "media-viewer" + ], + "external_apps": [ + { + "id": "settings", + "path": "https://ocis-server:9200/settings.js" + }, + { + "id": "accounts", + "path": "https://ocis-server:9200/accounts.js" + } ] }