8032-devToTest_2440 #3009

Merged
alexm merged 262 commits from 8032-devToTest_2440 into test 2024-09-24 09:34:49 +00:00
2 changed files with 1 additions and 10 deletions
Showing only changes of commit 2d4e667009 - Show all commits

View File

@ -113,15 +113,6 @@ module.exports = Self => {
message: vMessage, message: vMessage,
serialNumber, serialNumber,
}; };
const combinedResult2 = {
...getDataOperator.__data,
...getDataUser.__data,
...getVersion,
message: vMessage,
serialNumber,
};
console.log('conbinedResult2', combinedResult2);
return combinedResult; return combinedResult;
}; };
}; };

View File

@ -3,7 +3,7 @@ const {models} = require('vn-loopback/server/server');
describe('Device handleUser()', () => { describe('Device handleUser()', () => {
const ctx = {req: {accessToken: {userId: 9}}}; const ctx = {req: {accessToken: {userId: 9}}};
it('should return data from user', async() => { fit('should return data from user', async() => {
const androidId = 'androidid11234567890'; const androidId = 'androidid11234567890';
const deviceId = 1; const deviceId = 1;
const nameApp = 'warehouse'; const nameApp = 'warehouse';