From 0ec1bd7782ace9022ef9ff49cc833676f85359d4 Mon Sep 17 00:00:00 2001 From: Phil Davis Date: Mon, 25 Jan 2021 18:00:53 +0545 Subject: [PATCH 1/3] Pin behat/gherkin because of Gherkin issue 187 --- vendor-bin/behat/composer.json | 1 + 1 file changed, 1 insertion(+) diff --git a/vendor-bin/behat/composer.json b/vendor-bin/behat/composer.json index 81a1f37cb3..5668e6dd07 100644 --- a/vendor-bin/behat/composer.json +++ b/vendor-bin/behat/composer.json @@ -6,6 +6,7 @@ }, "require": { "behat/behat": "^3.8", + "behat/gherkin": "4.6.2", "behat/mink": "1.7.1", "behat/mink-extension": "^2.3", "behat/mink-selenium2-driver": "^1.4", From b8ea851fa91c96bef13a9eea3518cd8d451956f6 Mon Sep 17 00:00:00 2001 From: Phil Davis Date: Mon, 25 Jan 2021 18:53:47 +0545 Subject: [PATCH 2/3] Bump CORE_COMMITID to pin Behat/Gherkin v4.6.2 --- .drone.env | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.drone.env b/.drone.env index 798af17367..a65e073144 100644 --- a/.drone.env +++ b/.drone.env @@ -1,5 +1,5 @@ # The test runner source for API tests -CORE_COMMITID=ec99c594e90b83c8a3778834e31a5714df630ffc +CORE_COMMITID=1628f6156c64717aa23b1e48dd8e51154f68cde8 CORE_BRANCH=master # The test runner source for UI tests From b3636eed8b0ed2cb835d214bba6a1bccaeb0d9ba Mon Sep 17 00:00:00 2001 From: Phil Davis Date: Mon, 25 Jan 2021 19:55:34 +0545 Subject: [PATCH 3/3] Adjust expected-failures --- .../expected-failures-API-on-OCIS-storage.md | 20 ++++++++----------- ...pected-failures-API-on-OWNCLOUD-storage.md | 20 ++++++++----------- 2 files changed, 16 insertions(+), 24 deletions(-) diff --git a/tests/acceptance/expected-failures-API-on-OCIS-storage.md b/tests/acceptance/expected-failures-API-on-OCIS-storage.md index 4f70ad8292..d549b795de 100644 --- a/tests/acceptance/expected-failures-API-on-OCIS-storage.md +++ b/tests/acceptance/expected-failures-API-on-OCIS-storage.md @@ -2103,18 +2103,6 @@ - [apiWebdavLocks3/independentLocks.feature:88](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavLocks3/independentLocks.feature#L88) - [apiWebdavLocks3/independentLocks.feature:89](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavLocks3/independentLocks.feature#L89) - [apiWebdavLocks3/independentLocks.feature:90](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavLocks3/independentLocks.feature#L90) -- [apiWebdavLocks3/independentLocks.feature:109](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavLocks3/independentLocks.feature#L109) -- [apiWebdavLocks3/independentLocks.feature:110](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavLocks3/independentLocks.feature#L110) -- [apiWebdavLocks3/independentLocks.feature:111](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavLocks3/independentLocks.feature#L111) -- [apiWebdavLocks3/independentLocks.feature:112](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavLocks3/independentLocks.feature#L112) -- [apiWebdavLocks3/independentLocks.feature:134](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavLocks3/independentLocks.feature#L134) -- [apiWebdavLocks3/independentLocks.feature:135](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavLocks3/independentLocks.feature#L135) -- [apiWebdavLocks3/independentLocks.feature:136](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavLocks3/independentLocks.feature#L136) -- [apiWebdavLocks3/independentLocks.feature:137](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavLocks3/independentLocks.feature#L137) -- [apiWebdavLocks3/independentLocks.feature:157](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavLocks3/independentLocks.feature#L157) -- [apiWebdavLocks3/independentLocks.feature:158](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavLocks3/independentLocks.feature#L158) -- [apiWebdavLocks3/independentLocks.feature:159](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavLocks3/independentLocks.feature#L159) -- [apiWebdavLocks3/independentLocks.feature:160](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavLocks3/independentLocks.feature#L160) - [apiWebdavLocks3/independentLocksShareToShares.feature:27](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavLocks3/independentLocksShareToShares.feature#L27) - [apiWebdavLocks3/independentLocksShareToShares.feature:28](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavLocks3/independentLocksShareToShares.feature#L28) - [apiWebdavLocks3/independentLocksShareToShares.feature:29](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavLocks3/independentLocksShareToShares.feature#L29) @@ -2139,6 +2127,14 @@ - [apiWebdavLocksUnlock/unlock.feature:48](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavLocksUnlock/unlock.feature#L48) - [apiWebdavLocksUnlock/unlock.feature:60](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavLocksUnlock/unlock.feature#L60) - [apiWebdavLocksUnlock/unlock.feature:61](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavLocksUnlock/unlock.feature#L61) +- [apiWebdavLocksUnlock/unlock.feature:85](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavLocksUnlock/unlock.feature#L85) +- [apiWebdavLocksUnlock/unlock.feature:86](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavLocksUnlock/unlock.feature#L86) +- [apiWebdavLocksUnlock/unlock.feature:87](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavLocksUnlock/unlock.feature#L87) +- [apiWebdavLocksUnlock/unlock.feature:88](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavLocksUnlock/unlock.feature#L88) +- [apiWebdavLocksUnlock/unlock.feature:110](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavLocksUnlock/unlock.feature#L110) +- [apiWebdavLocksUnlock/unlock.feature:111](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavLocksUnlock/unlock.feature#L111) +- [apiWebdavLocksUnlock/unlock.feature:112](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavLocksUnlock/unlock.feature#L112) +- [apiWebdavLocksUnlock/unlock.feature:113](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavLocksUnlock/unlock.feature#L113) - [apiWebdavLocksUnlock/unlockSharingToRoot.feature:20](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavLocksUnlock/unlockSharingToRoot.feature#L20) - [apiWebdavLocksUnlock/unlockSharingToRoot.feature:21](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavLocksUnlock/unlockSharingToRoot.feature#L21) - [apiWebdavLocksUnlock/unlockSharingToRoot.feature:22](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavLocksUnlock/unlockSharingToRoot.feature#L22) diff --git a/tests/acceptance/expected-failures-API-on-OWNCLOUD-storage.md b/tests/acceptance/expected-failures-API-on-OWNCLOUD-storage.md index 9b4aa7cffc..75f123f3fd 100644 --- a/tests/acceptance/expected-failures-API-on-OWNCLOUD-storage.md +++ b/tests/acceptance/expected-failures-API-on-OWNCLOUD-storage.md @@ -2244,18 +2244,6 @@ restoring a file doesn't changes the etags of the parents - [apiWebdavLocks3/independentLocks.feature:88](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavLocks3/independentLocks.feature#L88) - [apiWebdavLocks3/independentLocks.feature:89](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavLocks3/independentLocks.feature#L89) - [apiWebdavLocks3/independentLocks.feature:90](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavLocks3/independentLocks.feature#L90) -- [apiWebdavLocks3/independentLocks.feature:109](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavLocks3/independentLocks.feature#L109) -- [apiWebdavLocks3/independentLocks.feature:110](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavLocks3/independentLocks.feature#L110) -- [apiWebdavLocks3/independentLocks.feature:111](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavLocks3/independentLocks.feature#L111) -- [apiWebdavLocks3/independentLocks.feature:112](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavLocks3/independentLocks.feature#L112) -- [apiWebdavLocks3/independentLocks.feature:134](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavLocks3/independentLocks.feature#L134) -- [apiWebdavLocks3/independentLocks.feature:135](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavLocks3/independentLocks.feature#L135) -- [apiWebdavLocks3/independentLocks.feature:136](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavLocks3/independentLocks.feature#L136) -- [apiWebdavLocks3/independentLocks.feature:137](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavLocks3/independentLocks.feature#L137) -- [apiWebdavLocks3/independentLocks.feature:157](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavLocks3/independentLocks.feature#L157) -- [apiWebdavLocks3/independentLocks.feature:158](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavLocks3/independentLocks.feature#L158) -- [apiWebdavLocks3/independentLocks.feature:159](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavLocks3/independentLocks.feature#L159) -- [apiWebdavLocks3/independentLocks.feature:160](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavLocks3/independentLocks.feature#L160) - [apiWebdavLocks3/independentLocksShareToShares.feature:27](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavLocks3/independentLocksShareToShares.feature#L27) - [apiWebdavLocks3/independentLocksShareToShares.feature:28](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavLocks3/independentLocksShareToShares.feature#L28) - [apiWebdavLocks3/independentLocksShareToShares.feature:29](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavLocks3/independentLocksShareToShares.feature#L29) @@ -2280,6 +2268,14 @@ restoring a file doesn't changes the etags of the parents - [apiWebdavLocksUnlock/unlock.feature:48](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavLocksUnlock/unlock.feature#L48) - [apiWebdavLocksUnlock/unlock.feature:60](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavLocksUnlock/unlock.feature#L60) - [apiWebdavLocksUnlock/unlock.feature:61](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavLocksUnlock/unlock.feature#L61) +- [apiWebdavLocksUnlock/unlock.feature:85](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavLocksUnlock/unlock.feature#L85) +- [apiWebdavLocksUnlock/unlock.feature:86](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavLocksUnlock/unlock.feature#L86) +- [apiWebdavLocksUnlock/unlock.feature:87](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavLocksUnlock/unlock.feature#L87) +- [apiWebdavLocksUnlock/unlock.feature:88](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavLocksUnlock/unlock.feature#L88) +- [apiWebdavLocksUnlock/unlock.feature:110](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavLocksUnlock/unlock.feature#L110) +- [apiWebdavLocksUnlock/unlock.feature:111](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavLocksUnlock/unlock.feature#L111) +- [apiWebdavLocksUnlock/unlock.feature:112](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavLocksUnlock/unlock.feature#L112) +- [apiWebdavLocksUnlock/unlock.feature:113](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavLocksUnlock/unlock.feature#L113) - [apiWebdavLocksUnlock/unlockSharingToRoot.feature:20](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavLocksUnlock/unlockSharingToRoot.feature#L20) - [apiWebdavLocksUnlock/unlockSharingToRoot.feature:21](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavLocksUnlock/unlockSharingToRoot.feature#L21) - [apiWebdavLocksUnlock/unlockSharingToRoot.feature:22](https://github.com/owncloud/core/blob/master/tests/acceptance/features/apiWebdavLocksUnlock/unlockSharingToRoot.feature#L22)