From 8e7baca47d256ae301cf37f3598d840cd6397243 Mon Sep 17 00:00:00 2001 From: Trevor Buckner Date: Tue, 23 Jul 2024 17:40:32 -0400 Subject: [PATCH] Fix tests --- server/homebrew.api.js | 4 ---- server/homebrew.api.spec.js | 19 ++++++++----------- 2 files changed, 8 insertions(+), 15 deletions(-) diff --git a/server/homebrew.api.js b/server/homebrew.api.js index 0b6218597..8faebd51b 100644 --- a/server/homebrew.api.js +++ b/server/homebrew.api.js @@ -309,8 +309,6 @@ const api = { if(isStaticTheme(req.brew.renderer, req.brew.theme)) //Check if parent is staticBrew rendererPath = `${_.upperFirst(req.brew.renderer)}/`; - console.log(`getBrewThemeCSS for ${brew.shareId}`); - console.log(`and parentThemeImport for ${brew.theme}`); const parentThemeImport = `@import url(\"/css/${rendererPath}${req.brew.theme}\");\n\n`; const themeLocationComment = `/* From Brew: ${req.protocol}://${req.get('host')}/share/${req.brew.shareId} */\n\n`; return res.status(200).send(`${parentThemeImport}${themeLocationComment}${req.brew.style}`); @@ -323,8 +321,6 @@ const api = { res.setHeader('Content-Type', 'text/css'); res.setHeader('Cache-Control', 'public, max-age: 43200, must-revalidate'); const themeParent = Themes[req.params.renderer][req.params.id].baseTheme; - console.log(`getStaticThemeCSS for ${req.params.id}`); - console.log(`and parentThemeImport for ${themeParent}`); const parentThemeImport = themeParent ? `@import url(\"/css/${req.params.renderer}/${themeParent}\");\n/* Static Theme ${Themes[req.params.renderer][themeParent].name} */\n` : ''; return res.status(200).send(`${parentThemeImport}@import url(\"/themes/${req.params.renderer}/${req.params.id}/style.css\");\n/* Static Theme ${Themes[req.params.renderer][req.params.id].name} */\n`); } diff --git a/server/homebrew.api.spec.js b/server/homebrew.api.spec.js index 67f4abe5f..847c71946 100644 --- a/server/homebrew.api.spec.js +++ b/server/homebrew.api.spec.js @@ -287,15 +287,12 @@ describe('Tests for api', ()=>{ thumbnail : '', textBin : undefined, version : undefined, - userThemes : { - Brew : {} - }, - createdAt : undefined, - gDrive : false, - style : undefined, - trashed : false, - updatedAt : undefined, - views : 0 + createdAt : undefined, + gDrive : false, + style : undefined, + trashed : false, + updatedAt : undefined, + views : 0 }); expect(next).toHaveBeenCalled(); expect(api.getId).toHaveBeenCalledWith(req); @@ -600,7 +597,7 @@ brew`); expect(res.status).toHaveBeenCalledWith(200); }); }); - +////////////////////////////// describe('getBrewThemeWithUserParent', ()=>{ it('should collect parent theme and brew style - returning as css with user-theme parent imported.', async ()=>{ const toBrewPromise = (brew)=>new Promise((res)=>res({ toObject: ()=>brew })); @@ -643,7 +640,7 @@ brew`); expect(res.status).toHaveBeenCalledWith(404); }); }); - +//////////////////////////////// describe('deleteBrew', ()=>{ it('should handle case where fetching the brew returns an error', async ()=>{