fix(ViewController, NavController): Remove Circular references in View and NavControllerMocks

Issue-20

Author: stonelasley

src/angular/nav-controller.ts

@@ -1,4 +1,3 @@
-import {ViewControllerMock} from './view-controller';
 import {Observable} from 'rxjs/Observable';
 
 export class NavControllerMock {
@@ -54,7 +53,7 @@ export class NavControllerMock {
         instance.goToRoot.and.returnValue(Promise.resolve());
         instance.initPane.and.returnValue(1);
 
-        instance['root'] = ViewControllerMock.instance();
+        instance['root'] = {};
         instance['rootParams'] = {};
 
         instance.push.and.returnValue(Promise.resolve());
@@ -72,12 +71,12 @@ export class NavControllerMock {
         instance.canSwipeBack.and.returnValue(true);
         instance.canGoBack.and.returnValue(true);
         instance.isTransitioning.and.returnValue(false);
-        instance.getActive.and.returnValue(ViewControllerMock.instance());
+        instance.getActive.and.returnValue({});
         instance.isActive.and.returnValue(true);
-        instance.getByIndex.and.returnValue(ViewControllerMock.instance());
-        instance.getPrevious.and.returnValue(ViewControllerMock.instance());
-        instance.first.and.returnValue(ViewControllerMock.instance());
-        instance.last.and.returnValue(ViewControllerMock.instance());
+        instance.getByIndex.and.returnValue({});
+        instance.getPrevious.and.returnValue({});
+        instance.first.and.returnValue({});
+        instance.last.and.returnValue({});
         instance.indexOf.and.returnValue(0);
         instance.length.and.returnValue(0);
         instance.getViews.and.returnValue([]);

src/angular/view-controller.ts

@@ -1,12 +1,9 @@
 import {Observable}           from 'rxjs';
 import {NavParamsMock}        from './nav-params';
-import {NavControllerMock}    from './nav-controller';
 
 export class ViewControllerMock {
-    private static staticInstance: null;
 
     public static instance(): any {
-        if(ViewControllerMock.staticInstance == null) {
             let instance = jasmine.createSpyObj('ViewController', [
                 'willEnter',
                 'didEnter',
@@ -61,7 +58,7 @@ export class ViewControllerMock {
             instance.hasNavbar.and.returnValue(true);
             instance.index.and.returnValue(true);
             instance.subscribe.and.returnValue(Observable.of({}));
-            instance.getNav.and.returnValue(NavControllerMock.instance());
+            instance.getNav.and.returnValue({});
             instance.getIONContent.and.returnValue({});
 
             instance['writeReady'] = {
@@ -87,9 +84,6 @@ export class ViewControllerMock {
             instance['instance'] = {};
             instance['id'] = '';
 
-            ViewControllerMock.staticInstance = instance;
-        }
-
-        return ViewControllerMock.staticInstance;
+            return instance;
     }
 }