verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 59 Releases Wiki Activity

WIP: fix: refs #7917 fix methods, tests, acls #3085

Draft
carlossa wants to merge 12 commits from 7917-freelancerRoute into dev
pull from: 7917-freelancerRoute
merge into: verdnatura:dev
Conversation 0 Commits 12 Files Changed 11 +29 -1
3 changed files with 29 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 57a77628dc - Show all commits

2
db/versions/11350-silverArborvitae/00-firstScript.sql Normal file
View File

@ -0,0 +1,2 @@
ALTER TABLE vn.shelvingLog
MODIFY COLUMN changedModel enum('Shelving', 'ItemShelving') CHARACTER SET utf8mb3 COLLATE utf8mb3_unicode_ci DEFAULT 'Shelving' NOT NULL;

1
modules/worker/back/methods/worker-time-control/specs/login.spec.js
View File

@ -1,5 +1,4 @@
const models = require('vn-loopback/server/server').models;
const LoopBackContext = require('loopback-context');
const UserError = require('vn-loopback/util/user-error');
describe('workerTimeControl login()', () => {

27
modules/worker/back/methods/worker-time-control/specs/sendMail.spec.js Normal file
View File

@ -0,0 +1,27 @@
const models = require('vn-loopback/server/server').models;
describe('sendMail', () => {
it('should insert in mail', async() => {
const tx = await models.Sale.beginTransaction({});
const options = {transaction: tx};
options.transaction = tx;
let mailCountBefore;
let mailCountAfter;
const ctx = {
req: {accessToken: {userId: 50}},
args: {workerFk: 1106, year: 2001, week: 1}
};
try {
mailCountBefore = await models.Mail.count(options);
await models.WorkerTimeControl.sendMail(ctx, options);
mailCountAfter = await models.Mail.count(options);
} catch (e) {
await tx.rollback();
throw e;
}
expect(mailCountAfter).toBeGreaterThan(mailCountBefore);
await tx.rollback();
});
});