test: resolve gtsRootDir in tests

This ensures that the tests are independent of where they are run from. Remove test that was unnecessary.
google · Jun 1, 2018 · 05a1686 · 05a1686
1 parent 86ffb3b
commit 05a1686
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 19 deletions.
diff --git a/test/test-clean.ts b/test/test-clean.ts
@@ -25,7 +25,7 @@ import {nop} from '../src/util';
 import {withFixtures} from './fixtures';
 
 const OPTIONS: Options = {
-  gtsRootDir: './',
+  gtsRootDir: path.resolve(__dirname, '../..'),
   targetRootDir: './',
   dryRun: false,
   yes: false,

diff --git a/test/test-format.ts b/test/test-format.ts
@@ -15,6 +15,7 @@
  */
 
 import test from 'ava';
+import * as path from 'path';
 
 import {Options} from '../src/cli';
 import * as format from '../src/format';
@@ -26,7 +27,7 @@ import {withFixtures} from './fixtures';
 const BAD_CODE = 'export const foo = 2;  ';
 
 const OPTIONS: Options = {
-  gtsRootDir: './',
+  gtsRootDir: path.resolve(__dirname, '../..'),
   targetRootDir: './',
   dryRun: false,
   yes: false,

diff --git a/test/test-lint.ts b/test/test-lint.ts
@@ -15,6 +15,7 @@
  */
 
 import test from 'ava';
+import * as path from 'path';
 
 import {Options} from '../src/cli';
 import * as lint from '../src/lint';
@@ -23,7 +24,7 @@ import {nop} from '../src/util';
 import {withFixtures} from './fixtures';
 
 const OPTIONS: Options = {
-  gtsRootDir: './',
+  gtsRootDir: path.resolve(__dirname, '../..'),
   targetRootDir: './',
   dryRun: false,
   yes: false,
@@ -43,27 +44,12 @@ test.serial('createProgram should return an object', async t => {
   });
 });
 
-// TODO: make the error friendlier. This error implies that our module messed
-// up, or is not installed/integrated properly.
-test.serial('lint should throw error if tslint is missing', async t => {
-  await withFixtures(
-      {
-        'tsconfig.json': JSON.stringify({files: ['a.ts']}),
-        'a.ts': GOOD_CODE,
-      },
-      async () => {
-        const err = t.throws(() => {
-          lint.lint(OPTIONS);
-        });
-        t.truthy(err.message.match('Could not find config.*tslint\.json'));
-      });
-});
 
 test.serial('lint should return true on good code', async t => {
   await withFixtures(
       {
         'tsconfig.json': JSON.stringify({files: ['a.ts']}),
-        'tslint.json': JSON.stringify(TSLINT_CONFIG),
+        // 'tslint.json': JSON.stringify(TSLINT_CONFIG),
         'a.ts': GOOD_CODE,
       },
       async () => {