From 61408bdfd576573bcd849c495383fff3d5df2ad5 Mon Sep 17 00:00:00 2001
From: Joan Sanchez <joan@verdnatura.es>
Date: Fri, 20 Dec 2019 09:30:35 +0100
Subject: [PATCH] updated tests

---
 modules/claim/front/action/index.js      |  8 ++++--
 modules/claim/front/action/index.spec.js | 36 ++++++++++++++++++++++--
 2 files changed, 40 insertions(+), 4 deletions(-)

diff --git a/modules/claim/front/action/index.js b/modules/claim/front/action/index.js
index 873a783d7..23e69bbe9 100644
--- a/modules/claim/front/action/index.js
+++ b/modules/claim/front/action/index.js
@@ -141,6 +141,8 @@ class Controller {
         const query = `GreugeTypes/findOne?${serializedParams}`;
         return this.$http.get(query).then(res => {
             this.greugeTypeFreightId = res.data.id;
+
+            return res;
         });
     }
 
@@ -148,6 +150,8 @@ class Controller {
         const query = `GreugeConfigs/findOne`;
         return this.$http.get(query).then(res => {
             this.freightPickUpPrice = res.data.freightPickUpPrice;
+
+            return res;
         });
     }
 
@@ -158,7 +162,7 @@ class Controller {
             promises.push(this.getGreugeTypeId());
             promises.push(this.getGreugeConfig());
 
-            Promise.all(promises).then(() => {
+            return Promise.all(promises).then(() => {
                 const data = {
                     clientFk: this.claim.clientFk,
                     description: this.$translate.instant('ClaimGreugeDescription', {
@@ -168,7 +172,7 @@ class Controller {
                     greugeTypeFk: this.greugeTypeFreightId,
                     ticketFk: this.claim.ticketFk
                 };
-                this.$http.post(`Greuges/`, data).then(() => {
+                return this.$http.post(`Greuges/`, data).then(() => {
                     this.vnApp.showSuccess(this.$translate.instant('Data saved!'));
                     this.vnApp.showMessage(this.$translate.instant('Greuge inserted'));
                 });
diff --git a/modules/claim/front/action/index.spec.js b/modules/claim/front/action/index.spec.js
index dfa680bef..b93809750 100644
--- a/modules/claim/front/action/index.spec.js
+++ b/modules/claim/front/action/index.spec.js
@@ -165,7 +165,7 @@ describe('claim', () => {
                 expect(controller.vnApp.showSuccess).not.toHaveBeenCalledWith('Greuge inserted!');
             });
 
-            it('should perform a insert into greuges', () => {
+            it('should make a query and get the greugeTypeId and greuge config', () => {
                 spyOn(controller.card, 'reload');
                 spyOn(controller.vnApp, 'showSuccess');
 
@@ -173,12 +173,44 @@ describe('claim', () => {
                 $httpBackend.expect('GET', `GreugeTypes/findOne?${greugeTypeParams}`).respond({id: 7});
                 $httpBackend.expect('GET', `GreugeConfigs/findOne`).respond({freightPickUpPrice: 11});
                 controller.onUpdateGreugeResponse('accept');
-
                 $httpBackend.flush();
 
                 expect(controller.greugeTypeFreightId).toEqual(7);
                 expect(controller.freightPickUpPrice).toEqual(11);
             });
+
+            // #1957 - Investigate how to test nested httpBackend requests
+            xit('should perform a insert into greuges', () => {
+                spyOn(controller.card, 'reload');
+                spyOn(controller.vnApp, 'showSuccess');
+
+                spyOn(controller, 'getGreugeTypeId').and.returnValue(new Promise(resolve => {
+                    return resolve({id: 7});
+                }));
+                spyOn(controller, 'getGreugeConfig').and.returnValue(new Promise(resolve => {
+                    return resolve({freightPickUpPrice: 11});
+                }));
+
+                controller.claim.clientFk = 101;
+                controller.claim.id = 11;
+                let data = {
+                    clientFk: 101,
+                    description: `claim: ${controller.claim.id}`,
+                    amount: 11,
+                    greugeTypeFk: 7,
+                    ticketFk: controller.claim.ticketFk
+                };
+                $httpBackend.expect('POST', `Greuges/`, data).respond(new Promise(resolve => {
+                    return resolve({id: 11});
+                }));
+                controller.onUpdateGreugeResponse('accept').then(res => {
+                    console.log('asdas');
+                }).catch(error => {
+                    console.log('errorrrr!!');
+                });
+
+                $httpBackend.flush();
+            });
         });
     });
 });