yuuza/outline
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Updated IDs and fixed tests

Browse Source
This commit is contained in:
Jori Lallo
2017-06-28 23:24:19 -07:00
parent 56beb8b55f
commit 22153441fa
5 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
server/api/__snapshots__/auth.test.js.snap
View File

@@ -3,7 +3,7 @@
exports[`#auth.login should login with email 1`] = `
Object {
"avatarUrl": "http://example.com/avatar.png",
"id": "86fde1d4-0050-428f-9f0b-0bf77f8bdf61",
"id": "46fde1d4-0050-428f-9f0b-0bf77f4bdf61",
"name": "User 1",
"username": "user1",
}
@@ -12,7 +12,7 @@ Object {
exports[`#auth.login should login with username 1`] = `
Object {
"avatarUrl": "http://example.com/avatar.png",
"id": "86fde1d4-0050-428f-9f0b-0bf77f8bdf61",
"id": "46fde1d4-0050-428f-9f0b-0bf77f4bdf61",
"name": "User 1",
"username": "user1",
}

2
server/api/__snapshots__/user.test.js.snap
View File

@@ -13,7 +13,7 @@ exports[`#user.info should return known user 1`] = `
Object {
"data": Object {
"avatarUrl": "http://example.com/avatar.png",
"id": "86fde1d4-0050-428f-9f0b-0bf77f8bdf61",
"id": "46fde1d4-0050-428f-9f0b-0bf77f4bdf61",
"name": "User 1",
"username": "user1",
},

6
server/api/documents.test.js
View File

@@ -174,9 +174,7 @@ describe('#documents.update', async () => {
expect(res.status).toEqual(200);
expect(body.data.title).toBe('Updated title');
expect(body.data.text).toBe('Updated text');
expect(body.data.collection.documentStructure[1].title).toBe(
'Updated title'
);
expect(body.data.collection.documents[1].title).toBe('Updated title');
});
it('should update document details for children', async () => {
@@ -210,7 +208,7 @@ describe('#documents.update', async () => {
expect(res.status).toEqual(200);
expect(body.data.title).toBe('Updated title');
expect(body.data.collection.documentStructure[0].children[1].title).toBe(
expect(body.data.collection.documents[0].children[1].title).toBe(
'Updated title'
);
});

17
server/presenters/document.js
View File

@@ -39,13 +39,16 @@ async function present(ctx, document, options) {
}
if (options.includeCollection) {
data.collection =
options.collection ||
(await Collection.findOne({
where: {
id: document.atlasId,
},
}));
data.collection = await ctx.cache.get(document.atlasId, async () => {
const collection =
options.collection ||
(await Collection.findOne({
where: {
id: document.atlasId,
},
}));
return presentCollection(ctx, collection);
});
}
if (options.includeCollaborators) {

4
server/test/support.js
View File

@@ -23,7 +23,7 @@ const seed = async () => {
});
const user = await User.create({
id: '86fde1d4-0050-428f-9f0b-0bf77f8bdf61',
id: '46fde1d4-0050-428f-9f0b-0bf77f4bdf61',
email: 'user1@example.com',
username: 'user1',
name: 'User 1',
@@ -37,7 +37,7 @@ const seed = async () => {
});
let collection = await Collection.create({
id: '86fde1d4-0050-428f-9f0b-0bf77f8bdf61',
id: '26fde1d4-0050-428f-9f0b-0bf77f8bdf62',
name: 'Collection',
urlId: 'collection',
teamId: team.id,