Update web to v4.2.0, bump JS deps, update expected failures

owncloud · Sep 14, 2021 · 78fe6e9 · 78fe6e9
1 parent 0e9e635
commit 78fe6e9
Show file tree

Hide file tree

Showing 16 changed files with 1,142 additions and 606 deletions.
diff --git a/.drone.env b/.drone.env
@@ -3,5 +3,5 @@ CORE_COMMITID=370fd807e464dcc5cb9619a8890107424254dfa6
 CORE_BRANCH=master
 
 # The test runner source for UI tests
-WEB_COMMITID=e44bf0c76d1811339ac58941130a411f420bd302
+WEB_COMMITID=0e5a4b4990fc0edb69013122df42785774883e79
 WEB_BRANCH=master
diff --git a/accounts/package.json b/accounts/package.json
@@ -17,10 +17,10 @@
     "watch": "rollup -c -w",
     "test": "echo 'Not implemented'",
     "generate-api": "node node_modules/swagger-vue-generator/bin/generate-api.js --package-version v0 --source pkg/proto/v0/accounts.swagger.json --moduleName accounts --destination ui/client/accounts/index.js",
-    "acceptance-tests": "cucumber-js --retry 1 --require-module @babel/register --require-module @babel/polyfill --require ${TEST_INFRA_DIRECTORY}/acceptance/setup.js --require ui/tests/acceptance/stepDefinitions --require ${TEST_INFRA_DIRECTORY}/acceptance/stepDefinitions --format node_modules/cucumber-pretty -t \"${TEST_TAGS:-not @skip and not @skipOnOC10}\""
+    "acceptance-tests": "cucumber-js --retry 1 --require-module @babel/register --require-module @babel/polyfill --require ${TEST_INFRA_DIRECTORY}/acceptance/setup.js --require ui/tests/acceptance/stepDefinitions --require ${TEST_INFRA_DIRECTORY}/acceptance/stepDefinitions --format @cucumber/pretty-formatter -t \"${TEST_TAGS:-not @skip and not @skipOnOC10}\""
   },
   "devDependencies": {
-    "@babel/core": "^7.15.0",
+    "@babel/core": "^7.15.5",
     "@babel/plugin-proposal-class-properties": "^7.13.0",
     "@babel/plugin-proposal-export-default-from": "^7.7.4",
     "@babel/plugin-proposal-object-rest-spread": "^7.7.7",
@@ -29,16 +29,16 @@
     "@babel/polyfill": "^7.10.1",
     "@babel/preset-env": "^7.13.12",
     "@babel/register": "^7.14.5",
+    "@cucumber/cucumber": "^7.3.1",
+    "@cucumber/pretty-formatter": "^1.0.0-alpha.1",
     "@erquhart/rollup-plugin-node-builtins": "^2.1.5",
     "@rollup/plugin-commonjs": "^17.1.0",
     "@rollup/plugin-json": "^4.0.1",
     "@rollup/plugin-replace": "^2.3.0",
     "archiver": "^5.3.0",
-    "axios": "^0.21.1",
-    "core-js": "^3.16.1",
+    "axios": "^0.21.4",
+    "core-js": "^3.17.3",
     "cross-env": "^7.0.3",
-    "cucumber": "^6.0.5",
-    "cucumber-pretty": ">=6.0.0",
     "debounce": "^1.2.1",
     "easygettext": "^2.17.0",
     "eslint": "7.24.0",
@@ -52,7 +52,7 @@
     "join-path": "^1.1.1",
     "ldapjs": "^2.2.3",
     "nightwatch": "1.5.1",
-    "nightwatch-api": "3.0.1",
+    "nightwatch-api": "3.0.2",
     "nightwatch-vrt": "^0.2.10",
     "node-fetch": "^2.6.1",
     "qs": "^6.10.1",

diff --git a/accounts/pkg/assets/embed.go b/accounts/pkg/assets/embed.go
diff --git a/accounts/ui/tests/acceptance/stepDefinitions/accountsContext.js b/accounts/ui/tests/acceptance/stepDefinitions/accountsContext.js
@@ -1,6 +1,6 @@
 const assert = require('assert')
 const { client } = require('nightwatch-api')
-const { Given, When, Then } = require('cucumber')
+const { Given, When, Then } = require('@cucumber/cucumber')
 
 When('the user browses to the accounts page', function () {
   return client.page.accountsPage().navigateAndWaitUntilMounted()

diff --git a/accounts/yarn.lock b/accounts/yarn.lock
diff --git a/...og/unreleased/remove-onlyoffice-extension → ...unreleased/remove-onlyoffice-extension.md b/...og/unreleased/remove-onlyoffice-extension → ...unreleased/remove-onlyoffice-extension.md
diff --git a/changelog/unreleased/update-web-4.2.0.md b/changelog/unreleased/update-web-4.2.0.md
@@ -0,0 +1,8 @@
+Change: Update ownCloud Web to v4.2.0
+
+Tags: web
+
+We updated ownCloud Web to v4.2.0. Please refer to the changelog (linked) for details on the web release.
+
+https://github.com/owncloud/ocis/pull/2501
+https://github.com/owncloud/web/releases/tag/v4.2.0
diff --git a/idp/package.json b/idp/package.json
@@ -4,7 +4,7 @@
   "private": true,
   "homepage": ".",
   "dependencies": {
-    "@babel/core": "7.13.10",
+    "@babel/core": "^7.15.5",
     "@material-ui/core": "^4.8.0",
     "@material-ui/icons": "^4.5.0",
     "@svgr/webpack": "5.5.0",

diff --git a/idp/yarn.lock b/idp/yarn.lock
diff --git a/settings/package.json b/settings/package.json
@@ -17,10 +17,10 @@
     "watch": "rollup -c -w",
     "test": "echo 'Not implemented'",
     "generate-api": "node node_modules/swagger-vue-generator/bin/generate-api.js --package-version v0 --source pkg/proto/v0/settings.swagger.json --moduleName settings --destination ui/client/settings/index.js",
-    "acceptance-tests": "cucumber-js --retry 1 --require-module @babel/register --require-module @babel/polyfill --require ${TEST_INFRA_DIRECTORY}/acceptance/setup.js --require ui/tests/acceptance/stepDefinitions --require ${TEST_INFRA_DIRECTORY}/acceptance/stepDefinitions --format node_modules/cucumber-pretty -t \"${TEST_TAGS:-not @skip and not @skipOnOC10}\""
+    "acceptance-tests": "cucumber-js --retry 1 --require-module @babel/register --require-module @babel/polyfill --require ${TEST_INFRA_DIRECTORY}/acceptance/setup.js --require ui/tests/acceptance/stepDefinitions --require ${TEST_INFRA_DIRECTORY}/acceptance/stepDefinitions --format @cucumber/pretty-formatter -t \"${TEST_TAGS:-not @skip and not @skipOnOC10}\""
   },
   "devDependencies": {
-    "@babel/core": "^7.13.10",
+    "@babel/core": "^7.15.5",
     "@babel/plugin-proposal-class-properties": "^7.7.4",
     "@babel/plugin-proposal-export-default-from": "^7.7.4",
     "@babel/plugin-proposal-object-rest-spread": "^7.7.7",
@@ -29,16 +29,16 @@
     "@babel/polyfill": "^7.10.1",
     "@babel/preset-env": "^7.13.12",
     "@babel/register": "^7.14.5",
+    "@cucumber/cucumber": "^7.3.1",
+    "@cucumber/pretty-formatter": "^1.0.0-alpha.1",
     "@erquhart/rollup-plugin-node-builtins": "^2.1.5",
     "@rollup/plugin-commonjs": "^17.1.0",
     "@rollup/plugin-json": "^4.0.1",
     "@rollup/plugin-replace": "^2.4.2",
     "archiver": "^5.3.0",
-    "axios": "^0.21.1",
-    "core-js": "3.9.1",
+    "axios": "^0.21.4",
+    "core-js": "^3.17.3",
     "cross-env": "^7.0.3",
-    "cucumber": "^6.0.5",
-    "cucumber-pretty": ">=6.0.0",
     "debounce": "^1.2.1",
     "easygettext": "^2.7.0",
     "eslint": "7.22.0",
@@ -53,7 +53,7 @@
     "ldapjs": "^2.2.4",
     "lodash-es": "^4.17.21",
     "nightwatch": "1.5.1",
-    "nightwatch-api": "3.0.1",
+    "nightwatch-api": "3.0.2",
     "nightwatch-vrt": "^0.2.10",
     "node-fetch": "^2.6.1",
     "qs": "^6.10.1",

diff --git a/settings/pkg/assets/embed.go b/settings/pkg/assets/embed.go
diff --git a/settings/ui/tests/acceptance/stepDefinitions/settingsContext.js b/settings/ui/tests/acceptance/stepDefinitions/settingsContext.js
@@ -2,7 +2,7 @@ const assert = require('assert')
 const path = require('path')
 const fs = require('fs-extra')
 const { client } = require('nightwatch-api')
-const { Given, When, Then, After, Before } = require('cucumber')
+const { Given, When, Then } = require('@cucumber/cucumber')
 const languageHelper = require('../helpers/language')
 
 const initialLanguageAssignments = []