From 2a42c5ed6bd67f18de0f4c8f0b4a859d812d3046 Mon Sep 17 00:00:00 2001 From: Angelina Filippova Date: Sun, 23 Aug 2020 19:37:40 +0300 Subject: [PATCH] Fix tests --- test/views/users/index.test.js | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/test/views/users/index.test.js b/test/views/users/index.test.js index 78ce7f06..8849340f 100644 --- a/test/views/users/index.test.js +++ b/test/views/users/index.test.js @@ -70,7 +70,7 @@ describe('Search and filter users', () => { describe('Users actions', () => { let store const htmlElement = (trChild, liChild) => - `.el-table__fixed-body-wrapper table tr:nth-child(${trChild}) ul.el-dropdown-menu li:nth-child(${liChild})` + `.el-table__fixed-body-wrapper table tr:nth-child(${trChild}) ul.el-dropdown-menu > li:nth-child(${liChild})` beforeEach(() => { store = new Vuex.Store(cloneDeep(storeConfig)) @@ -88,7 +88,7 @@ describe('Users actions', () => { const user = store.state.users.fetchedUsers[2] expect(user.roles.admin).toBe(false) expect(user.roles.moderator).toBe(false) - wrapper.find(htmlElement(3, 1)).trigger('click') + wrapper.find(htmlElement(3, 2)).trigger('click') const updatedUser = store.state.users.fetchedUsers[2] expect(updatedUser.roles.admin).toBe(true) @@ -107,7 +107,7 @@ describe('Users actions', () => { const user = store.state.users.fetchedUsers[2] expect(user.roles.admin).toBe(false) expect(user.roles.moderator).toBe(false) - wrapper.find(htmlElement(3, 2)).trigger('click') + wrapper.find(htmlElement(3, 3)).trigger('click') const updatedUser = store.state.users.fetchedUsers[2] expect(updatedUser.roles.moderator).toBe(true) @@ -124,9 +124,9 @@ describe('Users actions', () => { await flushPromises() const dropdownMenuItems = wrapper.findAll( - `.el-table__fixed-body-wrapper table tr:nth-child(2) ul.el-dropdown-menu li` + `.el-table__fixed-body-wrapper table tr:nth-child(2) ul.el-dropdown-menu > li` ) - expect(dropdownMenuItems.length).toBe(6) + expect(dropdownMenuItems.length).toBe(7) done() }) @@ -141,7 +141,7 @@ describe('Users actions', () => { const user = store.state.users.fetchedUsers[1] expect(user.deactivated).toBe(false) - wrapper.find(htmlElement(2, 1)).trigger('click') + wrapper.find(htmlElement(2, 2)).trigger('click') const updatedUser = store.state.users.fetchedUsers[1] expect(updatedUser.deactivated).toBe(true) @@ -158,7 +158,7 @@ describe('Users actions', () => { await flushPromises() expect(store.state.users.fetchedUsers[1].deactivated).toBe(false) - wrapper.find(htmlElement(2, 2)).trigger('click') + wrapper.find(htmlElement(2, 3)).trigger('click') store.dispatch('DeleteUsers', { users: [{ active: true, deactivated: false, id: '10', nickname: 'bob', local: false, external: true, roles: { admin: false, moderator: false }, tags: ['mrf_tag:sandbox'] }] }) await flushPromises() @@ -180,8 +180,8 @@ describe('Users actions', () => { expect(user1.tags.length).toBe(0) expect(user2.tags.length).toBe(1) - wrapper.find(htmlElement(1, 5)).trigger('click') - wrapper.find(htmlElement(2, 5)).trigger('click') + wrapper.find(htmlElement(1, 6)).trigger('click') + wrapper.find(htmlElement(2, 6)).trigger('click') const updatedUser1 = store.state.users.fetchedUsers[0] const updatedUser2 = store.state.users.fetchedUsers[1] @@ -201,7 +201,7 @@ describe('Users actions', () => { const user = store.state.users.fetchedUsers[1] expect(user.tags.length).toBe(1) - wrapper.find(htmlElement(2, 6)).trigger('click') + wrapper.find(htmlElement(2, 7)).trigger('click') const updatedUser = store.state.users.fetchedUsers[1] expect(updatedUser.tags.length).toBe(0) @@ -247,7 +247,7 @@ describe('Users actions', () => { expect(wrapper.vm.resetPasswordDialogOpen).toBe(false) expect(store.state.users.passwordResetToken.token).toBe('') - wrapper.find(htmlElement(1, 11)).trigger('click') + wrapper.find(htmlElement(1, 12)).trigger('click') await flushPromises() expect(wrapper.vm.resetPasswordDialogOpen).toBe(true)