Merge pull request #40 from gemini-testing/TESTPLANE-263.config_name

feat: use 'testplane.config.[tj]s' config name
gemini-testing · Sep 30, 2024 · 9d71ef5 · 9d71ef5
2 parents 4603173 + 2bff575
commit 9d71ef5
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 6 deletions.
diff --git a/src/constants/packageManagement.ts b/src/constants/packageManagement.ts
@@ -1,10 +1,14 @@
 export const PACKAGE_JSON = "package.json";
 
 export const CONFIG_NAMES = {
+    TESTPLANE_NEW_TS: "testplane.config.ts",
+    TESTPLANE_NEW_CTS: "testplane.config.cts",
+    TESTPLANE_NEW_JS: "testplane.config.js",
+    TESTPLANE_NEW_CJS: "testplane.config.cjs",
     TESTPLANE_TS: ".testplane.conf.ts",
     TESTPLANE_JS: ".testplane.conf.js",
-    HERMIONE_TS: ".hermione.conf.ts", // drop after testplane@2
-    HERMIONE_JS: ".hermione.conf.js", // drop after testplane@2
+    HERMIONE_TS: ".hermione.conf.ts", // drop after testplane@9
+    HERMIONE_JS: ".hermione.conf.js", // drop after testplane@9
 } as const;
 
 export const DEFAULT_PM = "npm";

diff --git a/src/fsUtils.test.ts b/src/fsUtils.test.ts
@@ -37,7 +37,7 @@ describe("fsUtils", () => {
 
             await fsUtils.writeTestplaneConfig("/", config);
 
-            expect(fsPromises.writeFile).toBeCalledWith(`/.testplane.conf.${ext}`, expectedConfigWritten);
+            expect(fsPromises.writeFile).toBeCalledWith(`/testplane.config.${ext}`, expectedConfigWritten);
         };
 
         it("js config", async () => {

diff --git a/src/package.test.ts b/src/package.test.ts
@@ -12,7 +12,14 @@ describe("package", () => {
     });
 
     describe("initApp", () => {
-        [".testplane.conf.ts", ".testplane.conf.js", ".hermione.conf.ts", ".hermione.conf.js"].forEach(configName => {
+        [
+            ".testplane.conf.ts",
+            ".testplane.conf.js",
+            ".hermione.conf.ts",
+            ".hermione.conf.js",
+            "testplane.config.ts",
+            "testplane.config.cjs",
+        ].forEach(configName => {
             it(`should throw an error, if ${configName} exists`, async () => {
                 const dirPath = "/dir/path";
                 jest.mocked(fsUtils.exists).mockImplementation(file =>

diff --git a/src/utils/configTemplates/js.ts b/src/utils/configTemplates/js.ts
@@ -2,7 +2,7 @@ import { ConfigTemplate } from ".";
 import { CONFIG_NAMES } from "../../constants/packageManagement";
 
 export const jsTemplate: ConfigTemplate = {
-    fileName: CONFIG_NAMES.TESTPLANE_JS,
+    fileName: CONFIG_NAMES.TESTPLANE_NEW_JS,
     language: "js",
     quote: "'",
     getImportModule: (importName, moduleName) => `const ${importName} = require('${moduleName}');`,

diff --git a/src/utils/configTemplates/ts.ts b/src/utils/configTemplates/ts.ts
@@ -2,7 +2,7 @@ import { ConfigTemplate } from ".";
 import { CONFIG_NAMES } from "../../constants/packageManagement";
 
 export const tsTemplate: ConfigTemplate = {
-    fileName: CONFIG_NAMES.TESTPLANE_TS,
+    fileName: CONFIG_NAMES.TESTPLANE_NEW_TS,
     language: "ts",
     quote: '"',
     getImportModule: (importName, moduleName) => `import ${importName} from "${moduleName}";`,