Merge pull request #6474 from owncloud/bump-commitid-20220224

[tests-only][full-ci] Bump oCIS commit id for the tests

.drone.env

@@ -1,3 +1,3 @@
 # The version of OCIS to use in pipelines that test against OCIS
-OCIS_COMMITID=c2c7478bf494ef700b76453f262ff8747dbc159c
+OCIS_COMMITID=f612ca788ea5ca5991b2b976e4ac6ae634ead409
 OCIS_BRANCH=master

packages/web-runtime/src/components/SidebarNav/SidebarNavItem.vue

@@ -8,6 +8,7 @@
       :class="['oc-sidebar-nav-item-link', { active: active }]"
       :to="target"
       :data-nav-id="index"
+      :data-nav-name="navName"
     >
       <oc-icon :name="icon" :fill-type="fillType" />
       <span class="oc-ml-m text" :class="{ 'text-invisible': collapsed }" v-text="name" />
@@ -17,6 +18,7 @@
 </template>
 <script>
 import SidebarNavItemHighlight from './SidebarNavItemHighlight.vue'
+import get from 'lodash-es/get'
 
 export default {
   components: {
@@ -57,6 +59,9 @@ export default {
     }
   },
   computed: {
+    navName() {
+      return get(this.$router?.resolve(this.target), 'route.name')
+    },
     toolTip() {
       const value = this.collapsed
         ? this.$gettextInterpolate(this.$gettext('Navigate to %{ pageName } page'), {

tests/acceptance/expected-failures-with-ocis-server-ocis-storage.md

@@ -490,11 +490,15 @@ Other free text and markdown formatting can be used elsewhere in the document if
 -   [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)
 
-### [shares are not listed with full paths](https://github.com/owncloud/ocis/issues/2462)
--   [webUISharingPublicBasic/publicLinkCreate.feature:88](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingPublicBasic/publicLinkCreate.feature#L88)
-
 ### [web config update is not properly reflected after the ocis start](https://github.com/owncloud/ocis/issues/2944)
 -   [webUIFiles/breadcrumb.feature:50](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIFiles/breadcrumb.feature#L50)
 
 ### [empty subfolder inside a folder to be uploaded is not created on the server](https://github.com/owncloud/web/issues/6348)
 -   [webUIUpload/upload.feature:42](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUIUpload/upload.feature#L42)
+
+### [Creating public link share still has # in the link with the latest oCIS server and the link doesn't work.](https://github.com/owncloud/web/issues/6478)
+-   [webUISharingPublicManagement/shareByPublicLink.feature:78](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUISharingPublicManagement/shareByPublicLink.feature#L78)
+
+### [Logging out doesn't work with the latest oCIS server](https://github.com/owncloud/web/issues/6479)
+-   [webUILogin/openidLogin.feature:22](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUILogin/openidLogin.feature#L22)
+-   [webUILogin/openidLogin.feature:29](https://github.com/owncloud/web/blob/master/tests/acceptance/features/webUILogin/openidLogin.feature#L29)

tests/acceptance/features/webUILogin/oauthLogin.feature

@@ -11,7 +11,7 @@ Feature: login users
   Background:
     Given user "Alice" has been created with default attributes and without skeleton files in the server
 
-  @ocisSmokeTest
+
   Scenario: admin login
     Given the user has browsed to the login page
     When the user logs in with username "admin" and password "admin" using the webUI

tests/acceptance/features/webUIUserJourney/journey1.feature

@@ -5,7 +5,6 @@ Feature: User Journey 1
 
   Background:
     Given user "Alice" has been created with default attributes and without skeleton files in the server
-    And user "Brian" has been created with default attributes and without skeleton files in the server
 
   @journey
   Scenario: simple upload of a file that does not exist before
@@ -17,11 +16,12 @@ Feature: User Journey 1
     When the user browses to the files page
     And the user downloads file "new-lorem.txt" using the webUI
     Then no message should be displayed on the webUI
-    And the user renames file "new-lorem.txt" to "new-lorem2.txt" using the webUI
-    And file "new-lorem2.txt" should be listed on the webUI
-    And the user deletes file "new-lorem2.txt" using the webUI
+    When the user renames file "new-lorem.txt" to "new-lorem2.txt" using the webUI
+    Then file "new-lorem2.txt" should be listed on the webUI
+    When the user deletes file "new-lorem2.txt" using the webUI
     And the user browses to the trashbin page
-    And file "new-lorem2.txt" should be listed on the webUI
-    And the user restores file "new-lorem2.txt" from the trashbin using the webUI
-    And the user browses to the files page
-    And file "new-lorem2.txt" should be listed on the webUI
+    Then file "new-lorem2.txt" should be listed on the webUI
+    When the user restores file "new-lorem2.txt" from the trashbin using the webUI
+    Then there should be no resources listed on the webUI
+    When the user browses to the files page
+    Then file "new-lorem2.txt" should be listed on the webUI

tests/acceptance/nightwatch.conf.js

@@ -53,7 +53,8 @@ const config = {
   custom_assertions_path: ['node_modules/nightwatch-vrt/assertions'],
   test_settings: {
     default: {
-      launch_url: LOCAL_LAUNCH_URL,
+      // ocis doesn't have '#' in the url path anymore
+      launch_url: RUN_ON_OCIS ? LOCAL_LAUNCH_URL : `${LOCAL_LAUNCH_URL}/#`,
       globals: {
         waitForConditionTimeout: 10000,
         waitForNegativeConditionTimeout: 300,

tests/acceptance/pageObjects/accountPage.js

@@ -2,7 +2,7 @@ const { join } = require('../helpers/path')
 
 module.exports = {
   url: function () {
-    return join(this.api.launchUrl, '/#/account/')
+    return join(this.api.launchUrl, '/account/')
   },
   commands: {
     /**

tests/acceptance/pageObjects/favoritesPage.js

@@ -2,7 +2,7 @@ const { join } = require('../helpers/path')
 
 module.exports = {
   url: function () {
-    return join(this.api.launchUrl, '/#/files/favorites/')
+    return join(this.api.launchUrl, '/files/favorites/')
   },
   commands: {
     /**

tests/acceptance/pageObjects/filesDropPage.js

@@ -2,7 +2,7 @@ const { join } = require('../helpers/path')
 
 module.exports = {
   url: function () {
-    return join(this.api.launchUrl, '/#/files/public/drop/')
+    return join(this.api.launchUrl, '/files/public/drop/')
   },
   commands: {
     /**

tests/acceptance/pageObjects/loginErrorPage.js

@@ -2,7 +2,7 @@ const { join } = require('../helpers/path')
 
 module.exports = {
   url: function () {
-    return join(this.api.launchUrl, '/#/access-denied')
+    return join(this.api.launchUrl, '/access-denied')
   },
   elements: {
     body: 'body',

tests/acceptance/pageObjects/loginPage.js

@@ -2,7 +2,7 @@ const { join } = require('../helpers/path')
 
 module.exports = {
   url: function () {
-    return join(this.api.launchUrl, '/#/login')
+    return join(this.api.launchUrl, '/login')
   },
   elements: {
     body: 'body',

tests/acceptance/pageObjects/personalPage.js

@@ -5,7 +5,7 @@ const { client } = require('nightwatch-api')
 
 module.exports = {
   url: function () {
-    return join(this.api.launchUrl, '#/files/list/all')
+    return join(this.api.launchUrl, '/files/list/all')
   },
   commands: {
     /**

tests/acceptance/pageObjects/publicLinkFilesPage.js

@@ -2,7 +2,7 @@ const { join } = require('../helpers/path')
 
 module.exports = {
   url: function () {
-    return join(this.api.launchUrl, '/#/files/ops/resolver/public-link/')
+    return join(this.api.launchUrl, '/files/ops/resolver/public-link/')
   },
   commands: {
     /**
@@ -15,7 +15,7 @@ module.exports = {
       )
     },
     navigateAndWaitForPasswordPage: function (token) {
-      this.navigate(join(this.api.launchUrl, '/#/files/ops/resolver/public-link', token))
+      this.navigate(join(this.api.launchUrl, '/files/ops/resolver/public-link', token))
       return this.page.publicLinkPasswordPage().waitForElementPresent('@passwordInput')
     },
     /**

tests/acceptance/pageObjects/sharedViaLinkPage.js

@@ -2,7 +2,7 @@ const { join } = require('../helpers/path')
 
 module.exports = {
   url: function () {
-    return join(this.api.launchUrl, '/#/files/shares/via-link/')
+    return join(this.api.launchUrl, '/files/shares/via-link/')
   },
   commands: {
     /**

tests/acceptance/pageObjects/sharedWithMePage.js

@@ -4,7 +4,7 @@ const { SHARE_STATE } = require('../helpers/sharingHelper')
 
 module.exports = {
   url: function (viewMode) {
-    return join(this.api.launchUrl, '/#/files/shares/with-me/?view-mode=' + viewMode)
+    return join(this.api.launchUrl, '/files/shares/with-me/?view-mode=' + viewMode)
   },
   commands: {
     /**

tests/acceptance/pageObjects/sharedWithOthersPage.js

@@ -2,7 +2,7 @@ const { join } = require('../helpers/path')
 
 module.exports = {
   url: function () {
-    return join(this.api.launchUrl, '/#/files/shares/with-others/')
+    return join(this.api.launchUrl, '/files/shares/with-others/')
   },
   commands: {
     /**

tests/acceptance/pageObjects/trashbinPage.js

@@ -2,7 +2,7 @@ const { join } = require('../helpers/path')
 
 module.exports = {
   url: function () {
-    return join(this.api.launchUrl, '/#/files/trash/')
+    return join(this.api.launchUrl, '/files/trash/')
   },
   commands: {
     /**

tests/acceptance/pageObjects/webPage.js

@@ -5,7 +5,7 @@ const { defaultUsers } = require('../helpers/userSettings')
 
 module.exports = {
   url: function () {
-    return join(this.api.launchUrl, '/#/')
+    return join(this.api.launchUrl, '/')
   },
   commands: {
     /**

tests/e2e/support/page/files/allFiles.ts

@@ -13,8 +13,7 @@ export class AllFilesPage {
   async navigate(): Promise<void> {
     const { page } = this.actor
 
-    const allFilesBtn = page.locator('a[href="#/files/spaces/personal/home"] .text')
-    await allFilesBtn.click()
+    await page.locator('//a[@data-nav-name="files-spaces-personal-home"]').click()
   }
 
   async createFolder({ name }: { name: string }): Promise<void> {
@@ -316,10 +315,19 @@ export class AllFilesPage {
 
     for (const user of users) {
       const userColumn = `//*[@data-testid="collaborator-user-item-${user.id}"]`
-      await page.click(`${userColumn}//button[contains(@class,"files-recipient-role-select-btn")]`)
-      await page.click(
-        `${userColumn}//ul[contains(@class,"files-recipient-role-drop-list")]//button[@id="files-recipient-role-drop-btn-${role}"]`
-      )
+
+      await Promise.all([
+        page.click(`${userColumn}//button[contains(@class,"files-recipient-role-select-btn")]`),
+        page.click(
+          `${userColumn}//ul[contains(@class,"files-recipient-role-drop-list")]//button[@id="files-recipient-role-drop-btn-${role}"]`
+        ),
+        page.waitForResponse(
+          (resp) =>
+            resp.url().includes('shares') &&
+            resp.status() === 200 &&
+            resp.request().method() === 'PUT'
+        )
+      ])
     }
     await page.goto(startUrl)
   }