sevenhill/QSfera
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #2353 from owncloud/update-web-4.0.0

Browse Source 
[full-ci] Update web to 4.0.0
This commit is contained in:
Phil Davis
2021-08-05 17:24:16 +05:45
committed by GitHub
parent 69dfdeac0d ed3a5a7f5f
commit aab73be154
8 changed files with 272 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.drone.env
+1 -1
View File
@@ -3,5 +3,5 @@ CORE_COMMITID=83a407af2fbabc6cd6bb2d6b9abfe62e85d2da64
CORE_BRANCH=master
# The test runner source for UI tests
WEB_COMMITID=e612fb45a882d6d9dc6795e662ef49d37930b8a1
WEB_COMMITID=f7d0073606a1ab91e5e7f41df7d649a241a3364e
WEB_BRANCH=master
.drone.star
+13 -6
View File
@@ -555,7 +555,7 @@ def uiTests(ctx):
"skip": False,
"earlyFail": False,
# only used if 'full-ci' is in build title
"numberOfParts": 10,
"numberOfParts": 20,
"skipExceptParts": [],
}
params = {}
@@ -582,11 +582,12 @@ def uiTests(ctx):
# For ordinary PRs, always run the "minimal" UI test pipeline
# That has its own expected-failures file, and we always want to know that it is correct,
if (ctx.build.event != "tag"):
pipelines.append(uiTestPipeline(ctx, filterTags, earlyFail))
pipelines.append(uiTestPipeline(ctx, filterTags, earlyFail, 1, 2, "ocis", "smoke"))
pipelines.append(uiTestPipeline(ctx, filterTags, earlyFail, 2, 2, "ocis", "smoke"))
return pipelines
def uiTestPipeline(ctx, filterTags, earlyFail, runPart = 1, numberOfParts = 1, storage = "ocis", accounts_hash_difficulty = 4):
def uiTestPipeline(ctx, filterTags, earlyFail, runPart = 1, numberOfParts = 1, storage = "ocis", uniqueName = "", accounts_hash_difficulty = 4):
standardFilterTags = "not @skipOnOCIS and not @skip and not @notToImplementOnOCIS and not @federated-server-needed"
if filterTags == "":
finalFilterTags = standardFilterTags
@@ -595,10 +596,16 @@ def uiTestPipeline(ctx, filterTags, earlyFail, runPart = 1, numberOfParts = 1, s
finalFilterTags = filterTags + " and " + standardFilterTags
expectedFailuresFileFilterTags = "-" + filterTags.lstrip("@")
if numberOfParts == 1:
pipelineName = "Web-Tests-ocis-%s-storage" % storage
if uniqueName == "":
uniqueNameString = ""
else:
pipelineName = "Web-Tests-ocis-%s-storage-%s" % (storage, runPart)
finalFilterTags = filterTags + " and " + standardFilterTags
uniqueNameString = "-" + uniqueName
if numberOfParts == 1:
pipelineName = "Web-Tests-ocis%s-%s-storage" % (uniqueNameString, storage)
else:
pipelineName = "Web-Tests-ocis%s-%s-storage-%s" % (uniqueNameString, storage, runPart)
return {
"kind": "pipeline",
changelog/unreleased/update-web-4.0.0.md
+8
View File
@@ -0,0 +1,8 @@
Change: Update ownCloud Web to v4.0.0
Tags: web
We updated ownCloud Web to v4.0.0. Please refer to the changelog (linked) for details on the web release.
https://github.com/owncloud/ocis/pull/2353
https://github.com/owncloud/web/releases/tag/v4.0.0
tests/acceptance/expected-failures-webUI-on-OCIS-storage.md
+9 -20
View File
@@ -40,21 +40,13 @@ Other free text and markdown formatting can be used elsewhere in the document if
- [webUIFavorites/unfavoriteFile.feature:104](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIFavorites/unfavoriteFile.feature#L104)
- [webUIFilesDetails/fileDetails.feature:42](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIFilesDetails/fileDetails.feature#L42)
- [webUIFilesDetails/fileDetails.feature:57](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIFilesDetails/fileDetails.feature#L57)
- [webUIFilesSearch/search.feature:27](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIFilesSearch/search.feature#L27)
- [webUIFilesSearch/search.feature:38](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIFilesSearch/search.feature#L38)
- [webUIFilesSearch/search.feature:50](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIFilesSearch/search.feature#L50)
- [webUIFilesSearch/search.feature:95](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIFilesSearch/search.feature#L95)
- [webUIFilesSearch/search.feature:103](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIFilesSearch/search.feature#L103)
- [webUIFilesSearch/search.feature:113](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIFilesSearch/search.feature#L113)
- [webUIFilesSearch/search.feature:122](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIFilesSearch/search.feature#L122)
- [webUIFilesSearch/search.feature:129](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIFilesSearch/search.feature#L129)
- [webUIFilesSearch/search.feature:139](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIFilesSearch/search.feature#L139)
- [webUIFilesSearch/search.feature:145](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIFilesSearch/search.feature#L145)
- [webUIFilesSearch/search.feature:151](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIFilesSearch/search.feature#L151)
- [webUIFilesSearch/search.feature:163](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIFilesSearch/search.feature#L163)
- [webUIFilesSearch/search.feature:173](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIFilesSearch/search.feature#L173)
- [webUIFilesSearch/search.feature:182](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIFilesSearch/search.feature#L182)
- [webUIRenameFiles/renameFiles.feature:249](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIRenameFiles/renameFiles.feature#L249)
- [webUIFilesSearch/search.feature:153](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIFilesSearch/search.feature#L153)
- [webUIFilesSearch/search.feature:165](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIFilesSearch/search.feature#L165)
- [webUIFilesSearch/search.feature:175](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIFilesSearch/search.feature#L175)
- [webUIRenameFiles/renameFiles.feature:252](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIRenameFiles/renameFiles.feature#L252)
- [webUISharingInternalUsersShareWithPage/shareWithUsers.feature:118](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingInternalUsersShareWithPage/shareWithUsers.feature#L118)
- [webUIResharing1/reshareUsers.feature:230](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIResharing1/reshareUsers.feature#L230)
@@ -62,10 +54,10 @@ Other free text and markdown formatting can be used elsewhere in the document if
- [webUIDeleteFilesFolders/deleteFilesFolders.feature:235](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIDeleteFilesFolders/deleteFilesFolders.feature#L235)
### [file_path property is not unique for a share created with same resource name i.e already present in sharee](https://github.com/owncloud/ocis/issues/2249)
- [webUIRenameFiles/renameFiles.feature:202](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIRenameFiles/renameFiles.feature#L202)
- [webUIRenameFiles/renameFiles.feature:205](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIRenameFiles/renameFiles.feature#L205)
### [when sharer renames the shared resource, sharee get the updated name](https://github.com/owncloud/ocis/issues/2256)
- [webUIRenameFiles/renameFiles.feature:227](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIRenameFiles/renameFiles.feature#L227)
- [webUIRenameFiles/renameFiles.feature:230](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIRenameFiles/renameFiles.feature#L230)
### [Viewer cannot share a shared resource](https://github.com/owncloud/ocis/issues/2260)
- [webUISharingInternalUsers/shareWithUsers.feature:53](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingInternalUsers/shareWithUsers.feature#L53)
@@ -154,6 +146,9 @@ Other free text and markdown formatting can be used elsewhere in the document if
- [webUIFilesActionMenu/versions.feature:59](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIFilesActionMenu/versions.feature#L59)
- [webUIFilesActionMenu/versions.feature:74](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIFilesActionMenu/versions.feature#L74)
### [Change the file content of a received shared file](https://github.com/owncloud/ocis/issues/2319)
- [webUIFilesActionMenu/versions.feature:88](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIFilesActionMenu/versions.feature#L88)
### [No occ command in ocis](https://github.com/owncloud/ocis/issues/1317)
- [webUIRestrictSharing/restrictReSharing.feature:23](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIRestrictSharing/restrictReSharing.feature#L23)
- [webUIRestrictSharing/restrictReSharing.feature:42](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIRestrictSharing/restrictReSharing.feature#L42)
@@ -543,9 +538,3 @@ Other free text and markdown formatting can be used elsewhere in the document if
### [not possible to overwrite a received shared file](https://github.com/owncloud/ocis/issues/2267)
- [webUISharingInternalGroups/shareWithGroups.feature:77](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingInternalGroups/shareWithGroups.feature#L77)
- [webUISharingInternalUsers/shareWithUsers.feature:57](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingInternalUsers/shareWithUsers.feature#L57)
### [remove tests, testing wrong behaviour](https://github.com/owncloud/ocis/issues/5595)
- [webUIRenameFiles/renameFiles.feature:129](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIRenameFiles/renameFiles.feature#129)
- [webUIRenameFiles/renameFiles.feature:128](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIRenameFiles/renameFiles.feature#128)
- [webUIRenameFolders/renameFolders.feature:118](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIRenameFolders/renameFolders.feature#118)
- [webUIRenameFolders/renameFolders.feature:117](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIRenameFolders/renameFolders.feature#117)
tests/config/drone/ocis-config.json
+2 -1
View File
@@ -13,7 +13,8 @@
"files",
"draw-io",
"markdown-editor",
"media-viewer"
"media-viewer",
"search"
],
"external_apps": [
{
web/Makefile
+1 -1
View File
@@ -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.4.1
WEB_ASSETS_VERSION = v4.0.0
.PHONY: pull-assets
pull-assets:
web/pkg/assets/embed.go
+237 -63
View File
File diff suppressed because one or more lines are too long
web/pkg/flagset/flagset.go
+1 -1
View File
@@ -184,7 +184,7 @@ func ServerWithConfig(cfg *config.Config) []cli.Flag {
},
&cli.StringSliceFlag{
Name: "web-config-app",
Value: cli.NewStringSlice("files", "media-viewer"),
Value: cli.NewStringSlice("files", "search", "media-viewer"),
Usage: `--web-config-app files [--web-config-app draw-io]`,
EnvVars: []string{"WEB_UI_CONFIG_APPS"},
},