Refactored to leverage AndcultureCode.JavaScript.Testing - fixes issue #8

Author: wintondeshong

package-lock.json

@@ -20,6 +20,7 @@
         "@types/lodash": "4.14.108",
         "@types/node": "13.11.0",
         "@types/rosie": "0.0.37",
+        "andculturecode-javascript-testing": "0.0.1",
         "jest": "25.5.4",
         "jest-extended": "0.11.5",
         "prettier": "1.19.1",

package.json

@@ -1,17 +1,2 @@
-export default {
-    defaults: {
-        headers: {
-            post: {},
-            put: {},
-        },
-    },
-    delete: jest.fn(() => Promise.resolve({ data: {} })),
-    get: jest.fn(() => Promise.resolve({ data: {} })),
-    interceptors: {
-        response: {
-            use: jest.fn(),
-        },
-    },
-    post: jest.fn(() => Promise.resolve({ data: {} })),
-    put: jest.fn(() => Promise.resolve({ data: {} })),
-};
+// Hook into jest mocking, but re-export from core
+export * from "andculturecode-javascript-testing/dist/mocks/axios";

src/__mocks__/axios.ts

@@ -34,14 +34,9 @@ export * from "./interfaces/service-response";
 // -----------------------------------------------------------------------------------------
 
 // factories
-export * from "./tests/factories/axios-response-factory";
 export * from "./tests/factories/factory-type";
 export * from "./tests/factories/stub-resource-record-factory";
 
-// mocks
-export * from "./__mocks__/axios";
-export * from "./tests/mocks/mock-axios";
-
 // stubs
 export * from "./tests/stubs/stub-resource";
 export * from "./tests/stubs/stub-resource-record";

src/index.ts

@@ -1,5 +1,4 @@
 const FactoryType = {
-    AxiosResponse: "AxiosResponse",
     StubResourceRecord: "StubResourceRecord",
 };
 

src/tests/factories/axios-response-factory.ts

@@ -1,2 +1,2 @@
-export * from "./axios-response-factory";
+export { AxiosResponseFactory } from "andculturecode-javascript-testing";
 export * from "./stub-resource-record-factory";

src/tests/factories/factory-type.ts

@@ -3,6 +3,7 @@ import { StubResourceRecord } from "../tests/stubs/stub-resource-record";
 import { Factory } from "rosie";
 import { AxiosResponse } from "axios";
 import { FactoryType } from "../tests/factories/factory-type";
+import { FactoryType as AndcultureCodeFactoryType } from "andculturecode-javascript-testing";
 import { ResultRecord } from "../view-models/result-record";
 import "jest-extended";
 
@@ -37,7 +38,7 @@ describe("ServiceUtils", () => {
         test("when response.data is undefined, it returns the mapped resultObject as undefined", () => {
             // Arrange
             const axiosResponse = Factory.build<AxiosResponse>(
-                FactoryType.AxiosResponse,
+                AndcultureCodeFactoryType.AxiosResponse,
                 { data: undefined }
             );
 
@@ -54,7 +55,7 @@ describe("ServiceUtils", () => {
         test("when response.data is null, it returns the mapped resultObject as undefined", () => {
             // Arrange
             const axiosResponse = Factory.build<AxiosResponse>(
-                FactoryType.AxiosResponse,
+                AndcultureCodeFactoryType.AxiosResponse,
                 { data: null }
             );
 
@@ -71,7 +72,7 @@ describe("ServiceUtils", () => {
         test("when response.data.resultObject is undefined, it returns the mapped resultObject as undefined", () => {
             // Arrange
             const axiosResponse = Factory.build<AxiosResponse>(
-                FactoryType.AxiosResponse,
+                AndcultureCodeFactoryType.AxiosResponse,
                 {
                     data: {
                         resultObject: undefined,
@@ -92,7 +93,7 @@ describe("ServiceUtils", () => {
         test("when response.data.resultObject is null, it returns the mapped resultObject as undefined", () => {
             // Arrange
             const axiosResponse = Factory.build<AxiosResponse>(
-                FactoryType.AxiosResponse,
+                AndcultureCodeFactoryType.AxiosResponse,
                 {
                     data: {
                         resultObject: null,
@@ -113,7 +114,7 @@ describe("ServiceUtils", () => {
         test("it returns rowCount as 1", () => {
             // Arrange
             const axiosResponse = Factory.build<AxiosResponse>(
-                FactoryType.AxiosResponse
+                AndcultureCodeFactoryType.AxiosResponse
             );
 
             // Act
@@ -129,7 +130,7 @@ describe("ServiceUtils", () => {
         test("it returns the mapped status from the original response", () => {
             // Arrange
             const axiosResponse = Factory.build<AxiosResponse>(
-                FactoryType.AxiosResponse
+                AndcultureCodeFactoryType.AxiosResponse
             );
 
             // Act
@@ -145,7 +146,7 @@ describe("ServiceUtils", () => {
         test("it returns result as a ResultRecord", () => {
             // Arrange
             const axiosResponse = Factory.build<AxiosResponse>(
-                FactoryType.AxiosResponse
+                AndcultureCodeFactoryType.AxiosResponse
             );
 
             // Act
@@ -191,7 +192,7 @@ describe("ServiceUtils", () => {
         test("when response.data is undefined, it returns the mapped resultObjects as undefined", () => {
             // Arrange
             const axiosResponse = Factory.build<AxiosResponse>(
-                FactoryType.AxiosResponse,
+                AndcultureCodeFactoryType.AxiosResponse,
                 { data: undefined }
             );
 
@@ -208,7 +209,7 @@ describe("ServiceUtils", () => {
         test("when response.data is null, it returns the mapped resultObjects as undefined", () => {
             // Arrange
             const axiosResponse = Factory.build<AxiosResponse>(
-                FactoryType.AxiosResponse,
+                AndcultureCodeFactoryType.AxiosResponse,
                 { data: null }
             );
 
@@ -225,7 +226,7 @@ describe("ServiceUtils", () => {
         test("when response.data.resultObject is undefined, it returns the mapped resultObjects as undefined", () => {
             // Arrange
             const axiosResponse = Factory.build<AxiosResponse>(
-                FactoryType.AxiosResponse,
+                AndcultureCodeFactoryType.AxiosResponse,
                 {
                     data: {
                         resultObject: undefined,
@@ -246,7 +247,7 @@ describe("ServiceUtils", () => {
         test("when response.data.resultObject is null, it returns the mapped resultObjects as undefined", () => {
             // Arrange
             const axiosResponse = Factory.build<AxiosResponse>(
-                FactoryType.AxiosResponse,
+                AndcultureCodeFactoryType.AxiosResponse,
                 {
                     data: {
                         resultObject: null,
@@ -271,7 +272,7 @@ describe("ServiceUtils", () => {
                 2
             );
             const axiosResponse = Factory.build<AxiosResponse>(
-                FactoryType.AxiosResponse,
+                AndcultureCodeFactoryType.AxiosResponse,
                 {
                     data: {
                         resultObject: resultObject,
@@ -292,7 +293,7 @@ describe("ServiceUtils", () => {
         test("it returns the mapped status from the original response", () => {
             // Arrange
             const axiosResponse = Factory.build<AxiosResponse>(
-                FactoryType.AxiosResponse
+                AndcultureCodeFactoryType.AxiosResponse
             );
 
             // Act
@@ -308,7 +309,7 @@ describe("ServiceUtils", () => {
         test("it returns results as a ResultRecord", () => {
             // Arrange
             const axiosResponse = Factory.build<AxiosResponse>(
-                FactoryType.AxiosResponse
+                AndcultureCodeFactoryType.AxiosResponse
             );
 
             // Act