mirror of
https://github.com/frappe/books.git
synced 2024-11-10 07:40:55 +00:00
Fix failing tests
This commit is contained in:
parent
f92e1c28e4
commit
24b55da0e4
@ -42,7 +42,7 @@ module.exports = class FormPage extends Page {
|
||||
await this.form.setDoc(params.doctype, params.name);
|
||||
frappe.desk.setActiveDoc(this.form.doc);
|
||||
} catch (e) {
|
||||
this.renderError(e.status_code, e.message);
|
||||
this.renderError(e.statusCode, e.message);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
@ -1,22 +1,35 @@
|
||||
class BaseError extends Error {
|
||||
constructor(status_code, ...params) {
|
||||
constructor(statusCode, ...params) {
|
||||
super(...params);
|
||||
this.status_code = status_code;
|
||||
this.statusCode = statusCode;
|
||||
}
|
||||
}
|
||||
|
||||
class ValidationError extends BaseError {
|
||||
constructor(...params) { super(417, ...params); }
|
||||
constructor(...params) {
|
||||
super(417, ...params);
|
||||
}
|
||||
}
|
||||
|
||||
module.exports = {
|
||||
ValidationError: ValidationError,
|
||||
ValueError: class ValueError extends ValidationError { },
|
||||
Conflict: class Conflict extends ValidationError { },
|
||||
NotFound: class NotFound extends BaseError {
|
||||
constructor(...params) { super(404, ...params); }
|
||||
},
|
||||
Forbidden: class Forbidden extends BaseError {
|
||||
constructor(...params) { super(403, ...params); }
|
||||
},
|
||||
class NotFound extends BaseError {
|
||||
constructor(...params) {
|
||||
super(404, ...params);
|
||||
}
|
||||
}
|
||||
|
||||
class Forbidden extends BaseError {
|
||||
constructor(...params) {
|
||||
super(403, ...params);
|
||||
}
|
||||
}
|
||||
|
||||
class ValueError extends ValidationError { }
|
||||
class Conflict extends ValidationError { }
|
||||
|
||||
module.exports = {
|
||||
ValidationError,
|
||||
ValueError,
|
||||
Conflict,
|
||||
NotFound,
|
||||
Forbidden
|
||||
}
|
||||
|
@ -62,10 +62,11 @@ module.exports = {
|
||||
try {
|
||||
series = await frappe.getDoc('NumberSeries', prefix);
|
||||
} catch (e) {
|
||||
if (!e.status_code || e.status_code !== 404) {
|
||||
if (!e.statusCode || e.statusCode !== 404) {
|
||||
throw e;
|
||||
}
|
||||
await this.createNumberSeries(prefix);
|
||||
series = await frappe.getDoc('NumberSeries', prefix);
|
||||
}
|
||||
let next = await series.next()
|
||||
return prefix + next;
|
||||
|
@ -67,7 +67,7 @@ describe('Document', () => {
|
||||
assert.equal(await frappe.db.getValue(doc.doctype, doc.name), null);
|
||||
});
|
||||
|
||||
it('should add, fetch and delete documents with children', async() => {
|
||||
it('should add, fetch and delete documents with children', async () => {
|
||||
if (!await frappe.db.exists('Role', 'Test Role 1')) {
|
||||
await frappe.insert({doctype: 'Role', name: 'Test Role'});
|
||||
await frappe.insert({doctype: 'Role', name: 'Test Role 1'});
|
||||
@ -76,7 +76,8 @@ describe('Document', () => {
|
||||
let user = frappe.newDoc({
|
||||
doctype: 'User',
|
||||
name: frappe.getRandomString(),
|
||||
full_name: 'Test User',
|
||||
fullName: 'Test User',
|
||||
password: frappe.getRandomString(),
|
||||
roles: [
|
||||
{
|
||||
role: 'Test Role'
|
||||
|
@ -10,9 +10,9 @@ describe('Naming', () => {
|
||||
|
||||
it('should start a series and get next value', async () => {
|
||||
frappe.db.delete('NumberSeries', 'test-series-')
|
||||
assert.equal(await naming.getSeriesNext('test-series-'), 'test-series-1');
|
||||
assert.equal(await naming.getSeriesNext('test-series-'), 'test-series-2');
|
||||
assert.equal(await naming.getSeriesNext('test-series-'), 'test-series-3');
|
||||
assert.equal(await naming.getSeriesNext('test-series-'), 'test-series-1001');
|
||||
assert.equal(await naming.getSeriesNext('test-series-'), 'test-series-1002');
|
||||
assert.equal(await naming.getSeriesNext('test-series-'), 'test-series-1003');
|
||||
});
|
||||
|
||||
it('should set name by autoincrement', async () => {
|
||||
|
@ -16,7 +16,7 @@ describe('REST', () => {
|
||||
});
|
||||
|
||||
await frappe.init();
|
||||
await frappe.login();
|
||||
await frappe.login('Administrator');
|
||||
|
||||
frappe.db = await new HTTPClient({server: 'localhost:8000'});
|
||||
frappe.fetch = fetch;
|
||||
|
@ -61,7 +61,7 @@ function asyncHandler(fn) {
|
||||
.catch((err) => {
|
||||
console.log(err);
|
||||
// handle error
|
||||
res.status(err.status_code || 500).send({error: err.message});
|
||||
res.status(err.statusCode || 500).send({error: err.message});
|
||||
});
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user