From fec68e621147e31c6ba5370ce0126d7e9b86461c Mon Sep 17 00:00:00 2001 From: Phillip Thelen Date: Wed, 19 Jun 2024 16:02:03 +0200 Subject: [PATCH] fix tests --- test/api/unit/libs/items/utils.test.js | 2 +- .../unit/middlewares/ensureDevelopmentMode.js | 17 +++++++++-------- .../unit/middlewares/ensureTimeTravelMode.js | 17 +++++++++-------- 3 files changed, 19 insertions(+), 17 deletions(-) diff --git a/test/api/unit/libs/items/utils.test.js b/test/api/unit/libs/items/utils.test.js index d1bf1f126e..9ff116ef95 100644 --- a/test/api/unit/libs/items/utils.test.js +++ b/test/api/unit/libs/items/utils.test.js @@ -117,7 +117,7 @@ describe('Items Utils', () => { it('converts values for owned gear to true/false', () => { expect(castItemVal('items.gear.owned.shield_warrior_0', 'true')).to.equal(true); expect(castItemVal('items.gear.owned.invalid', 'false')).to.equal(false); - expect(castItemVal('items.gear.owned.invalid', 'null')).to.equal(false); + expect(castItemVal('items.gear.owned.invalid', 'null')).to.equal(undefined); expect(castItemVal('items.gear.owned.invalid', 'truthy')).to.equal(true); expect(castItemVal('items.gear.owned.invalid', 0)).to.equal(false); }); diff --git a/test/api/unit/middlewares/ensureDevelopmentMode.js b/test/api/unit/middlewares/ensureDevelopmentMode.js index b3911f9ecd..da5d2cffc0 100644 --- a/test/api/unit/middlewares/ensureDevelopmentMode.js +++ b/test/api/unit/middlewares/ensureDevelopmentMode.js @@ -9,18 +9,19 @@ import ensureDevelopmentMode from '../../../../website/server/middlewares/ensure import { NotFound } from '../../../../website/server/libs/errors'; describe('developmentMode middleware', () => { - let res; let req; let - next; + let res; let req; let next; + let nconfStub; beforeEach(() => { res = generateRes(); req = generateReq(); next = generateNext(); + nconfStub = sandbox.stub(nconf, 'get'); }); it('returns not found when on production URL', () => { - sandbox.stub(nconf, 'get').withArgs('DEBUG_ENABLED').returns(true); - sandbox.stub(nconf, 'get').withArgs('BASE_URL').returns('https://habitica.com'); + nconfStub.withArgs('DEBUG_ENABLED').returns(true); + nconfStub.withArgs('BASE_URL').returns('https://habitica.com'); ensureDevelopmentMode(req, res, next); @@ -29,8 +30,8 @@ describe('developmentMode middleware', () => { }); it('returns not found when intentionally disabled', () => { - sandbox.stub(nconf, 'get').withArgs('DEBUG_ENABLED').returns(false); - sandbox.stub(nconf, 'get').withArgs('BASE_URL').returns('http://localhost:3000'); + nconfStub.withArgs('DEBUG_ENABLED').returns(false); + nconfStub.withArgs('BASE_URL').returns('http://localhost:3000'); ensureDevelopmentMode(req, res, next); @@ -39,8 +40,8 @@ describe('developmentMode middleware', () => { }); it('passes when enabled and on non-production URL', () => { - sandbox.stub(nconf, 'get').withArgs('DEBUG_ENABLED').returns(true); - sandbox.stub(nconf, 'get').withArgs('BASE_URL').returns('http://localhost:3000'); + nconfStub.withArgs('DEBUG_ENABLED').returns(true); + nconfStub.withArgs('BASE_URL').returns('http://localhost:3000'); ensureDevelopmentMode(req, res, next); diff --git a/test/api/unit/middlewares/ensureTimeTravelMode.js b/test/api/unit/middlewares/ensureTimeTravelMode.js index 4a9fa6f56b..6be7d5f4eb 100644 --- a/test/api/unit/middlewares/ensureTimeTravelMode.js +++ b/test/api/unit/middlewares/ensureTimeTravelMode.js @@ -9,18 +9,19 @@ import { NotFound } from '../../../../website/server/libs/errors'; import ensureTimeTravelMode from '../../../../website/server/middlewares/ensureTimeTravelMode'; describe('timetravelMode middleware', () => { - let res; let req; let - next; + let res; let req; let next; + let nconfStub; beforeEach(() => { res = generateRes(); req = generateReq(); next = generateNext(); + nconfStub = sandbox.stub(nconf, 'get'); }); it('returns not found when using production URL', () => { - sandbox.stub(nconf, 'get').withArgs('TIME_TRAVEL_ENABLED').returns(false); - sandbox.stub(nconf, 'get').withArgs('BASE_URL').returns('https://habitica.com'); + nconfStub.withArgs('TIME_TRAVEL_ENABLED').returns(false); + nconfStub.withArgs('BASE_URL').returns('https://habitica.com'); ensureTimeTravelMode(req, res, next); @@ -29,8 +30,8 @@ describe('timetravelMode middleware', () => { }); it('returns not found when not in time travel mode', () => { - sandbox.stub(nconf, 'get').withArgs('TIME_TRAVEL_ENABLED').returns(false); - sandbox.stub(nconf, 'get').withArgs('BASE_URL').returns('http://localhost:3000'); + nconfStub.withArgs('TIME_TRAVEL_ENABLED').returns(false); + nconfStub.withArgs('BASE_URL').returns('http://localhost:3000'); ensureTimeTravelMode(req, res, next); @@ -39,8 +40,8 @@ describe('timetravelMode middleware', () => { }); it('passes when in time travel mode', () => { - sandbox.stub(nconf, 'get').withArgs('TIME_TRAVEL_ENABLED').returns(true); - sandbox.stub(nconf, 'get').withArgs('BASE_URL').returns('http://localhost:3000'); + nconfStub.withArgs('TIME_TRAVEL_ENABLED').returns(true); + nconfStub.withArgs('BASE_URL').returns('http://localhost:3000'); ensureTimeTravelMode(req, res, next);