fix(tslint): incorrect constructor location

SteveVanOpstal · May 24, 2016 · cb8ea57 · cb8ea57
1 parent c14e2a3
commit cb8ea57
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 10 deletions.
diff --git a/package.json b/package.json
@@ -36,7 +36,7 @@
     "build:server:dev": "./node_modules/.bin/webpack --config config/webpack/server/dev.js --progress --profile --colors --display-error-details --display-cached",
     "prebuild:server:prod": "npm run clean:dist:server && npm run lint:server",
     "build:server:prod": "./node_modules/.bin/webpack --config config/webpack/server/prod.js --progress --profile --colors --display-error-details --display-cached --bail",
-    "prebuild:server:test": "npm run clean:dist:spec && npm run lint:test",
+    "prebuild:server:test": "npm run clean:dist:spec && npm run lint:server:test",
     "build:server:test": "./node_modules/.bin/webpack --config config/webpack/server/test.js --progress --profile --colors --display-error-details --display-cached",
     "start": "npm run server",
     "server": "npm run server:dev",
@@ -47,8 +47,10 @@
     "static-server": "npm run build:server:dev && node dist/server/static-server.js",
     "match-server": "npm run build:server:dev && node dist/server/match-server.js",
     "lint": "./node_modules/.bin/tslint src/**/*.ts",
-    "lint:client": "./node_modules/.bin/tslint src/app/**/*.ts -e **/*.spec.ts -e **/*.e2e.ts",
-    "lint:server": "./node_modules/.bin/tslint src/server/**/*.ts -e **/*.spec.ts -e **/*.e2e.ts",
+    "lint:client": "./node_modules/.bin/tslint src/app/**/*.ts -e **/*.spec.ts -e **/*.e2e.ts -e **/testing/**",
+    "lint:server": "./node_modules/.bin/tslint src/server/**/*.ts -e **/*.spec.ts -e **/*.e2e.ts -e **/testing/**",
+    "lint:client:test": "./node_modules/.bin/tslint src/app/**/*.spec.ts src/app/**/testing/**/*.ts",
+    "lint:server:test": "./node_modules/.bin/tslint src/server/**/*.spec.ts src/server/**/testing/**/*.ts",
     "lint:test": "./node_modules/.bin/tslint src/**/*.spec.ts src/**/testing/**/*.ts",
     "lint:e2e": "./node_modules/.bin/tslint src/**/*.e2e.ts",
     "pree2e": "npm run lint:e2e && npm run webdriver:update -- --standalone",
@@ -81,7 +83,7 @@
     "lru-cache": "4.0.1",
     "reflect-metadata": "0.1.2",
     "rxjs": "5.0.0-beta.6",
-    "tinytim": "0.1.1",
+    "glob": "^7.0.3",
     "zone.js": "0.6.12"
   },
   "devDependencies": {
@@ -105,6 +107,7 @@
     "json-loader": "^0.5.4",
     "karma": "^0.13.22",
     "karma-coverage": "^1.0.0",
+    "karma-jasmine": "^1.0.2",
     "karma-mocha-reporter": "^2.0.0",
     "karma-phantomjs-launcher": "^1.0.0",
     "karma-sourcemap-loader": "^0.3.7",
@@ -122,8 +125,6 @@
     "style-loader": "^0.13.1",
     "tslint": "^3.8.1",
     "tslint-loader": "^2.1.3",
-    "typescript": "^1.8.9",
-    "typescript-compiler": "^1.4.1-2",
     "typings": "^1.0.4",
     "webpack": "^1.12.14",
     "webpack-dev-server": "^1.14.1",

diff --git a/src/server/testing/mock_server.ts b/src/server/testing/mock_server.ts
@@ -35,6 +35,10 @@ export class MockServer extends Server {
   public response: Response;
   public mockCache: { url: string, data: any } = { url: '', data: '' };
 
+  constructor() {
+    super('', 1234);
+  }
+
   public sendRequest(url: string, region: string, callback: (response: Host.Response) => void): void {
     this.response.url = url;
     callback(this.response);
@@ -46,8 +50,4 @@ export class MockServer extends Server {
   }
 
   private preRun() { }
-
-  constructor() {
-    super('', 1234);
-  }
 }