From 644401cd5fee99d2f4e5e015ad21ac6c8bb054a2 Mon Sep 17 00:00:00 2001
From: bingenito <bingenito@users.noreply.github.com>
Date: Fri, 20 Apr 2018 09:40:32 -0400
Subject: [PATCH] Fix registry tests - Clear registry cache before each test
 instead of after - Mock internal container cached value when testing cached
 workflow to avoid race condition changing underlying value - Change
 TestContainer to have a condition that won't always resolve true unless
 matching option conditions are provided

---
 tests/unit/registry.spec.ts | 31 ++++++++++++++++---------------
 1 file changed, 16 insertions(+), 15 deletions(-)

diff --git a/tests/unit/registry.spec.ts b/tests/unit/registry.spec.ts
index f9d1b366..6da5c48b 100644
--- a/tests/unit/registry.spec.ts
+++ b/tests/unit/registry.spec.ts
@@ -2,15 +2,15 @@ import * as registry from "../../src/registry";
 import { Container } from "../../src/container";
 import { DefaultContainer } from "../../src/Default/default";
 
-function registerCallback(): boolean {
-    return true;
-}
+class TestContainer extends DefaultContainer {
+    static condition(options?: any): boolean {
+        return options && options.hostType === "Test";
+    }
 
-function createCallback(): DefaultContainer {
-    return new TestContainer();
-}
+    static create(): Container {
+        return new TestContainer();
+    }
 
-class TestContainer extends DefaultContainer {
     constructor() {
         super();
         this.hostType = "Test";
@@ -19,34 +19,35 @@ class TestContainer extends DefaultContainer {
 
 describe("registry", () => {
     describe("resolveContainer", () => {
-        afterEach(() => {
+        beforeEach(() => {
             registry.clearRegistry();
         });
 
         it("No matching condition resolves default", () => {
-            let container: Container = registry.resolveContainer();
+            let container: Container = registry.resolveContainer(true);
             expect(container).toBeDefined();
             expect(container.hostType).toEqual("Default");
         });
 
         it("Subsequent call returns from cache", () => {
-            let container: Container = registry.resolveContainer();
-            let container2: Container = registry.resolveContainer();
+            let container: Container = registry.resolveContainer(true);
+            spyOn(registry, "container").and.returnValue(container);
+            let container2: Container = registry.resolveContainer(); // Specifically testing cached value
             expect(container2).toBeDefined();
-            expect(container2).toEqual(container);
+            expect(container2.uuid).toEqual(container.uuid);
         });
 
         it("Resolves registered test container", () => {
-            registry.registerContainer("Test", { condition: registerCallback, create: createCallback });
+            registry.registerContainer("Test", { condition: TestContainer.condition, create: TestContainer.create });
 
-            let container: Container = registry.resolveContainer(true);
+            let container: Container = registry.resolveContainer(true, {hostType: "Test"});
             expect(container).toBeDefined();
             expect(container.hostType).toEqual("Test");
         });
 
         it("Error on resolve logs to console", () => {
             spyOn(console, "error");
-            registry.registerContainer("Test", { condition: () => { throw new Error("Forced Error") }, create: createCallback });
+            registry.registerContainer("Test", { condition: () => { throw new Error("Forced Error") }, create: TestContainer.create });
             let container: Container = registry.resolveContainer(true);
             expect(console.error).toHaveBeenCalledWith("Error resolving container 'Test': Error: Forced Error");
         });