Skip to content

Commit

Permalink
Merge pull request #2187 from owncloud/update-web-v3.3.0
Browse files Browse the repository at this point in the history
[full-ci] Update web to v3.3.0
  • Loading branch information
kulmann authored Jun 23, 2021
2 parents d3a7c3f + 8650a3c commit 216be05
Show file tree
Hide file tree
Showing 13 changed files with 273 additions and 200 deletions.
1 change: 1 addition & 0 deletions .codacy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,6 @@ exclude_paths:
- 'ocis/docker/eos-ocis/Dockerfile'
- 'ocis/docker/eos-ocis-dev/Dockerfile'
- 'deployments/**'
- 'tests/acceptance/expected-failures-*.md'

...
2 changes: 1 addition & 1 deletion .drone.env
Original file line number Diff line number Diff line change
Expand Up @@ -3,5 +3,5 @@ CORE_COMMITID=a8f4715fd8cdb6ec371c79e05a4a1fa404618918
CORE_BRANCH=master

# The test runner source for UI tests
WEB_COMMITID=06745744336efb9238a57a81e49d8be80162d976
WEB_COMMITID=05e1db6e71ad3d178e050fd1b4af186703200f84
WEB_BRANCH=master
2 changes: 1 addition & 1 deletion accounts/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@
"not dead"
],
"peerDependencies": {
"owncloud-design-system": "^6.0.1"
"owncloud-design-system": "^7.4.2"
},
"dependencies": {
"validator": "^13.1.1"
Expand Down
35 changes: 3 additions & 32 deletions accounts/pkg/assets/embed.go

Large diffs are not rendered by default.

8 changes: 8 additions & 0 deletions changelog/unreleased/update-web-3.3.0.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
Change: Update ownCloud Web to v3.3.0

Tags: web

We updated ownCloud Web to v3.3.0. Please refer to the changelog (linked) for details on the web release.

https://github.com/owncloud/ocis/pull/2187
https://github.com/owncloud/web/releases/tag/v3.3.0
2 changes: 1 addition & 1 deletion settings/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@
"not dead"
],
"peerDependencies": {
"owncloud-design-system": "^6.0.1"
"owncloud-design-system": "^7.4.2"
},
"dependencies": {
"ldapjs": "^2.2.4",
Expand Down
35 changes: 3 additions & 32 deletions settings/pkg/assets/embed.go

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion settings/ui/tests/acceptance/features/settings.feature
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@ Feature: Set user specific settings
When the user browses to the settings page
And the user changes the language to "English"
And the user browses to the files page
When the user browses to the files page
Then the files menu should be listed in language "English"

Scenario: changing the language only affects one user
Expand Down
16 changes: 8 additions & 8 deletions settings/ui/tests/acceptance/helpers/language.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,14 @@ const filesMenu = {
'Todos los archivos',
'Compartido conmigo',
'Compartido con otros',
"Shared via link",
'Shared via link',
'Archivos borrados'
],
Français: [
'Tous les fichiers',
'Partagé avec moi',
'Partagé avec autres',
"Shared via link",
'Shared via link',
'Fichiers supprimés'
]
}
Expand All @@ -37,17 +37,17 @@ const accountMenu = {
],
Deutsch: [
'Profil',
'Settings',
'Einstellungen',
'Abmelden'
],
Español: [
'Perfil',
'Ajustes',
'Profile',
'Configuración',
'Salir'
],
Français: [
'Profil',
'Paramètres',
'Settings',
'Se déconnecter'
]
}
Expand All @@ -56,7 +56,7 @@ const filesListHeaderMenu = {
English: [
'Name',
'Size',
'Updated',
'Modified',
'Actions'
],
Deutsch: [
Expand All @@ -68,7 +68,7 @@ const filesListHeaderMenu = {
Español: [
'Nombre',
'Tamaño',
'Actualizado',
'Modificado',
'Acciones'
],
Français: [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,8 @@ module.exports = {
})
})
await this
.waitForElementVisible('@userMenuBtn')
.click('@userMenuBtn')
.waitForElementNotVisible('@userMenuContainer')
.waitForElementNotPresent('@userMenuContainer')
return menu
},
getFileHeaderItems: async function () {
Expand All @@ -57,10 +56,6 @@ module.exports = {
pageHeader: {
selector: '.oc-page-title'
},
languageValue: {
selector: "//button[@id='single-choice-toggle-profile-language']",
locateStrategy: 'xpath'
},
fileSidebarNavItem: {
selector: '.oc-sidebar-nav-item'
},
Expand Down
196 changes: 133 additions & 63 deletions tests/acceptance/expected-failures-webUI-on-OCIS-storage.md

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion web/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ ci-go-generate: pull-assets # CI runs ci-node-generate automatically before this
.PHONY: ci-node-generate
ci-node-generate:

WEB_ASSETS_VERSION = v3.2.0
WEB_ASSETS_VERSION = v3.3.0

.PHONY: pull-assets
pull-assets:
Expand Down
166 changes: 112 additions & 54 deletions web/pkg/assets/embed.go

Large diffs are not rendered by default.

0 comments on commit 216be05

Please sign in to comment.