diff --git a/dev/docker/oc10.web.config.json b/dev/docker/oc10.web.config.json index f2782dc632a..fbe3a0b3bf3 100644 --- a/dev/docker/oc10.web.config.json +++ b/dev/docker/oc10.web.config.json @@ -1,16 +1,12 @@ { - "server" : "http://host.docker.internal:8080", + "server": "http://host.docker.internal:8080", "auth": { "clientId": "M8W5mo3wQV3VHWYsaYpWhkr8dwa949i4GljCkedHhl7GWqmHMkxSeJgK2PcS0jt5", "url": "http://host.docker.internal:8080/index.php/apps/oauth2/api/v1/token", "authUrl": "http://host.docker.internal:8080/index.php/apps/oauth2/authorize" }, - "apps": [ - "files", - "media-viewer", - "search" - ], - "applications" : [ + "apps": ["files", "media-viewer", "markdown-editor", "search"], + "applications": [ { "title": { "en": "Classic Design", @@ -32,4 +28,4 @@ "url": "http://host.docker.internal:8080/index.php/settings/personal" } ] -} \ No newline at end of file +} diff --git a/dev/docker/ocis.web.config.json b/dev/docker/ocis.web.config.json index 61d2e261b6c..4f070366228 100644 --- a/dev/docker/ocis.web.config.json +++ b/dev/docker/ocis.web.config.json @@ -1,39 +1,35 @@ { - "server": "https://host.docker.internal:9200", - "theme": "https://host.docker.internal:9200/themes/owncloud/theme.json", - "version": "0.1.0", - "openIdConnect": { - "metadata_url": "https://host.docker.internal:9200/.well-known/openid-configuration", - "authority": "https://host.docker.internal:9200", - "client_id": "web", - "response_type": "code", - "scope": "openid profile email" + "server": "https://host.docker.internal:9200", + "theme": "https://host.docker.internal:9200/themes/owncloud/theme.json", + "version": "0.1.0", + "openIdConnect": { + "metadata_url": "https://host.docker.internal:9200/.well-known/openid-configuration", + "authority": "https://host.docker.internal:9200", + "client_id": "web", + "response_type": "code", + "scope": "openid profile email" + }, + "options": { + "hideSearchBar": true + }, + "apps": ["files", "media-viewer", "markdown-editor", "search"], + "external_apps": [ + { + "id": "settings", + "path": "https://host.docker.internal:9200/settings.js" }, - "options": { - "hideSearchBar": true + { + "id": "accounts", + "path": "https://host.docker.internal:9200/accounts.js" }, - "apps": [ - "files", - "media-viewer", - "search" - ], - "external_apps": [ - { - "id": "settings", - "path": "https://host.docker.internal:9200/settings.js" - }, - { - "id": "accounts", - "path": "https://host.docker.internal:9200/accounts.js" - }, - { - "id": "draw-io", - "path": "web-app-draw-io", - "config": { - "url": "https://embed.diagrams.net", - "autosave": false, - "theme": "minimal" - } - } - ] -} \ No newline at end of file + { + "id": "draw-io", + "path": "web-app-draw-io", + "config": { + "url": "https://embed.diagrams.net", + "autosave": false, + "theme": "minimal" + } + } + ] +} diff --git a/tests/acceptance/pageObjects/FilesPageElement/appSideBar.js b/tests/acceptance/pageObjects/FilesPageElement/appSideBar.js index c5f821e549f..08e9b04b109 100644 --- a/tests/acceptance/pageObjects/FilesPageElement/appSideBar.js +++ b/tests/acceptance/pageObjects/FilesPageElement/appSideBar.js @@ -46,7 +46,7 @@ module.exports = { const selector = this.getResourceInfoSelector(resource, elementType) let resourceInfoVisible = false await this.isVisible({ locateStrategy: 'xpath', selector, timeout }, result => { - resourceInfoVisible = result.value === true + resourceInfoVisible = result.status === 0 }) return resourceInfoVisible }, diff --git a/tests/acceptance/stepDefinitions/filesContext.js b/tests/acceptance/stepDefinitions/filesContext.js index c9e5b83596f..5f5e1a8b7e1 100644 --- a/tests/acceptance/stepDefinitions/filesContext.js +++ b/tests/acceptance/stepDefinitions/filesContext.js @@ -433,7 +433,6 @@ Then('the last uploaded folder should be listed on the webUI', async function() }) Then('file {string} should not be listed on the webUI', function(file) { - client.pause(10000) return client.page.FilesPageElement.filesList() .isElementListed(file, 'file', client.globals.waitForNegativeConditionTimeout) .then(state => { @@ -1404,7 +1403,7 @@ Then( assert.strictEqual( isPresent, true, - `only '${expectedVisibleItems}' actions menu item(s) was expected to be visible but also found '${visibleItems}'.` + `only '${expectedVisibleItems}' actions menu item(s) was expected to be visible but found '${visibleItems}' instead.` ) } )