Fix: ESLint errors

unlight · Jul 1, 2018 · c5f60fb · c5f60fb
1 parent de14fc3
commit c5f60fb
Show file tree

Hide file tree

Showing 12 changed files with 26 additions and 11 deletions.
diff --git a/package.json b/package.json
@@ -6,8 +6,7 @@
   "main": "dist/index.js",
   "typings": "src/index.ts",
   "scripts": {
-    "t": "npm run mocha -- src/*.spec.ts",
-    "test": "npm run eslint && npm run tscheck && npm run t",
+    "test": "npm run eslint && npm run tscheck && npm run test:r",
     "test:r": "npm run mocha -- src/*.spec.ts",
     "mocha": "node -r ts-node/register/transpile-only node_modules/mocha/bin/_mocha",
     "test:w": "npm run mocha -- --watch-extensions ts --watch src/**/*.spec.ts",

diff --git a/src/index.spec.ts b/src/index.spec.ts
@@ -1,6 +1,8 @@
 import * as assert from 'assert';
 import * as lib from './index';
 
+const root = process.cwd();
+
 let service: ReturnType<typeof lib.createService>;
 
 it('smoke', () => {
@@ -10,13 +12,13 @@ it('smoke', () => {
 describe('create service', () => {
 
     before(() => {
-        const configFile = `${__dirname}/test-project/tsconfig.json`;
+        const configFile = `${root}/test-project/tsconfig.json`;
         service = lib.createService({ configFile });
         assert(service);
     });
 
     it('errors', () => {
-        const testFile = `${__dirname}/test-project/errors.ts`;
+        const testFile = `${root}/test-project/errors.ts`;
         service.update({ fileName: testFile });
         const sourceFile = service.getProgram().getSourceFile(testFile);
         assert(sourceFile);
@@ -27,7 +29,7 @@ describe('create service', () => {
     });
 
     it('number', () => {
-        const testFile = `${__dirname}/test-project/number.ts`;
+        const testFile = `${root}/test-project/number.ts`;
         service.update({ fileName: testFile });
         const sourceFile = service.getProgram().getSourceFile(testFile);
         assert(sourceFile);
@@ -36,7 +38,7 @@ describe('create service', () => {
     });
 
     it('built in', () => {
-        const testFile = `${__dirname}/test-project/builtin.ts`;
+        const testFile = `${root}/test-project/builtin.ts`;
         service.update({ fileName: testFile });
         const sourceFile = service.getProgram().getSourceFile(testFile);
         assert(sourceFile);
@@ -45,7 +47,7 @@ describe('create service', () => {
     });
 
     it('types', () => {
-        const testFile = `${__dirname}/test-project/types.ts`;
+        const testFile = `${root}/test-project/types.ts`;
         service.update({ fileName: testFile });
         const sourceFile = service.getProgram().getSourceFile(testFile);
         assert(sourceFile);
@@ -54,7 +56,7 @@ describe('create service', () => {
     });
 
     it('decorator', () => {
-        const testFile = `${__dirname}/test-project/decorator.ts`;
+        const testFile = `${root}/test-project/decorator.ts`;
         service.update({ fileName: testFile });
         const sourceFile = service.getProgram().getSourceFile(testFile);
         assert(sourceFile);
@@ -63,7 +65,7 @@ describe('create service', () => {
     });
 
     it('global types', () => {
-        const testFile = `${__dirname}/test-project/global-types.ts`;
+        const testFile = `${root}/test-project/global-types.ts`;
         service.update({ fileName: testFile });
         const sourceFile = service.getProgram().getSourceFile(testFile);
         assert(sourceFile);
@@ -72,7 +74,7 @@ describe('create service', () => {
     });
 
     it('date', () => {
-        const testFile = `${__dirname}/test-project/date.ts`;
+        const testFile = `${root}/test-project/date.ts`;
         service.update({ fileName: testFile });
         const sourceFile = service.getProgram().getSourceFile(testFile);
         assert(sourceFile);
@@ -83,7 +85,7 @@ describe('create service', () => {
 });
 
 it('create service no libs', () => {
-    const configFile = `${__dirname}/test-project/tsconfig-nolibs.json`;
+    const configFile = `${root}/test-project/tsconfig-nolibs.json`;
     service = lib.createService({ configFile });
     assert(service);
 });
diff --git a/test-project/.eslintrc.js b/test-project/.eslintrc.js
@@ -0,0 +1,14 @@
+module.exports = {
+    'root': true,
+    'env': {
+        'es6': true,
+        'node': true
+    },
+    'parser': 'typescript-eslint-parser',
+    'parserOptions': {
+        'ecmaVersion': 2017,
+        'sourceType': 'module'
+    },
+    'rules': {
+    }
+};
diff --git a/src/test-project/builtin.ts → test-project/builtin.ts b/src/test-project/builtin.ts → test-project/builtin.ts
diff --git a/src/test-project/date.ts → test-project/date.ts b/src/test-project/date.ts → test-project/date.ts
diff --git a/src/test-project/decorator.ts → test-project/decorator.ts b/src/test-project/decorator.ts → test-project/decorator.ts
diff --git a/src/test-project/errors.ts → test-project/errors.ts b/src/test-project/errors.ts → test-project/errors.ts
diff --git a/src/test-project/global-types.ts → test-project/global-types.ts b/src/test-project/global-types.ts → test-project/global-types.ts
diff --git a/src/test-project/number.ts → test-project/number.ts b/src/test-project/number.ts → test-project/number.ts
diff --git a/src/test-project/tsconfig-nolibs.json → test-project/tsconfig-nolibs.json b/src/test-project/tsconfig-nolibs.json → test-project/tsconfig-nolibs.json
diff --git a/src/test-project/tsconfig.json → test-project/tsconfig.json b/src/test-project/tsconfig.json → test-project/tsconfig.json
diff --git a/src/test-project/types.ts → test-project/types.ts b/src/test-project/types.ts → test-project/types.ts