updated Service of Users, updated tests
This commit is contained in:
@@ -4,94 +4,11 @@ import ServiceOfServices from '@services/serviceOfServices/Services.js'
|
||||
import {addedService, updatedService, removedNewService, deletedService} from '@services/serviceOfServices/helpers.js'
|
||||
import { createStore } from 'vuex'
|
||||
import {store as services} from "@/store/modules/services"
|
||||
import axios from "axios";
|
||||
import axios from "axios"
|
||||
import {defaultServices, resServices} from "@mocks/services"
|
||||
|
||||
vi.mock('axios')
|
||||
|
||||
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
|
||||
}
|
||||
]
|
||||
|
||||
describe("tests services store with vuex", () => {
|
||||
const store = createStore({
|
||||
plugins: [],
|
||||
|
||||
@@ -3,53 +3,11 @@ import AdapterOfUsers from '@adapters/adapterOfUsers/Users'
|
||||
import ServiceOfUsers from '@services/serviceOfUsers/Users.js'
|
||||
import { createStore } from 'vuex'
|
||||
import {store as users} from "@/store/modules/users"
|
||||
import axios from "axios";
|
||||
import axios from "axios"
|
||||
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 users store with vuex", () => {
|
||||
const store = createStore({
|
||||
plugins: [],
|
||||
@@ -111,7 +69,7 @@ describe("tests users store with vuex", () => {
|
||||
|
||||
test('Created and added new user layout to selected user in store', async () => {
|
||||
|
||||
const newUser = await serviceOfUsers.createNewUser()
|
||||
const newUser = await serviceOfUsers.addNewUser()
|
||||
|
||||
const newUserStore = store.getters['users/selectedUser']
|
||||
|
||||
@@ -122,7 +80,7 @@ describe("tests users store with vuex", () => {
|
||||
|
||||
test('Get selected user from store', async () => {
|
||||
|
||||
await serviceOfUsers.createNewUser()
|
||||
await serviceOfUsers.addNewUser()
|
||||
const selectedUser = await serviceOfUsers.getSelectedUser()
|
||||
|
||||
const selectedUserStore = store.getters['users/selectedUser']
|
||||
@@ -134,7 +92,7 @@ describe("tests users store with vuex", () => {
|
||||
test('Set selected user in store', async () => {
|
||||
|
||||
await serviceOfUsers.getUsers('dev')
|
||||
await serviceOfUsers.createNewUser()
|
||||
await serviceOfUsers.addNewUser()
|
||||
|
||||
const selectedNewUserStore = store.getters['users/selectedUser']
|
||||
|
||||
@@ -197,16 +155,16 @@ describe("tests users store with vuex", () => {
|
||||
|
||||
await serviceOfUsers.setSelectedUser(5)
|
||||
|
||||
await serviceOfUsers.editUserByService({key: "firstName", value: "Leanne 5 edited"})
|
||||
await serviceOfUsers.editUserByService({key: "lastName", value: "Graham edited"})
|
||||
await serviceOfUsers.setUserFields("firstName", "Leanne 5 edited")
|
||||
await serviceOfUsers.setUserFields("lastName","Graham edited")
|
||||
|
||||
const editedUser = store.getters['users/selectedUser']
|
||||
|
||||
expect(editedUser.firstName).toEqual("Leanne 5 edited")
|
||||
expect(editedUser.lastName).toEqual("Graham edited")
|
||||
|
||||
await serviceOfUsers.editUserByService({key: "firstName", value: "Leanne 5"}) // return to default value
|
||||
await serviceOfUsers.editUserByService({key: "lastName", value: "Graham"}) // return to default value
|
||||
await serviceOfUsers.setUserFields("firstName", "Leanne 5") // return to default value
|
||||
await serviceOfUsers.setUserFields("lastName", "Graham") // return to default value
|
||||
|
||||
})
|
||||
|
||||
@@ -245,7 +203,7 @@ describe("tests users store with vuex", () => {
|
||||
const users = store.getters['users/users']
|
||||
const countUsers = users.length
|
||||
|
||||
await serviceOfUsers.saveUpdatedDataUser(3)
|
||||
await serviceOfUsers.createUser(3)
|
||||
|
||||
const usersWithService = store.getters['users/usersWithService']
|
||||
const newUserAfterAdding = usersWithService.find(user => user.id === countUsers + 1) // Пока не получаем нового юзера с бэка, поэтому задаём id по количеству всех юзеров
|
||||
@@ -273,7 +231,7 @@ describe("tests users store with vuex", () => {
|
||||
await serviceOfUsers.getUsers('dev')
|
||||
store.dispatch('users/updateSelectedUser', editedUser)
|
||||
|
||||
await serviceOfUsers.saveUpdatedDataUser(2)
|
||||
await serviceOfUsers.updateUser()
|
||||
|
||||
const usersWithService = store.getters['users/usersWithService']
|
||||
const userAfterUpdating = usersWithService.find(user => user.id === 3)
|
||||
|
||||
Reference in New Issue
Block a user