From: James Forsyth <jf2512@att.com>
Date: Wed, 10 Apr 2019 13:36:42 +0000 (+0000)
Subject: Merge "Fixing failing test + covarage improvement"
X-Git-Tag: 1.4.0~2
X-Git-Url: https://gerrit.onap.org/r/gitweb?p=aai%2Fsparky-fe.git;a=commitdiff_plain;h=6a47c2493c21c09df35df1f9f03474f8c2f8874a;hp=2ac895038dff9d8f4970f9963e49acc64f94810f

Merge "Fixing failing test + covarage improvement"
---

diff --git a/test/app/networking/NetworkCalls.test.js b/test/app/networking/NetworkCalls.test.js
index 373fbac..a3b6176 100644
--- a/test/app/networking/NetworkCalls.test.js
+++ b/test/app/networking/NetworkCalls.test.js
@@ -90,34 +90,53 @@ describe("Network Utils", () => {
 
   describe('#getRequest', () => {
     it("should fetch any request", () => {
-      const json = suite.sandbox.stub();
-      const fetchPromise = Promise.resolve({json});
-      global.fetch = suite.sandbox.stub();
-
-      global.fetch
-      .withArgs('URL', {
-        credentials: 'same-origin',
-        method: 'GET'
-      })
-      .returns(fetchPromise);
-
-      NetworkCalls.getRequest("URL", "GET");
-
-      return fetchPromise.then(() => {
-        sinon.assert.calledOnce(json);
-      });
+        // given
+        global.fetch = suite.sandbox.stub();
+        const json = suite.sandbox.stub();
+        const url = "localhost";
+
+        global.fetch
+            .withArgs(url, {
+                credentials: 'same-origin',
+                method: 'GET'
+            })
+            .returns(json);
+
+        // when
+        const request = NetworkCalls.getRequest(url, "GET");
+
+        //then
+        expect(request).toBe(json)
+        sinon.assert.calledOnce(global.fetch);
     });
   });
 
   describe('#genericRequest', () => {
     it('should fetch any generic request', () => {
+      // given
       global.fetch = suite.sandbox.stub();
       const then = suite.sandbox.stub();
       fetch.returns({then});
+
+      // when
       NetworkCalls.genericRequest("localhost", "/relativeUrl", "GET");
 
+      // then
       expect(then.firstCall.args[0]({json: () => "d"})).toEqual("d");
+      sinon.assert.calledOnce(fetch);
+    });
 
+    it('should fetch any generic request - non relative', () => {
+      // given
+      global.fetch = suite.sandbox.stub();
+      const then = suite.sandbox.stub();
+      fetch.returns({then});
+
+      // when
+      NetworkCalls.genericRequest("localhost", false, "GET");
+
+      // then
+      expect(then.firstCall.args[0]({json: () => "d"})).toEqual("d");
       sinon.assert.calledOnce(fetch);
     });
   });