Change test directory in configs

ark120202 · ark120202 · commit 7fe1921cdf1f · 2019-03-24T21:16:29.000+05:00
diff --git a/.prettierignore b/.prettierignore
@@ -1,6 +1,6 @@
 /dist
 /coverage
-/__tests__/compiler/testfiles/invalid_syntax.ts
+/test/compiler/testfiles/invalid_syntax.ts
 
 /src
 *.md
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -17,11 +17,11 @@ To get familiar with the project structure, here is a short overview of each dir
   * *LuaTransformer.ts* - Main transpiler code, transforms a TypeScript AST to a Lua AST.
   * *LuaPrinter.ts* - Transforms a Lua AST to a string.
   * *TSHelper.ts* - Helper methods used during the transpilation process.
-- `__tests__/`
+- `test/`
   * This directory contains all testing code for the transpiler.
-  * `__tests__/unit/`
+  * `test/unit/`
     - Unit/Functional tests for the transpiler. Tests in here are grouped by functionality they are testing. Generally each of these tests uses the transpiler to transpile some TypeScript to Lua, then executes it using the Fengari Lua VM. Assertion is done on the result of the lua code.
-  * `__tests__/translation/`
+  * `test/translation/`
     - **[Obsolete]** Contains tests that only check the transpiled Lua String. We prefer adding unit/functional tests over translation tests. This directory will probably be removed at some point.
 
 ## Running Tests
diff --git a/jest.config.js b/jest.config.js
@@ -2,8 +2,8 @@
 const isCI = require("is-ci");
 
 /** @type {Partial<import('@jest/types').Config.DefaultOptions>} */
-module.exports = {
-    testMatch: ["**/__tests__/**/*.test.ts"],
+const config = {
+    testMatch: ["**/test/**/*.spec.ts"],
     collectCoverageFrom: ["<rootDir>/src/**/*", "!<rootDir>/src/lualib/**/*"],
     watchPathIgnorePatterns: ["/watch\\.ts$"],
 
@@ -12,8 +12,10 @@ module.exports = {
     preset: "ts-jest",
     globals: {
         "ts-jest": {
-            tsConfig: "<rootDir>/__tests__/tsconfig.json",
+            tsConfig: "<rootDir>/test/tsconfig.json",
             diagnostics: { warnOnly: !isCI },
         },
     },
 };
+
+module.exports = config;
diff --git a/package.json b/package.json
@@ -23,7 +23,7 @@
         "test-fast": "cross-env JEST_IGNORE_DIAGNOSTICS=true jest",
         "lint": "npm run lint:tslint && npm run lint:prettier",
         "lint:prettier": "prettier --check **/*.{js,ts,yml,json}",
-        "lint:tslint": "tslint -p . && tslint -p __tests__ && tslint src/lualib/*.ts",
+        "lint:tslint": "tslint -p . && tslint -p test && tslint src/lualib/*.ts",
         "release-major": "npm version major",
         "release-minor": "npm version minor",
         "release-patch": "npm version patch",
diff --git a/tslint.json b/tslint.json
@@ -1,5 +1,5 @@
 {
-    "extends": "./__tests__/tslint.json",
+    "extends": "./test/tslint.json",
     "rules": {
         "arrow-parens": [true, "ban-single-arg-parens"],
         "import-spacing": true,

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`		`- "extends": "./__tests__/tslint.json",`
	`2`	`+ "extends": "./test/tslint.json",`
`3`	`3`	`"rules": {`
`4`	`4`	`"arrow-parens": [true, "ban-single-arg-parens"],`
`5`	`5`	`"import-spacing": true,`