diff --git a/.drone.env b/.drone.env index 695105ce3b..921653baa8 100644 --- a/.drone.env +++ b/.drone.env @@ -3,5 +3,5 @@ CORE_COMMITID=828075109e7d9b5e55db8b50d311d9a76b89d7e1 CORE_BRANCH=master # The test runner source for UI tests -WEB_COMMITID=94532551d3d89d5d3eeee016e2f0aae9fe919fce -WEB_BRANCH=master +WEB_COMMITID=95d54dcc9881697e75cdce15b8e0080017a3b224 +WEB_BRANCH=release-5.2.0 diff --git a/accounts/ui/tests/acceptance/pageobjects/accountsPage.js b/accounts/ui/tests/acceptance/pageobjects/accountsPage.js index 928e5712d8..c47851763a 100644 --- a/accounts/ui/tests/acceptance/pageobjects/accountsPage.js +++ b/accounts/ui/tests/acceptance/pageobjects/accountsPage.js @@ -2,7 +2,7 @@ const util = require('util') module.exports = { url: function () { - return this.api.launchUrl + '/#/accounts' + return this.api.launchUrl + '/accounts' }, commands: { diff --git a/go.mod b/go.mod index 0723ab5a63..79c79ece8c 100644 --- a/go.mod +++ b/go.mod @@ -22,7 +22,7 @@ require ( github.com/blevesearch/bleve/v2 v2.3.1 github.com/coreos/go-oidc/v3 v3.1.0 github.com/cs3org/go-cs3apis v0.0.0-20220126114148-64c025ccdd19 - github.com/cs3org/reva v1.16.1-0.20220301071903-1fd81b097801 + github.com/cs3org/reva v1.16.1-0.20220301130454-abc01bbfa855 github.com/disintegration/imaging v1.6.2 github.com/glauth/glauth/v2 v2.0.0-20211021011345-ef3151c28733 github.com/go-chi/chi/v5 v5.0.7 diff --git a/go.sum b/go.sum index 58b85d1be9..5d7bea06e4 100644 --- a/go.sum +++ b/go.sum @@ -342,8 +342,8 @@ github.com/crewjam/saml v0.4.5/go.mod h1:qCJQpUtZte9R1ZjUBcW8qtCNlinbO363ooNl02S github.com/cs3org/cato v0.0.0-20200828125504-e418fc54dd5e/go.mod h1:XJEZ3/EQuI3BXTp/6DUzFr850vlxq11I6satRtz0YQ4= github.com/cs3org/go-cs3apis v0.0.0-20220126114148-64c025ccdd19 h1:1jqPH58jCxvbaJ9WLIJ7W2/m622bWS6ChptzljSG6IQ= github.com/cs3org/go-cs3apis v0.0.0-20220126114148-64c025ccdd19/go.mod h1:UXha4TguuB52H14EMoSsCqDj7k8a/t7g4gVP+bgY5LY= -github.com/cs3org/reva v1.16.1-0.20220301071903-1fd81b097801 h1:FOjP9FbcvD48as7Q7TjOtnaNHlQ5va2IEIed1GWqEag= -github.com/cs3org/reva v1.16.1-0.20220301071903-1fd81b097801/go.mod h1:fdlrnZ0f+UtAdpZfLG+4LM0ZrhT5V8tPEQt6ycYm82c= +github.com/cs3org/reva v1.16.1-0.20220301130454-abc01bbfa855 h1:ygRSBDIsIyuVbZ3T4BBjkfvW0+pEZ6JWU2tZlFSGpQI= +github.com/cs3org/reva v1.16.1-0.20220301130454-abc01bbfa855/go.mod h1:fdlrnZ0f+UtAdpZfLG+4LM0ZrhT5V8tPEQt6ycYm82c= github.com/cubewise-code/go-mime v0.0.0-20200519001935-8c5762b177d8 h1:Z9lwXumT5ACSmJ7WGnFl+OMLLjpz5uR2fyz7dC255FI= github.com/cubewise-code/go-mime v0.0.0-20200519001935-8c5762b177d8/go.mod h1:4abs/jPXcmJzYoYGF91JF9Uq9s/KL5n1jvFDix8KcqY= github.com/cyberdelia/templates v0.0.0-20141128023046-ca7fffd4298c/go.mod h1:GyV+0YP4qX0UQ7r2MoYZ+AvYDp12OF5yg4q8rGnyNh4= diff --git a/settings/ui/tests/acceptance/pageobjects/settingsPage.js b/settings/ui/tests/acceptance/pageobjects/settingsPage.js index b109ff72c1..b49565c5fa 100644 --- a/settings/ui/tests/acceptance/pageobjects/settingsPage.js +++ b/settings/ui/tests/acceptance/pageobjects/settingsPage.js @@ -1,9 +1,8 @@ const { client } = require('nightwatch-api') -const util = require('util') module.exports = { url: function () { - return this.api.launchUrl + '/#/settings' + return this.api.launchUrl + '/settings' }, commands: { @@ -78,6 +77,6 @@ module.exports = { languageInput: { selector: "//label[.='Language']/..//input", locateStrategy: 'xpath' - }, + } } } diff --git a/web/Makefile b/web/Makefile index ce33ae9bec..71238f7de7 100644 --- a/web/Makefile +++ b/web/Makefile @@ -1,6 +1,6 @@ SHELL := bash NAME := web -WEB_ASSETS_VERSION = v5.1.0 +WEB_ASSETS_VERSION = v5.2.0-rc.2 include ../.make/recursion.mk