From fe7017f83c6e7793a787d6cf14cefe2653d386c6 Mon Sep 17 00:00:00 2001 From: carlosjr Date: Mon, 1 Mar 2021 22:21:04 +0100 Subject: [PATCH] final amends on tests and model descriptions --- .../starred-module/getStarredModules.js | 2 +- .../starred-module/toggleStarredModule.js | 2 +- front/salix/components/home/home.js | 2 +- front/salix/components/home/home.spec.js | 22 +++++++++++++++---- 4 files changed, 21 insertions(+), 7 deletions(-) diff --git a/back/methods/starred-module/getStarredModules.js b/back/methods/starred-module/getStarredModules.js index 51bf16d524..816a355d76 100644 --- a/back/methods/starred-module/getStarredModules.js +++ b/back/methods/starred-module/getStarredModules.js @@ -1,6 +1,6 @@ module.exports = function(Self) { Self.remoteMethodCtx('getStarredModules', { - description: 'returns the receved modules adding the starred property.', + description: 'returns the starred modules for the current user', returns: { type: 'object', root: true diff --git a/back/methods/starred-module/toggleStarredModule.js b/back/methods/starred-module/toggleStarredModule.js index 6c529f8951..e44625bee6 100644 --- a/back/methods/starred-module/toggleStarredModule.js +++ b/back/methods/starred-module/toggleStarredModule.js @@ -1,6 +1,6 @@ module.exports = function(Self) { Self.remoteMethodCtx('toggleStarredModule', { - description: 'returns the receved modules adding the starred property.', + description: 'creates or deletes a starred module for the current user', returns: { type: 'object', root: true diff --git a/front/salix/components/home/home.js b/front/salix/components/home/home.js index 1e34a2e0cd..90eed2b30e 100644 --- a/front/salix/components/home/home.js +++ b/front/salix/components/home/home.js @@ -48,12 +48,12 @@ export default class Controller extends Component { const params = {moduleName: module.name}; const query = `starredModules/toggleStarredModule`; this.$http.post(query, params).then(res => { - this.vnApp.showSuccess(this.$t('Data saved!')); if (res.data) module.starred = true; else module.starred = false; + this.vnApp.showSuccess(this.$t('Data saved!')); this.countModules(); }); } diff --git a/front/salix/components/home/home.spec.js b/front/salix/components/home/home.spec.js index ff61e8b0f1..362676d93f 100644 --- a/front/salix/components/home/home.spec.js +++ b/front/salix/components/home/home.spec.js @@ -46,16 +46,30 @@ describe('Salix Component vnHome', () => { describe('toggleStarredModule()', () => { it(`should set the received module as starred if it wasn't starred`, () => { - const expectedResponse = []; + const expectedResponse = [{id: 1, moduleFk: 'Clients', workerFk: 9}]; + const event = new Event('target'); controller._modules = [{module: 'client', name: 'Clients'}]; $httpBackend.whenRoute('GET', 'starredModules/getStarredModules').respond(expectedResponse); - $httpBackend.expectGET('starredModules/getStarredModules').respond(expectedResponse); - controller.getStarredModules(); + $httpBackend.expectPOST('starredModules/toggleStarredModule').respond(expectedResponse); + controller.toggleStarredModule(controller._modules[0], event); $httpBackend.flush(); expect(controller._modules.length).toEqual(1); - expect(controller._modules[0].starred).toBeUndefined(); + expect(controller._modules[0].starred).toBe(true); + }); + + it(`should set the received module as regular if it was starred`, () => { + const event = new Event('target'); + controller._modules = [{module: 'client', name: 'Clients', starred: true}]; + + $httpBackend.whenRoute('GET', 'starredModules/getStarredModules').respond([]); + $httpBackend.expectPOST('starredModules/toggleStarredModule').respond(undefined); + controller.toggleStarredModule(controller._modules[0], event); + $httpBackend.flush(); + + expect(controller._modules.length).toEqual(1); + expect(controller._modules[0].starred).toBe(false); }); }); });