added fetch mock

src/ConfigProvider.ts

@@ -2,7 +2,7 @@ import Config from "./models/Config"
 
 export default class ConfigProvider {
 
-    public static getConfig() {
+    public static getConfig(): Config {
         return ConfigProvider.config
     }
 

src/aquarius/Aquarius.ts

@@ -1,25 +1,21 @@
-import fetch from "node-fetch"
+import Config from "../models/Config"
-import ConfigProvider from "../ConfigProvider"
 import Logger from "../utils/Logger"
+import AquariusConnectorProvider from "./AquariusConnectorProvider"
 
 export default class Aquarius {
 
     private url: string
 
-    constructor() {
+    constructor(config: Config) {
 
-        this.url = ConfigProvider.getConfig().aquariusUri
+        this.url = config.aquariusUri
     }
 
     public async getAccessUrl(accessToken: any, payload: any): Promise<string> {
 
-        const accessUrl = await fetch(`${accessToken.service_endpoint}/${accessToken.resource_id}`, {
+        const accessUrl = await AquariusConnectorProvider.getConnector().post(
-            method: "POST",
+            `${accessToken.service_endpoint}/${accessToken.resource_id}`,
-            body: payload,
+            payload)
-            headers: {
-                "Content-type": "application/json",
-            },
-        })
             .then((response: any) => {
                 if (response.ok) {
                     return response.text()
@@ -39,13 +35,9 @@ export default class Aquarius {
 
     public async queryMetadata(query): Promise<any[]> {
 
-        const result = await fetch(this.url + "/api/v1/aquarius/assets/metadata/query", {
+        const result = await AquariusConnectorProvider.getConnector().post(
-            method: "POST",
+            this.url + "/api/v1/aquarius/assets/metadata/query",
-            body: JSON.stringify(query),
+            JSON.stringify(query))
-            headers: {
-                "Content-type": "application/json",
-            },
-        })
             .then((response: any) => {
                 if (response.ok) {
                     return response.json()

src/aquarius/AquariusConnector.ts

@@ -0,0 +1,14 @@
+import fetch from "node-fetch"
+
+export default class AquariusConnector {
+
+    public post(url, payload) {
+        return fetch(url, {
+            method: "POST",
+            body: payload,
+            headers: {
+                "Content-type": "application/json",
+            },
+        })
+    }
+}

src/aquarius/AquariusConnectorProvider.ts

@@ -0,0 +1,23 @@
+import Logger from "../utils/Logger"
+import AquariusConnector from "./AquariusConnector"
+
+export default class AquariusConnectorProvider {
+
+    public static setConnector(connector: AquariusConnector) {
+
+        Logger.log("setting", typeof connector.constructor.name)
+
+        AquariusConnectorProvider.connector = connector
+    }
+
+    public static getConnector() {
+
+        if (!AquariusConnectorProvider.connector) {
+            AquariusConnectorProvider.connector = new AquariusConnector()
+        }
+        Logger.log("getting", typeof AquariusConnectorProvider.connector.constructor.name)
+        return AquariusConnectorProvider.connector
+    }
+
+    private static connector: AquariusConnector = null
+}

src/aquarius/AquariusProvider.ts

@@ -1,3 +1,4 @@
+import ConfigProvider from "../ConfigProvider"
 import Aquarius from "./Aquarius"
 
 export default class AquariusProvider {
@@ -10,7 +11,7 @@ export default class AquariusProvider {
     public static getAquarius() {
 
         if (!AquariusProvider.aquarius) {
-            AquariusProvider.aquarius = new Aquarius()
+            AquariusProvider.aquarius = new Aquarius(ConfigProvider.getConfig())
         }
         return AquariusProvider.aquarius
     }

test/aquarius/Aquarius.test.ts

@@ -1,18 +1,18 @@
 import * as assert from "assert"
 import Aquarius from "../../src/aquarius/Aquarius"
-import ConfigProvider from "../../src/ConfigProvider"
+import AquariusConnectorProvider from "../../src/aquarius/AquariusConnectorProvider"
 import config from "../config"
+import AquariusConnectorMock from "../mocks/AquariusConnector.mock"
+
+before(() => {
+    AquariusConnectorProvider.setConnector(new AquariusConnectorMock())
+})
 
 describe("Aquarius", () => {
 
-    before(() => {
+    describe("#queryMetadata()", async () => {
 
-        ConfigProvider.setConfig(config)
+        const aquarius: Aquarius = new Aquarius(config)
-    })
-
-    describe("#queryMetadata()queryMetadata", async () => {
-
-        const aquarius: Aquarius = new Aquarius()
 
         const query = {
             offset: 100,

test/mocks/AquariusConnector.mock.ts

@@ -0,0 +1,17 @@
+import AquariusConnector from "../../src/aquarius/AquariusConnector"
+
+export default class AquariusConnectorMock extends AquariusConnector {
+
+    public async post(url: string, payload: any) {
+
+        return {
+            ok: true,
+            json: () => {
+                return []
+            },
+            text: () => {
+                return ""
+            },
+        }
+    }
+}

test/ocean/Asset.test.ts

@@ -23,7 +23,7 @@ describe("Asset", () => {
 
     before(async () => {
         ConfigProvider.setConfig(config)
-        AquariusProvider.setAquarius(new AquariusMock())
+        AquariusProvider.setAquarius(new AquariusMock(config))
 
         await ContractHandler.deployContracts()
         ocean = await Ocean.getInstance(config)

test/ocean/Ocean.test.ts

@@ -23,7 +23,7 @@ describe("Ocean", () => {
 
     before(async () => {
         ConfigProvider.setConfig(config)
-        AquariusProvider.setAquarius(new AquariusMock())
+        AquariusProvider.setAquarius(new AquariusMock(config))
         await ContractHandler.deployContracts()
         ocean = await Ocean.getInstance(config)
         accounts = await ocean.getAccounts()
@@ -31,7 +31,7 @@ describe("Ocean", () => {
         testPublisher = accounts[0]
         testAsset = new Asset(name, description, price, testPublisher)
     })
-    
+
     describe("#getInstance()", () => {
 
         it("should list accounts", async () => {

test/ocean/Order.test.ts

@@ -26,7 +26,7 @@ describe("Order", () => {
 
     before(async () => {
         ConfigProvider.setConfig(config)
-        AquariusProvider.setAquarius(new AquariusMock())
+        AquariusProvider.setAquarius(new AquariusMock(config))
         await ContractHandler.deployContracts()
         ocean = await Ocean.getInstance(config)
         accounts = await ocean.getAccounts()