From ec7d9a244d2a28c6ac7e6b37dc435ffdfb238aca Mon Sep 17 00:00:00 2001
From: JanAckermann <jackermann@owncloud.com>
Date: Thu, 7 Apr 2022 09:21:24 +0200
Subject: [PATCH] Fix tests

---
 .../Users/SideBar/DetailsPanel.spec.js        |  5 +++-
 .../unit/components/Users/UsersList.spec.js   |  2 +-
 .../tests/unit/views/Users.spec.js            | 29 ++++++++++---------
 .../ApplicationsMenu.spec.js.snap             | 10 +++----
 4 files changed, 26 insertions(+), 20 deletions(-)

diff --git a/packages/web-app-user-management/tests/unit/components/Users/SideBar/DetailsPanel.spec.js b/packages/web-app-user-management/tests/unit/components/Users/SideBar/DetailsPanel.spec.js
index ebbf892ff0c..64f4e152520 100644
--- a/packages/web-app-user-management/tests/unit/components/Users/SideBar/DetailsPanel.spec.js
+++ b/packages/web-app-user-management/tests/unit/components/Users/SideBar/DetailsPanel.spec.js
@@ -66,7 +66,10 @@ describe('DetailsPanel', () => {
     })
     it('should be set if user role is assigned', () => {
       const wrapper = getWrapper({
-        propsData: { users: [{ id: '1', displayName: 'user' }], userRoles: { 1: 'admin' } }
+        propsData: {
+          users: [{ id: '1', displayName: 'user' }],
+          userRoles: { 1: { displayName: 'admin' } }
+        }
       })
       expect(wrapper.vm.userRole).toEqual('admin')
     })
diff --git a/packages/web-app-user-management/tests/unit/components/Users/UsersList.spec.js b/packages/web-app-user-management/tests/unit/components/Users/UsersList.spec.js
index a89f40232ce..a4935d6f977 100644
--- a/packages/web-app-user-management/tests/unit/components/Users/UsersList.spec.js
+++ b/packages/web-app-user-management/tests/unit/components/Users/UsersList.spec.js
@@ -33,7 +33,7 @@ describe('UsersList', () => {
     it('should return user role if record is set', () => {
       const wrapper = getWrapper({
         propsData: {
-          userRoles: { 1: 'admin' }
+          userRoles: { 1: { displayName: 'admin' } }
         }
       })
       expect(wrapper.vm.getUserRole({ id: 1 })).toEqual('admin')
diff --git a/packages/web-app-user-management/tests/unit/views/Users.spec.js b/packages/web-app-user-management/tests/unit/views/Users.spec.js
index 2e2f1884f16..9c42ec1bbed 100644
--- a/packages/web-app-user-management/tests/unit/views/Users.spec.js
+++ b/packages/web-app-user-management/tests/unit/views/Users.spec.js
@@ -97,14 +97,14 @@ describe('Users view', () => {
       const wrapper = getMountedWrapper({
         mocks: {
           users: [user],
-          userAssignments: [
-            [
+          userAssignments: {
+            1: [
               {
                 accountUuid: '1',
                 roleId: '1'
               }
             ]
-          ],
+          },
           roles: [
             {
               displayName: 'admin',
@@ -113,7 +113,10 @@ describe('Users view', () => {
           ]
         }
       })
-      expect(wrapper.vm.userRoles[user.id]).toEqual('admin')
+      expect(wrapper.vm.userRoles[user.id]).toEqual({
+        displayName: 'admin',
+        id: '1'
+      })
     })
     it('should not contain user role if userAssignments is empty', () => {
       const user = { id: '1' }
@@ -127,14 +130,14 @@ describe('Users view', () => {
       const wrapper = getMountedWrapper({
         mocks: {
           users: [user],
-          userAssignments: [
-            [
+          userAssignments: {
+            2: [
               {
                 accountUuid: '2',
                 roleId: '1'
               }
             ]
-          ],
+          },
           roles: [
             {
               displayName: 'admin',
@@ -150,14 +153,14 @@ describe('Users view', () => {
       const wrapper = getMountedWrapper({
         mocks: {
           users: [user],
-          userAssignments: [
-            [
+          userAssignments: {
+            1: [
               {
                 accountUuid: '1',
                 roleId: '1'
               }
             ]
-          ],
+          },
           roles: [
             {
               displayName: 'admin',
@@ -173,13 +176,13 @@ describe('Users view', () => {
       const wrapper = getMountedWrapper({
         mocks: {
           users: [user],
-          userAssignments: [
-            [
+          userAssignments: {
+            1: [
               {
                 accountUuid: '1'
               }
             ]
-          ],
+          },
           roles: [
             {
               displayName: 'admin',
diff --git a/packages/web-runtime/tests/unit/components/Topbar/__snapshots__/ApplicationsMenu.spec.js.snap b/packages/web-runtime/tests/unit/components/Topbar/__snapshots__/ApplicationsMenu.spec.js.snap
index 1cd53adf2af..63da2736dc9 100644
--- a/packages/web-runtime/tests/unit/components/Topbar/__snapshots__/ApplicationsMenu.spec.js.snap
+++ b/packages/web-runtime/tests/unit/components/Topbar/__snapshots__/ApplicationsMenu.spec.js.snap
@@ -2,18 +2,18 @@
 
 exports[`ApplicationsMenu component should render navigation with button and menu items in dropdown 1`] = `
 <nav id="applications-menu" aria-label="Main navigation" class="oc-flex oc-flex-middle">
-  <oc-button-stub type="button" size="medium" arialabel="Application Switcher" submit="button" variation="inverse" appearance="raw" justifycontent="center" gapsize="medium" id="_appSwitcherButton" class="oc-topbar-menu-burger">
-    <oc-icon-stub name="grid" filltype="fill" accessiblelabel="" type="span" size="large" variation="passive" color="" class="oc-flex"></oc-icon-stub>
+  <oc-button-stub id="_appSwitcherButton" appearance="raw" variation="inverse" aria-label="Application Switcher" class="oc-topbar-menu-burger">
+    <oc-icon-stub name="grid" size="large" class="oc-flex"></oc-icon-stub>
   </oc-button-stub>
-  <oc-drop-stub dropid="app-switcher-dropdown" toggle="#_appSwitcherButton" position="bottom-start" mode="click" closeonclick="true" paddingsize="small">
+  <oc-drop-stub drop-id="app-switcher-dropdown" toggle="#_appSwitcherButton" mode="click" padding-size="small" close-on-click="">
     <oc-list-stub class="applications-list">
       <li>
-        <oc-button-stub type="router-link" size="medium" to="/files" submit="button" variation="passive" appearance="raw" justifycontent="center" gapsize="medium" class=""><span class="icon-box"><oc-icon-stub name="folder" filltype="fill" accessiblelabel="" type="span" size="medium" variation="passive" color=""></oc-icon-stub></span> <span>Files</span>
+        <oc-button-stub type="router-link" to="/files" appearance="raw" variation="passive" class=""><span class="icon-box"><oc-icon-stub name="folder"></oc-icon-stub></span> <span>Files</span>
           <!---->
         </oc-button-stub>
       </li>
       <li>
-        <oc-button-stub type="a" size="medium" href="http://some.org" submit="button" variation="passive" appearance="raw" justifycontent="center" gapsize="medium" target="_blank" class=""><span class="icon-box"><oc-icon-stub name="some-icon" filltype="fill" accessiblelabel="" type="span" size="medium" variation="passive" color=""></oc-icon-stub></span> <span>External</span>
+        <oc-button-stub type="a" target="_blank" href="http://some.org" appearance="raw" variation="passive" class=""><span class="icon-box"><oc-icon-stub name="some-icon"></oc-icon-stub></span> <span>External</span>
           <!---->
         </oc-button-stub>
       </li>