Merge branch 'dev' into 4466-invoiceInRectificated
gitea/salix/pipeline/head There was a failure building this commit
Details
gitea/salix/pipeline/head There was a failure building this commit
Details
This commit is contained in:
commit
b087f84629
|
@ -31,7 +31,7 @@ describe('docuware upload()', () => {
|
||||||
try {
|
try {
|
||||||
const options = {transaction: tx};
|
const options = {transaction: tx};
|
||||||
const user = await models.UserConfig.findById(userId, null, options);
|
const user = await models.UserConfig.findById(userId, null, options);
|
||||||
await user.updateAttribute('tabletFk', 'Tablet1');
|
await user.updateAttribute('tabletFk', 'Tablet1', options);
|
||||||
await models.Docuware.upload(ctx, ticketIds, fileCabinetName, options);
|
await models.Docuware.upload(ctx, ticketIds, fileCabinetName, options);
|
||||||
|
|
||||||
await tx.rollback();
|
await tx.rollback();
|
||||||
|
|
|
@ -30,7 +30,6 @@ describe('Renew Token', () => {
|
||||||
it('should renew token', async() => {
|
it('should renew token', async() => {
|
||||||
const mockDate = new Date(startingTime + 26600000);
|
const mockDate = new Date(startingTime + 26600000);
|
||||||
jasmine.clock().mockDate(mockDate);
|
jasmine.clock().mockDate(mockDate);
|
||||||
console.log(startingTime, mockDate)
|
|
||||||
const {id} = await models.VnUser.renewToken(ctx);
|
const {id} = await models.VnUser.renewToken(ctx);
|
||||||
|
|
||||||
expect(id).not.toEqual(ctx.req.accessToken.id);
|
expect(id).not.toEqual(ctx.req.accessToken.id);
|
||||||
|
|
Loading…
Reference in New Issue