fix(mocks): Extracted logger mock out to separate file so server does…

…n't try to import jasmine at runtime

src/browser/stores/http.store.spec.ts

@@ -3,7 +3,7 @@ import { MockBackend, MockConnection } from '@angular/http/testing';
 import { Http, BaseRequestOptions, Response } from '@angular/http';
 import { Injectable, Injector } from '@angular/core';
 import { Logger } from '../../common/services/logger.service';
-import { LoggerMock } from '../../common/services/logger.service.spec';
+import { LoggerMock } from '../../common/services/logger.service.mock';
 import { HttpStore } from './http.store';
 import { AbstractModel } from '../../common/models/model';
 import { Collection } from '../../common/models/collection';

src/common/services/logger.service.mock.ts

@@ -0,0 +1,17 @@
+import { Logger, LogLevel } from './logger.service';
+import { Injectable } from '@angular/core';
+import { Service } from '../registry/decorators';
+
+@Injectable()
+@Service()
+export class LoggerMock extends Logger {
+
+  constructor() {
+    super(LoggerMock);
+  }
+
+  public persistLog(logLevel: LogLevel, messages: any[]): this {
+    return this;
+  }
+
+}

src/common/services/logger.service.spec.ts

@@ -1,21 +1,7 @@
-import { Logger, LogLevel } from './logger.service';
+import { Logger } from './logger.service';
 import { Injectable } from '@angular/core';
 import { inject, addProviders } from '@angular/core/testing';
-import { Service } from '../registry/decorators';
-
-@Injectable()
-@Service()
-export class LoggerMock extends Logger {
-
-  constructor() {
-    super(LoggerMock);
-  }
-
-  public persistLog(logLevel: LogLevel, messages: any[]): this {
-    return this;
-  }
-
-}
+import { LoggerMock } from './logger.service.mock';
 
 @Injectable()
 class TestClass {

src/server/bootstrap/bootstrap.spec.ts

@@ -2,7 +2,7 @@ import { RemoteCliMock } from '../services/remoteCli.service.mock';
 import { RemoteCli } from '../services/remoteCli.service';
 import { ServerMock } from '../servers/abstract.server.spec';
 import { Logger } from '../../common/services/logger.service';
-import { LoggerMock } from '../../common/services/logger.service.spec';
+import { LoggerMock } from '../../common/services/logger.service.mock';
 import { Server } from '../servers/abstract.server';
 import { bootstrap, BootstrapResponse, deferredLog } from './index';
 import { registry } from '../../common/registry/entityRegistry';

src/server/bootstrap/bootstrap.ts

@@ -11,7 +11,7 @@ import { SeederBootstrapper } from './seeders.bootstrapper';
 import { EntityBootstrapper } from './entity.bootstrapper';
 import { MigrationBootstrapper } from './migrations.bootstrapper';
 import { ServiceBootstrapper } from './services.bootstrapper';
-import { LoggerMock } from '../../common/services/logger.service.spec';
+import { LoggerMock } from '../../common/services/logger.service.mock';
 
 export type ProviderType = Type | {
   [k: string]: any;

src/server/bootstrap/controllers.bootstrapper.spec.ts

@@ -4,7 +4,7 @@ import { RemoteCliMock } from '../services/remoteCli.service.mock';
 import { RemoteCli } from '../services/remoteCli.service';
 import { ServerMock } from '../servers/abstract.server.spec';
 import { Logger } from '../../common/services/logger.service';
-import { LoggerMock } from '../../common/services/logger.service.spec';
+import { LoggerMock } from '../../common/services/logger.service.mock';
 import { Server } from '../servers/abstract.server';
 import { bootstrap, BootstrapResponse } from './index';
 import { registry } from '../../common/registry/entityRegistry';

src/server/bootstrap/migrations.bootstrapper.spec.ts

@@ -4,7 +4,7 @@ import { RemoteCliMock } from '../services/remoteCli.service.mock';
 import { RemoteCli } from '../services/remoteCli.service';
 import { ServerMock } from '../servers/abstract.server.spec';
 import { Logger } from '../../common/services/logger.service';
-import { LoggerMock } from '../../common/services/logger.service.spec';
+import { LoggerMock } from '../../common/services/logger.service.mock';
 import { Server } from '../servers/abstract.server';
 import { bootstrap, BootstrapResponse } from './index';
 import { registry } from '../../common/registry/entityRegistry';

src/server/bootstrap/models.bootstrapper.spec.ts

@@ -4,7 +4,7 @@ import { RemoteCliMock } from '../services/remoteCli.service.mock';
 import { RemoteCli } from '../services/remoteCli.service';
 import { ServerMock } from '../servers/abstract.server.spec';
 import { Logger } from '../../common/services/logger.service';
-import { LoggerMock } from '../../common/services/logger.service.spec';
+import { LoggerMock } from '../../common/services/logger.service.mock';
 import { Server } from '../servers/abstract.server';
 import { bootstrap, BootstrapResponse } from './index';
 import { registry } from '../../common/registry/entityRegistry';

src/server/bootstrap/seeders.bootstrapper.spec.ts

@@ -4,7 +4,7 @@ import { RemoteCliMock } from '../services/remoteCli.service.mock';
 import { RemoteCli } from '../services/remoteCli.service';
 import { ServerMock } from '../servers/abstract.server.spec';
 import { Logger } from '../../common/services/logger.service';
-import { LoggerMock } from '../../common/services/logger.service.spec';
+import { LoggerMock } from '../../common/services/logger.service.mock';
 import { Server } from '../servers/abstract.server';
 import { bootstrap, BootstrapResponse } from './index';
 import { registry } from '../../common/registry/entityRegistry';

src/server/bootstrap/services.bootstrapper.spec.ts

@@ -1,7 +1,7 @@
 import { addProviders } from '@angular/core/testing';
 import { Injectable } from '@angular/core';
 import { Logger } from '../../common/services/logger.service';
-import { LoggerMock } from '../../common/services/logger.service.spec';
+import { LoggerMock } from '../../common/services/logger.service.mock';
 import { bootstrap, BootstrapResponse } from './index';
 import { registry } from '../../common/registry/entityRegistry';
 import { AbstractService } from '../../common/services/service';

src/server/controllers/abstract.controller.spec.ts

@@ -2,7 +2,7 @@ import { inject, addProviders, async } from '@angular/core/testing';
 import { Injectable } from '@angular/core';
 import { Logger } from '../../common/services/logger.service';
 import { Server, RouteConfig } from '../servers/abstract.server';
-import { LoggerMock } from '../../common/services/logger.service.spec';
+import { LoggerMock } from '../../common/services/logger.service.mock';
 import { ServerMock } from '../servers/abstract.server.spec';
 import { RemoteCli } from '../services/remoteCli.service';
 import { RemoteCliMock } from '../services/remoteCli.service.mock';

src/server/controllers/resource.controller.spec.ts

@@ -3,7 +3,7 @@ import { Injectable } from '@angular/core';
 import { ResourceController } from './resource.controller';
 import { Logger } from '../../common/services/logger.service';
 import { Server, RouteConfig } from '../servers/abstract.server';
-import { LoggerMock } from '../../common/services/logger.service.spec';
+import { LoggerMock } from '../../common/services/logger.service.mock';
 import { AbstractModel, identifier } from '../../common/models/model';
 import { ServerMock } from '../servers/abstract.server.spec';
 import { MockStore } from '../../common/stores/mock.store';

src/server/controllers/route.decorator.spec.ts

@@ -5,7 +5,7 @@ import { AbstractController } from '../controllers/abstract.controller';
 import { Injectable, Injector } from '@angular/core';
 import { Logger } from '../../common/services/logger.service';
 import { Server, RouteConfig } from '../servers/abstract.server';
-import { LoggerMock } from '../../common/services/logger.service.spec';
+import { LoggerMock } from '../../common/services/logger.service.mock';
 import { ServerMock } from '../servers/abstract.server.spec';
 import { RemoteCli } from '../services/remoteCli.service';
 import { RemoteCliMock } from '../services/remoteCli.service.mock';

src/server/middleware/debugLog.middleware.spec.ts

@@ -7,7 +7,7 @@ import { AbstractController } from '../controllers/abstract.controller';
 import { Injectable, Injector } from '@angular/core';
 import { Logger } from '../../common/services/logger.service';
 import { Server, RouteConfig } from '../servers/abstract.server';
-import { LoggerMock } from '../../common/services/logger.service.spec';
+import { LoggerMock } from '../../common/services/logger.service.mock';
 import { ServerMock } from '../servers/abstract.server.spec';
 import { RemoteCli } from '../services/remoteCli.service';
 import { RemoteCliMock } from '../services/remoteCli.service.mock';

src/server/middleware/middleware.spec.ts

@@ -8,7 +8,7 @@ import { AbstractController } from '../controllers/abstract.controller';
 import { Injectable, ReflectiveInjector } from '@angular/core';
 import { Logger } from '../../common/services/logger.service';
 import { Server, RouteConfig } from '../servers/abstract.server';
-import { LoggerMock } from '../../common/services/logger.service.spec';
+import { LoggerMock } from '../../common/services/logger.service.mock';
 import { ServerMock } from '../servers/abstract.server.spec';
 import { RemoteCli } from '../services/remoteCli.service';
 import { RemoteCliMock } from '../services/remoteCli.service.mock';

src/server/servers/abstract.server.spec.ts

@@ -3,7 +3,7 @@ import { RemoteCli } from '../services/remoteCli.service';
 import { Logger } from '../../common/services/logger.service';
 import { Injectable } from '@angular/core';
 import { inject, addProviders, async } from '@angular/core/testing';
-import { LoggerMock } from '../../common/services/logger.service.spec';
+import { LoggerMock } from '../../common/services/logger.service.mock';
 import { RemoteCliMock } from '../services/remoteCli.service.mock';
 import { Response } from '../controllers/response';
 import Spy = jasmine.Spy;

src/server/servers/express.server.spec.ts

@@ -2,7 +2,7 @@ import { Server, RouteConfig } from './abstract.server';
 import { RemoteCli } from '../services/remoteCli.service';
 import { Logger } from '../../common/services/logger.service';
 import { addProviders, inject, async } from '@angular/core/testing';
-import { LoggerMock } from '../../common/services/logger.service.spec';
+import { LoggerMock } from '../../common/services/logger.service.mock';
 import * as proxyquire from 'proxyquire';
 import { Response } from '../controllers/response';
 import { Request } from '../controllers/request';

src/server/servers/hapi.server.spec.ts

@@ -2,7 +2,7 @@ import { Server, RouteConfig } from './abstract.server';
 import { RemoteCli } from '../services/remoteCli.service';
 import { Logger } from '../../common/services/logger.service';
 import { addProviders, inject, async } from '@angular/core/testing';
-import { LoggerMock } from '../../common/services/logger.service.spec';
+import { LoggerMock } from '../../common/services/logger.service.mock';
 import { RemoteCliMock } from '../services/remoteCli.service.mock';
 import * as proxyquire from 'proxyquire';
 import { Response } from '../controllers/response';

src/server/services/database.service.spec.ts

@@ -3,7 +3,7 @@ import { Database } from './database.service';
 import { addProviders, inject, async } from '@angular/core/testing';
 import * as typeorm from 'typeorm';
 import { RemoteCli } from './remoteCli.service';
-import { LoggerMock } from '../../common/services/logger.service.spec';
+import { LoggerMock } from '../../common/services/logger.service.mock';
 import { RemoteCliMock } from './remoteCli.service.mock';
 import { registry } from '../../common/registry/entityRegistry';
 import Spy = jasmine.Spy;

src/server/services/remoteCli.service.spec.ts

@@ -3,7 +3,7 @@ import { Injector } from '@angular/core';
 import { RemoteCli } from './remoteCli.service';
 import { Logger } from '../../common/services/logger.service';
 import { addProviders, inject } from '@angular/core/testing';
-import { LoggerMock } from '../../common/services/logger.service.spec';
+import { LoggerMock } from '../../common/services/logger.service.mock';
 import { registry } from '../../common/registry/entityRegistry';
 import { Server, RouteConfig } from '../servers/abstract.server';
 import { ServerMock } from '../servers/abstract.server.spec';

src/server/stores/db.store.spec.ts

@@ -1,7 +1,7 @@
 import { Logger } from '../../common/services/logger.service';
 import { Injectable, Injector } from '@angular/core';
 import { inject, addProviders, async } from '@angular/core/testing';
-import { LoggerMock } from '../../common/services/logger.service.spec';
+import { LoggerMock } from '../../common/services/logger.service.mock';
 import { Database } from '../services/database.service';
 import { DatabaseStore } from './db.store';
 import { AbstractModel } from '../../common/models/model';