From 596c72f970612da4e91996adaa1347879dbebaab Mon Sep 17 00:00:00 2001 From: kyle hoell Date: Sun, 6 Dec 2020 19:16:46 -0500 Subject: [PATCH] added db tests --- .../{index.testtt.js => index.test.js} | 111 ++++++++-------- .../{index.testtt.js => index.test.js} | 118 ++++++++++++------ 2 files changed, 135 insertions(+), 94 deletions(-) rename tests/db/utils/fileUtils/{index.testtt.js => index.test.js} (93%) rename tests/db/utils/folderUtils/{index.testtt.js => index.test.js} (85%) diff --git a/tests/db/utils/fileUtils/index.testtt.js b/tests/db/utils/fileUtils/index.test.js similarity index 93% rename from tests/db/utils/fileUtils/index.testtt.js rename to tests/db/utils/fileUtils/index.test.js index 6e521de..5c0302e 100644 --- a/tests/db/utils/fileUtils/index.testtt.js +++ b/tests/db/utils/fileUtils/index.test.js @@ -2,6 +2,7 @@ import User from "../../../../dist/models/user"; import mongoose from "../../../../dist/db/mongoose"; const conn = mongoose.connection; const createUser = require("../../../fixtures/createUser"); +const createUser2 = require("../../../fixtures/createUser2"); const path = require("path"); const createFile = require("../../../fixtures/createFile"); import UtilsFile from "../../../../dist/db/utils/fileUtils/index"; @@ -14,45 +15,45 @@ let file; process.env.KEY = "1234"; + +const waitForDatabase = () => { + + return new Promise((resolve, reject) => { + + if (conn.readyState !== 1) { + + conn.once("open", () => { + + resolve(); + + }) + + } else { + + resolve(); + } + + }) +} + beforeEach(async(done) => { - if (conn.readyState === 0) { + await waitForDatabase(); - conn.once("open", async() => { - - //user = await createUser(); - const {user: gotUser} = await createUser(); - user = gotUser; - - const filename = "bunny.mp4"; - const filepath = path.join(__dirname, "../../../fixtures/media/check.svg") - const metadata = { - owner: user._id, - parent: "/", - parentList: "/" - } - - file = await createFile(filename, filepath, metadata, user); + const {user: gotUser} = await createUser(); + user = gotUser; - done(); - }) - } else { - // user = await createUser(); - const {user: gotUser} = await createUser(); - user = gotUser; - - const filename = "bunny.mp4"; - const filepath = path.join(__dirname, "../../../fixtures/media/check.svg") - const metadata = { - owner: user._id, - parent: "/", - parentList: "/" - } - - file = await createFile(filename, filepath, metadata, user); + const filename = "bunny.mp4"; + const filepath = path.join(__dirname, "../../../fixtures/media/check.svg") + const metadata = { + owner: user._id, + parent: "/", + parentList: "/" + } - done(); - } + file = await createFile(filename, filepath, metadata, user); + + done(); }) afterEach( async(done) => { @@ -761,36 +762,36 @@ test("When giving start at with ascending data, should return filtered list", as expect(recievedList[0]._id).toEqual(fileThree._id); }) -test("When giving user and temp token, should remove temp token", async() => { +// test("When giving user and temp token, should remove temp token", async() => { - const token = jwt.sign({_id: user._id}, process.env.PASSWORD, {expiresIn: 2}); - user.tempTokens = user.tempTokens.concat({token}) - await user.save(); +// const token = jwt.sign({_id: user._id}, process.env.PASSWORD, {expiresIn: 2}); +// user.tempTokens = user.tempTokens.concat({token}) +// await user.save(); - const recievedUser = await utilsFile.removeTempToken(user, token); - await recievedUser.save(); - const updatedUser = await User.findById(user._id); +// const recievedUser = await utilsFile.removeTempToken(user, token); +// await recievedUser.save(); +// const updatedUser = await User.findById(user._id); - expect(updatedUser.tempTokens.length).toBe(0); -}) +// expect(updatedUser.tempTokens.length).toBe(0); +// }) -test("When giving the wrong temp token, should not remove temp token", async() => { +// test("When giving the wrong temp token, should not remove temp token", async() => { - const token = jwt.sign({_id: user._id}, process.env.PASSWORD, {expiresIn: 2}); - user.tempTokens = user.tempTokens.concat({token}) - await user.save(); +// const token = jwt.sign({_id: user._id}, process.env.PASSWORD, {expiresIn: 2}); +// user.tempTokens = user.tempTokens.concat({token}) +// await user.save(); - const recievedUser = await utilsFile.removeTempToken(user, "1234"); - await recievedUser.save(); - const updatedUser = await User.findById(user._id); +// const recievedUser = await utilsFile.removeTempToken(user, "1234"); +// await recievedUser.save(); +// const updatedUser = await User.findById(user._id); - expect(updatedUser.tempTokens.length).toBe(1); - expect(updatedUser.tempTokens[0].token._id).toBe(token._id) -}) +// expect(updatedUser.tempTokens.length).toBe(1); +// expect(updatedUser.tempTokens[0].token._id).toBe(token._id) +// }) // test("When giving fileID and userID, should remove transcoded video", async() => { @@ -1026,6 +1027,8 @@ test("When giving the wrong userID, should not return file list by parent", asyn test("When giving the userID, should return file list by owner", async() => { const userID = user._id; + + const {user: user2} = await createUser2(); const filepath = path.join(__dirname, "../../../fixtures/media/check.svg") const metadata = { @@ -1041,7 +1044,7 @@ test("When giving the userID, should return file list by owner", async() => { } const metadataDifferentOwner = { - owner: "1234", + owner: user2._id, parent: "/", parentList:"/,1234" } diff --git a/tests/db/utils/folderUtils/index.testtt.js b/tests/db/utils/folderUtils/index.test.js similarity index 85% rename from tests/db/utils/folderUtils/index.testtt.js rename to tests/db/utils/folderUtils/index.test.js index 3d209b9..420a23c 100644 --- a/tests/db/utils/folderUtils/index.testtt.js +++ b/tests/db/utils/folderUtils/index.test.js @@ -12,52 +12,90 @@ let folder; process.env.KEY = "1234"; +const waitForDatabase = () => { + + return new Promise((resolve, reject) => { + + if (conn.readyState !== 1) { + + conn.once("open", () => { + + resolve(); + + }) + + } else { + + resolve(); + } + + }) +} + beforeEach(async(done) => { - if (conn.readyState === 0) { + await waitForDatabase(); - conn.once("open", async() => { + const {user: gotUser} = await createUser(); + user = gotUser; - //user = await createUser(); - const {user: gotUser} = await createUser(); - user = gotUser; - - const folderData = { - name: "bunny", - owner: user._id, - parent: "/", - parentList: ["/"] - } - - - folder = new Folder(folderData); - await folder.save(); - - done(); - - - }) - - } else { - - //user = await createUser(); - const {user: gotUser} = await createUser(); - user = gotUser; - - const folderData = { - name: "bunny", - owner: user._id, - parent: "/", - parentList: ["/"] - } - - - folder = new Folder(folderData); - await folder.save(); - - done(); + const folderData = { + name: "bunny", + owner: user._id, + parent: "/", + parentList: ["/"] } + + folder = new Folder(folderData); + await folder.save(); + + done(); + + // if (conn.readyState === 0) { + + // conn.once("open", async() => { + + // //user = await createUser(); + // const {user: gotUser} = await createUser(); + // user = gotUser; + + // const folderData = { + // name: "bunny", + // owner: user._id, + // parent: "/", + // parentList: ["/"] + // } + + + // folder = new Folder(folderData); + // await folder.save(); + + // done(); + + + // }) + + // } else { + + // //user = await createUser(); + // const {user: gotUser} = await createUser(); + // user = gotUser; + + // const folderData = { + // name: "bunny", + // owner: user._id, + // parent: "/", + // parentList: ["/"] + // } + + + // folder = new Folder(folderData); + // await folder.save(); + + // done(); + // } + }) afterEach( async(done) => {