From 1066acd9f2c04e47fce30f45e3923c36bf5a4560 Mon Sep 17 00:00:00 2001 From: Zak Henry Date: Mon, 4 Jul 2016 18:09:39 +0100 Subject: [PATCH] fix(mocks): Extracted logger mock out to separate file so server doesn't try to import jasmine at runtime --- src/browser/stores/http.store.spec.ts | 2 +- src/common/services/logger.service.mock.ts | 17 +++++++++++++++++ src/common/services/logger.service.spec.ts | 18 ++---------------- src/server/bootstrap/bootstrap.spec.ts | 2 +- src/server/bootstrap/bootstrap.ts | 2 +- .../bootstrap/controllers.bootstrapper.spec.ts | 2 +- .../bootstrap/migrations.bootstrapper.spec.ts | 2 +- .../bootstrap/models.bootstrapper.spec.ts | 2 +- .../bootstrap/seeders.bootstrapper.spec.ts | 2 +- .../bootstrap/services.bootstrapper.spec.ts | 2 +- .../controllers/abstract.controller.spec.ts | 2 +- .../controllers/resource.controller.spec.ts | 2 +- src/server/controllers/route.decorator.spec.ts | 2 +- .../middleware/debugLog.middleware.spec.ts | 2 +- src/server/middleware/middleware.spec.ts | 2 +- src/server/servers/abstract.server.spec.ts | 2 +- src/server/servers/express.server.spec.ts | 2 +- src/server/servers/hapi.server.spec.ts | 2 +- src/server/services/database.service.spec.ts | 2 +- src/server/services/remoteCli.service.spec.ts | 2 +- src/server/stores/db.store.spec.ts | 2 +- 21 files changed, 38 insertions(+), 35 deletions(-) create mode 100644 src/common/services/logger.service.mock.ts diff --git a/src/browser/stores/http.store.spec.ts b/src/browser/stores/http.store.spec.ts index 9154fe7..58d2726 100644 --- a/src/browser/stores/http.store.spec.ts +++ b/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'; diff --git a/src/common/services/logger.service.mock.ts b/src/common/services/logger.service.mock.ts new file mode 100644 index 0000000..24fae52 --- /dev/null +++ b/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; + } + +} diff --git a/src/common/services/logger.service.spec.ts b/src/common/services/logger.service.spec.ts index 3c990e6..317d450 100644 --- a/src/common/services/logger.service.spec.ts +++ b/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 { diff --git a/src/server/bootstrap/bootstrap.spec.ts b/src/server/bootstrap/bootstrap.spec.ts index c87d179..bb22dca 100644 --- a/src/server/bootstrap/bootstrap.spec.ts +++ b/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'; diff --git a/src/server/bootstrap/bootstrap.ts b/src/server/bootstrap/bootstrap.ts index 57f18f2..5641836 100644 --- a/src/server/bootstrap/bootstrap.ts +++ b/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; diff --git a/src/server/bootstrap/controllers.bootstrapper.spec.ts b/src/server/bootstrap/controllers.bootstrapper.spec.ts index 99b7b31..4f8c2f2 100644 --- a/src/server/bootstrap/controllers.bootstrapper.spec.ts +++ b/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'; diff --git a/src/server/bootstrap/migrations.bootstrapper.spec.ts b/src/server/bootstrap/migrations.bootstrapper.spec.ts index 42db52a..3883b32 100644 --- a/src/server/bootstrap/migrations.bootstrapper.spec.ts +++ b/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'; diff --git a/src/server/bootstrap/models.bootstrapper.spec.ts b/src/server/bootstrap/models.bootstrapper.spec.ts index c044223..99ad7ed 100644 --- a/src/server/bootstrap/models.bootstrapper.spec.ts +++ b/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'; diff --git a/src/server/bootstrap/seeders.bootstrapper.spec.ts b/src/server/bootstrap/seeders.bootstrapper.spec.ts index 5a85d23..767124a 100644 --- a/src/server/bootstrap/seeders.bootstrapper.spec.ts +++ b/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'; diff --git a/src/server/bootstrap/services.bootstrapper.spec.ts b/src/server/bootstrap/services.bootstrapper.spec.ts index 7645fb0..ca49e78 100644 --- a/src/server/bootstrap/services.bootstrapper.spec.ts +++ b/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'; diff --git a/src/server/controllers/abstract.controller.spec.ts b/src/server/controllers/abstract.controller.spec.ts index 8ceb1f2..129fa8d 100644 --- a/src/server/controllers/abstract.controller.spec.ts +++ b/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'; diff --git a/src/server/controllers/resource.controller.spec.ts b/src/server/controllers/resource.controller.spec.ts index 52e67d6..2d3e3e7 100644 --- a/src/server/controllers/resource.controller.spec.ts +++ b/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'; diff --git a/src/server/controllers/route.decorator.spec.ts b/src/server/controllers/route.decorator.spec.ts index 01bfb6a..00a5742 100644 --- a/src/server/controllers/route.decorator.spec.ts +++ b/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'; diff --git a/src/server/middleware/debugLog.middleware.spec.ts b/src/server/middleware/debugLog.middleware.spec.ts index 9e1677f..05ab134 100644 --- a/src/server/middleware/debugLog.middleware.spec.ts +++ b/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'; diff --git a/src/server/middleware/middleware.spec.ts b/src/server/middleware/middleware.spec.ts index 0829a35..186af76 100644 --- a/src/server/middleware/middleware.spec.ts +++ b/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'; diff --git a/src/server/servers/abstract.server.spec.ts b/src/server/servers/abstract.server.spec.ts index 3a84bca..49bb13c 100644 --- a/src/server/servers/abstract.server.spec.ts +++ b/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; diff --git a/src/server/servers/express.server.spec.ts b/src/server/servers/express.server.spec.ts index 69f776c..dfe0956 100644 --- a/src/server/servers/express.server.spec.ts +++ b/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'; diff --git a/src/server/servers/hapi.server.spec.ts b/src/server/servers/hapi.server.spec.ts index 30eea35..3c482d9 100644 --- a/src/server/servers/hapi.server.spec.ts +++ b/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'; diff --git a/src/server/services/database.service.spec.ts b/src/server/services/database.service.spec.ts index dbf7fea..a6c24d2 100644 --- a/src/server/services/database.service.spec.ts +++ b/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; diff --git a/src/server/services/remoteCli.service.spec.ts b/src/server/services/remoteCli.service.spec.ts index 59f0a3c..98dcfe2 100644 --- a/src/server/services/remoteCli.service.spec.ts +++ b/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'; diff --git a/src/server/stores/db.store.spec.ts b/src/server/stores/db.store.spec.ts index 60edd55..804a8e8 100644 --- a/src/server/stores/db.store.spec.ts +++ b/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';