vbuglov/frontend-apps
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

updated Service of Users, updated tests

Browse Source
This commit is contained in:
SergeyVS
2024-04-03 11:58:49 +03:00
parent 2b2ad786b2
commit 327f716fe9
17 changed files with 314 additions and 644 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
users-manage/tests/views/3_organisms/Services/EditServiceCard.test.js
View File

@@ -6,6 +6,7 @@ import axios from "axios";
import {store as services} from "@/store/modules/services"
import AdapterOfServices from '@adapters/adapterOfServices/Services'
import ServiceOfServices from '@services/serviceOfServices/Services.js'
import {defaultServices, resServices} from "@mocks/services"
config.showDeprecationWarnings = false
@@ -20,39 +21,6 @@ describe("tests EditServiceCard component", () => {
},
})
const defaultServices = [
{
"id": 1,
"created_at": "2024-03-06T17:31:31.948355541+03:00",
"updated_at": "2024-03-06T17:31:31.948355541+03:00",
"deleted_at": null,
"name": "jsonplaceholder.typicode.com",
"port": 9965,
"proxy_ip": "172.25.78.153",
"site_ip": "https://jsonplaceholder.typicode.com/",
"internet_uri": "localhost",
"description": "localhost",
"is_online": true
},
]
const resServices = [
{
"id": 1,
"created_at": "2024-03-06T17:31:31.948355541+03:00",
"updated_at": "2024-03-06T17:31:31.948355541+03:00",
"deleted_at": null,
"name": "jsonplaceholder.typicode.com",
"port": 9965,
"proxy_ip": "172.25.78.153",
"device_ip": "https://jsonplaceholder.typicode.com/",
"internet_uri": "localhost",
"description": "localhost",
"is_online": true
},
]
axios.get.mockResolvedValue({
data: defaultServices,
})
@@ -71,7 +39,9 @@ describe("tests EditServiceCard component", () => {
const wrapper = mount(EditServiceCard, {
global: {
plugins: [store]
mocks: {
$store: store
}
},
props: {
serviceOfServices,
@@ -97,7 +67,9 @@ describe("tests EditServiceCard component", () => {
const wrapper = mount(EditServiceCard, {
global: {
plugins: [store]
mocks: {
$store: store
}
},
props: {
serviceOfServices,
@@ -118,7 +90,9 @@ describe("tests EditServiceCard component", () => {
const wrapper = mount(EditServiceCard, {
global: {
plugins: [store]
mocks: {
$store: store
}
},
props: {
serviceOfServices,
@@ -128,13 +102,13 @@ describe("tests EditServiceCard component", () => {
const selectedService = store.getters['services/selectedService']
expect(selectedService.is_online).toEqual(true)
expect(selectedService.isOnline).toEqual(true)
wrapper.vm.editData({key: 'is_online', value: false})
wrapper.vm.editData({key: 'isOnline', value: false})
const selectedServiceAfterEditing = store.getters['services/selectedService']
expect(selectedServiceAfterEditing.is_online).toEqual(false)
expect(selectedServiceAfterEditing.isOnline).toEqual(false)
})
test("Set isSaveData for selected service in EditServiceCard", async () => {
@@ -143,7 +117,9 @@ describe("tests EditServiceCard component", () => {
const wrapper = mount(EditServiceCard, {
global: {
plugins: [store]
mocks: {
$store: store
}
},
props: {
serviceOfServices,

62
users-manage/tests/views/3_organisms/Services/ServiceCard.test.js
View File

@@ -10,10 +10,10 @@ import ServiceOfServices from '@services/serviceOfServices/Services.js'
import AdapterOfUsers from '@adapters/adapterOfUsers/Users'
import ServiceOfUsers from '@services/serviceOfUsers/Users.js'
import CaseOfUsersInService from '@useCases/CaseOfUsersInService.js'
import {defaultServices, resServices} from "@mocks/services"
vi.mock('axios')
describe("tests Service Card component", () => {
const store = createStore({
plugins: [],
@@ -23,38 +23,6 @@ describe("tests Service Card component", () => {
},
})
const defaultServices = [
{
"id": 1,
"created_at": "2024-03-06T17:31:31.948355541+03:00",
"updated_at": "2024-03-06T17:31:31.948355541+03:00",
"deleted_at": null,
"name": "jsonplaceholder.typicode.com",
"port": 9965,
"proxy_ip": "172.25.78.153",
"site_ip": "https://jsonplaceholder.typicode.com/",
"internet_uri": "localhost",
"description": "localhost",
"is_online": true
},
]
const resServices = [
{
"id": 1,
"createdAt": "2024-03-06T17:31:31.948355541+03:00",
"updatedAt": "2024-03-06T17:31:31.948355541+03:00",
"deletedAt": null,
"name": "jsonplaceholder.typicode.com",
"port": 9965,
"proxyIp": "172.25.78.153",
"deviceIp": "https://jsonplaceholder.typicode.com/",
"internetUri": "localhost",
"description": "localhost",
"isOnline": true
},
]
axios.get.mockResolvedValue({
data: defaultServices,
})
@@ -76,7 +44,9 @@ describe("tests Service Card component", () => {
test('Service Card mounted with vuex', async () => {
const wrapper = mount(ServiceCard, {
global: {
plugins: [store]
mocks: {
$store: store
}
},
props: {
serviceOfServices,
@@ -105,7 +75,9 @@ describe("tests Service Card component", () => {
const wrapper = mount(ServiceCard, {
global: {
plugins: [store]
mocks: {
$store: store
}
},
props: {
serviceOfServices,
@@ -130,7 +102,9 @@ describe("tests Service Card component", () => {
const wrapper = mount(ServiceCard, {
global: {
plugins: [store]
mocks: {
$store: store
}
},
props: {
serviceOfServices,
@@ -160,7 +134,9 @@ describe("tests Service Card component", () => {
const wrapper = mount(ServiceCard, {
global: {
plugins: [store]
mocks: {
$store: store
}
},
props: {
serviceOfServices,
@@ -184,7 +160,9 @@ describe("tests Service Card component", () => {
const wrapper = mount(ServiceCard, {
global: {
plugins: [store]
mocks: {
$store: store
}
},
props: {
serviceOfServices,
@@ -228,7 +206,9 @@ describe("tests Service Card component", () => {
const wrapper = mount(ServiceCard, {
global: {
plugins: [store]
mocks: {
$store: store
}
},
props: {
caseOfUsersInService
@@ -261,7 +241,9 @@ describe("tests Service Card component", () => {
const wrapper = mount(ServiceCard, {
global: {
plugins: [store]
mocks: {
$store: store
}
},
props: {
serviceOfServices,

90
users-manage/tests/views/3_organisms/Services/ServicesList.test.js
View File

@@ -11,10 +11,10 @@ import ServiceOfServices from '@services/serviceOfServices/Services.js'
import AdapterOfUsers from '@adapters/adapterOfUsers/Users'
import ServiceOfUsers from '@services/serviceOfUsers/Users.js'
import CaseOfUsersInService from '@useCases/CaseOfUsersInService.js'
import {defaultServices, resServices} from "@mocks/services"
vi.mock('axios')
describe("tests Services List component", () => {
const store = createStore({
plugins: [],
@@ -24,90 +24,6 @@ describe("tests Services List component", () => {
},
})
const defaultServices = [
{
"id": 1,
"created_at": "2024-03-06T17:31:31.948355541+03:00",
"updated_at": "2024-03-06T17:31:31.948355541+03:00",
"deleted_at": null,
"name": "jsonplaceholder.typicode.com",
"port": 9965,
"proxy_ip": "172.25.78.153",
"site_ip": "https://jsonplaceholder.typicode.com/",
"internet_uri": "localhost",
"description": "localhost",
"is_online": true
},
{
"id": 2,
"created_at": "2024-03-07T11:43:51.026265459+03:00",
"updated_at": "2024-03-07T13:35:12.506368972+03:00",
"deleted_at": null,
"name": "new 2",
"port": 4548,
"proxy_ip": "172.25.78.151",
"site_ip": "172.25.78.151",
"internet_uri": "",
"description": "new site 2",
"is_online": true
},
{
"id": 3,
"created_at": "2024-03-07T11:43:51.027148541+03:00",
"updated_at": "2024-03-07T13:35:24.919273428+03:00",
"deleted_at": null,
"name": "new 3",
"port": 2527,
"proxy_ip": "172.25.78.151",
"site_ip": "172.25.78.151",
"internet_uri": "",
"description": "new site 3...",
"is_online": true
}
]
const resServices = [
{
"id": 1,
"createdAt": "2024-03-06T17:31:31.948355541+03:00",
"updatedAt": "2024-03-06T17:31:31.948355541+03:00",
"deletedAt": null,
"name": "jsonplaceholder.typicode.com",
"port": 9965,
"proxyIp": "172.25.78.153",
"deviceIp": "https://jsonplaceholder.typicode.com/",
"internetUri": "localhost",
"description": "localhost",
"isOnline": true
},
{
"id": 2,
"createdAt": "2024-03-07T11:43:51.026265459+03:00",
"updatedAt": "2024-03-07T13:35:12.506368972+03:00",
"deletedAt": null,
"name": "new 2",
"port": 4548,
"proxyIp": "172.25.78.151",
"deviceIp": "172.25.78.151",
"internetUri": "",
"description": "new site 2",
"isOnline": true
},
{
"id": 3,
"createdAt": "2024-03-07T11:43:51.027148541+03:00",
"updatedAt": "2024-03-07T13:35:24.919273428+03:00",
"deletedAt": null,
"name": "new 3",
"port": 2527,
"proxyIp": "172.25.78.151",
"deviceIp": "172.25.78.151",
"internetUri": "",
"description": "new site 3...",
"isOnline": true
}
]
axios.get.mockResolvedValue({
data: defaultServices,
})
@@ -124,7 +40,9 @@ describe("tests Services List component", () => {
test('Services List mounted with vuex', async () => {
const wrapper = mount(ServicesList, {
global: {
plugins: [store]
mocks: {
$store: store
}
},
props: {
serviceOfServices,

16
users-manage/tests/views/3_organisms/Users/UsersManager.test.js
View File

@@ -60,7 +60,9 @@ describe("tests UsersManager component", () => {
test('UsersManager mounted with vuex', async () => {
const wrapper = mount(UsersManager, {
global: {
plugins: [store],
mocks: {
$store: store
},
props: {
serviceOfUsers
}
@@ -80,7 +82,9 @@ describe("tests UsersManager component", () => {
const wrapper = mount(UsersManager, {
global: {
plugins: [store]
mocks: {
$store: store
}
},
props: {
serviceOfUsers
@@ -106,7 +110,9 @@ describe("tests UsersManager component", () => {
const wrapper = mount(UsersManager, {
global: {
plugins: [store]
mocks: {
$store: store
}
},
props: {
serviceOfUsers,
@@ -134,7 +140,9 @@ describe("tests UsersManager component", () => {
const wrapper = mount(UsersManager, {
global: {
plugins: [store]
mocks: {
$store: store
}
},
props: {
serviceOfUsers,

52
users-manage/tests/views/3_organisms/Users/UsersManagerSelection.test.js
View File

@@ -11,52 +11,10 @@ import ServiceOfServices from '@services/serviceOfServices/Services.js'
import AdapterOfUsers from '@adapters/adapterOfUsers/Users'
import ServiceOfUsers from '@services/serviceOfUsers/Users.js'
import CaseOfUsersInService from '@useCases/CaseOfUsersInService.js'
import {defaultUsers} from "@mocks/users"
vi.mock('axios')
const defaultUsers = [
{
"id": 1,
"serviceId": [1, 3],
"firstName": "Leanne 1",
"lastName": "Graham",
"email": "test@mail.ru",
"role": "admin",
},
{
"id": 2,
"serviceId": [1],
"firstName": "Leanne 2",
"lastName": "Graham",
"email": "test@mail.ru",
"role": "admin",
},
{
"id": 3,
"serviceId": [2, 3],
"firstName": "Leanne 3",
"lastName": "Graham",
"email": "test@mail.ru",
"role": "admin",
},
{
"id": 4,
"serviceId": [3],
"firstName": "Leanne 4",
"lastName": "Graham",
"email": "test@mail.ru",
"role": "admin",
},
{
"id": 5,
"serviceId": [4, 5],
"firstName": "Leanne 5",
"lastName": "Graham",
"email": "test@mail.ru",
"role": "admin",
},
]
describe("tests UsersForSelection component", () => {
const store = createStore({
@@ -94,7 +52,9 @@ describe("tests UsersForSelection component", () => {
const wrapper = mount(UsersSelection, {
global: {
plugins: [store],
mocks: {
$store: store
},
props: {
caseOfUsersInService
}
@@ -139,7 +99,9 @@ describe("tests UsersForSelection component", () => {
const wrapper = mount(UsersSelection, {
global: {
plugins: [store]
mocks: {
$store: store
}
},
components: {VTabulator},
props: {

81
users-manage/tests/views/3_organisms/Users/UsersManagerTable.test.js
View File

@@ -11,52 +11,10 @@ import ServiceOfServices from '@services/serviceOfServices/Services.js'
import AdapterOfUsers from '@adapters/adapterOfUsers/Users'
import ServiceOfUsers from '@services/serviceOfUsers/Users.js'
import CaseOfUsersInService from '@useCases/CaseOfUsersInService.js'
import {defaultUsers} from "@mocks/users"
vi.mock('axios')
const defaultUsers = [
{
"id": 1,
"serviceId": [1, 3],
"firstName": "Leanne 1",
"lastName": "Graham",
"email": "test@mail.ru",
"role": "admin",
},
{
"id": 2,
"serviceId": [1],
"firstName": "Leanne 2",
"lastName": "Graham",
"email": "test@mail.ru",
"role": "admin",
},
{
"id": 3,
"serviceId": [2, 3],
"firstName": "Leanne 3",
"lastName": "Graham",
"email": "test@mail.ru",
"role": "admin",
},
{
"id": 4,
"serviceId": [3],
"firstName": "Leanne 4",
"lastName": "Graham",
"email": "test@mail.ru",
"role": "admin",
},
{
"id": 5,
"serviceId": [4, 5],
"firstName": "Leanne 5",
"lastName": "Graham",
"email": "test@mail.ru",
"role": "admin",
},
]
describe("tests UsersManagerUsersTable component", () => {
const store = createStore({
@@ -94,7 +52,9 @@ describe("tests UsersManagerUsersTable component", () => {
const wrapper = mount(UsersTable, {
global: {
plugins: [store],
mocks: {
$store: store
},
props: {
serviceOfUsers
}
@@ -119,7 +79,9 @@ describe("tests UsersManagerUsersTable component", () => {
const wrapper = mount(UsersTable, {
global: {
plugins: [store]
mocks: {
$store: store
}
},
components: {VTabulator},
props: {
@@ -180,7 +142,9 @@ describe("tests UsersManagerUsersTable component", () => {
const wrapper = mount(UsersTable, {
global: {
plugins: [store]
mocks: {
$store: store
}
},
components: {VTabulator},
props: {
@@ -201,24 +165,19 @@ describe("tests UsersManagerUsersTable component", () => {
expect(forDeleteUserFromService).not.toBeNull()
expect(userStatus).toBe('inactive')
wrapper.vm.deleteUser(forDeleteUser)
await wrapper.vm.deleteUser(forDeleteUser)
setTimeout(() => {
const userStatusAfterDelete = store.getters['users/userStatus']
const usersWithServicesAfterDelete = store.getters['users/usersWithService']
const usersWithoutService = store.getters['users/usersWithoutService']
const userStatusAfterDelete = store.getters['users/userStatus']
const usersWithServicesAfterDelete = store.getters['users/usersWithService']
const usersWithoutService = store.getters['users/usersWithoutService']
const userFromServiceAfterDelete = usersWithServicesAfterDelete.find(user => user.id === forDeleteUser.id)
const userWithoutServiceAfterDelete = usersWithoutService.find(user => user.id === forDeleteUser.id)
expect(userStatusAfterDelete).toBe('select')
expect(userFromServiceAfterDelete).toBeUndefined()
expect(userWithoutServiceAfterDelete).toBeDefined()
expect(userWithoutServiceAfterDelete.id).toEqual(forDeleteUser.id)
}, 100)
const userFromServiceAfterDelete = usersWithServicesAfterDelete.find(user => user.id === forDeleteUser.id)
const userWithoutServiceAfterDelete = usersWithoutService.find(user => user.id === forDeleteUser.id)
expect(userStatusAfterDelete).toBe('select')
expect(userFromServiceAfterDelete).toBeUndefined()
expect(userWithoutServiceAfterDelete).toBeDefined()
expect(userWithoutServiceAfterDelete.id).toEqual(forDeleteUser.id)
})
})

105
users-manage/tests/views/3_organisms/Users/UsersManagerUserEditor.test.js
View File

@@ -7,52 +7,11 @@ import {store as users} from "@/store/modules/users"
import {store as services} from "@/store/modules/services"
import AdapterOfUsers from '@adapters/adapterOfUsers/Users'
import ServiceOfUsers from '@services/serviceOfUsers/Users.js'
import {defaultUsers} from "@mocks/users"
import {resServices} from "@mocks/services"
vi.mock('axios')
const defaultUsers = [
{
"id": 1,
"serviceId": [1, 3],
"firstName": "Leanne 1",
"lastName": "Graham",
"email": "test@mail.ru",
"role": "admin",
},
{
"id": 2,
"serviceId": [1],
"firstName": "Leanne 2",
"lastName": "Graham",
"email": "test@mail.ru",
"role": "admin",
},
{
"id": 3,
"serviceId": [2, 3],
"firstName": "Leanne 3",
"lastName": "Graham",
"email": "test@mail.ru",
"role": "admin",
},
{
"id": 4,
"serviceId": [3],
"firstName": "Leanne 4",
"lastName": "Graham",
"email": "test@mail.ru",
"role": "admin",
},
{
"id": 5,
"serviceId": [4, 5],
"firstName": "Leanne 5",
"lastName": "Graham",
"email": "test@mail.ru",
"role": "admin",
},
]
describe("tests UserEditor component", () => {
const store = createStore({
plugins: [],
@@ -78,7 +37,9 @@ describe("tests UserEditor component", () => {
const wrapper = mount(UserEditor, {
shallow: true,
global: {
plugins: [store]
mocks: {
$store: store
}
},
props: {
serviceOfUsers
@@ -95,7 +56,9 @@ describe("tests UserEditor component", () => {
const wrapper = mount(UserEditor, {
shallow: true,
global: {
plugins: [store]
mocks: {
$store: store
}
},
props: {
serviceOfUsers
@@ -116,22 +79,6 @@ describe("tests UserEditor component", () => {
test('Saving after editing selected user in UserEditor', async () => {
const resServices = [
{
"id": 1,
"created_at": "2024-03-06T17:31:31.948355541+03:00",
"updated_at": "2024-03-06T17:31:31.948355541+03:00",
"deleted_at": null,
"name": "jsonplaceholder.typicode.com",
"port": 9965,
"proxy_ip": "172.25.78.153",
"device_ip": "https://jsonplaceholder.typicode.com/",
"internet_uri": "localhost",
"description": "localhost",
"is_online": true
},
]
const editedUser = {
"id": 3,
"serviceId": [1, 3],
@@ -149,7 +96,9 @@ describe("tests UserEditor component", () => {
const wrapper = mount(UserEditor, {
shallow: true,
global: {
plugins: [store]
mocks: {
$store: store
}
},
props: {
serviceOfUsers
@@ -176,22 +125,6 @@ describe("tests UserEditor component", () => {
test('Saving after creating new user in UserEditor', async () => {
const resServices = [
{
"id": 1,
"created_at": "2024-03-06T17:31:31.948355541+03:00",
"updated_at": "2024-03-06T17:31:31.948355541+03:00",
"deleted_at": null,
"name": "jsonplaceholder.typicode.com",
"port": 9965,
"proxy_ip": "172.25.78.153",
"device_ip": "https://jsonplaceholder.typicode.com/",
"internet_uri": "localhost",
"description": "localhost",
"is_online": true
},
]
const newUser = {
"id": -1,
"serviceId": [],
@@ -209,7 +142,9 @@ describe("tests UserEditor component", () => {
const wrapper = mount(UserEditor, {
shallow: true,
global: {
plugins: [store]
mocks: {
$store: store
}
},
props: {
serviceOfUsers
@@ -249,7 +184,9 @@ describe("tests UserEditor component", () => {
const wrapper = mount(UserEditor, {
shallow: true,
global: {
plugins: [store]
mocks: {
$store: store
}
},
props: {
serviceOfUsers
@@ -271,7 +208,9 @@ describe("tests UserEditor component", () => {
const wrapper = mount(UserEditor, {
shallow: true,
global: {
plugins: [store]
mocks: {
$store: store
}
},
props: {
serviceOfUsers
@@ -298,7 +237,9 @@ describe("tests UserEditor component", () => {
const wrapper = mount(UserEditor, {
shallow: true,
global: {
plugins: [store]
mocks: {
$store: store
}
},
props: {
serviceOfUsers

38
users-manage/tests/views/5_pages/SitesList.test.js
View File

@@ -7,10 +7,10 @@ import {store as services} from "@/store/modules/services"
import {store as users} from "@/store/modules/users"
import AdapterOfServices from '@adapters/adapterOfServices/Services'
import ServiceOfServices from '@services/serviceOfServices/Services.js'
import {defaultServices, resServices} from "@mocks/services"
vi.mock('axios')
describe("tests Services Manager Page component", () => {
const store = createStore({
plugins: [],
@@ -20,38 +20,6 @@ describe("tests Services Manager Page component", () => {
},
})
const defaultServices = [
{
"id": 1,
"created_at": "2024-03-06T17:31:31.948355541+03:00",
"updated_at": "2024-03-06T17:31:31.948355541+03:00",
"deleted_at": null,
"name": "jsonplaceholder.typicode.com",
"port": 9965,
"proxy_ip": "172.25.78.153",
"site_ip": "https://jsonplaceholder.typicode.com/",
"internet_uri": "localhost",
"description": "localhost",
"is_online": true
},
]
const resServices = [
{
"id": 1,
"createdAt": "2024-03-06T17:31:31.948355541+03:00",
"updatedAt": "2024-03-06T17:31:31.948355541+03:00",
"deletedAt": null,
"name": "jsonplaceholder.typicode.com",
"port": 9965,
"proxyIp": "172.25.78.153",
"deviceIp": "https://jsonplaceholder.typicode.com/",
"internetUri": "localhost",
"description": "localhost",
"isOnline": true
},
]
axios.get.mockResolvedValue({
data: defaultServices,
})
@@ -62,7 +30,9 @@ describe("tests Services Manager Page component", () => {
test('Services Manager Page mounted with vuex', async () => {
const wrapper = mount(Services, {
global: {
plugins: [store]
mocks: {
$store: store
}
}
})