fix: use unified tests dir

gemini-testing · Feb 14, 2024 · f584ec3 · f584ec3
1 parent 730f45b
commit f584ec3
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 6 deletions.
diff --git a/src/fsUtils.ts b/src/fsUtils.ts
@@ -1,6 +1,7 @@
 import _ from "lodash";
 import fs from "fs";
 import path from "path";
+import { defaultHermioneTestsDir } from "./constants/defaultHermioneConfig";
 import type { HermioneConfig } from "./types/hermioneConfig";
 
 const createDirectory = (path: string): Promise<string | undefined> => fs.promises.mkdir(path, { recursive: true });
@@ -100,7 +101,7 @@ export const writeHermioneConfig = async (dirPath: string, hermioneConfig: Hermi
 };
 
 export const writeTest = async (dirPath: string, testName: string, testContent: string): Promise<void> => {
-    const testDirPath = path.resolve(dirPath, "hermione-tests");
+    const testDirPath = path.resolve(dirPath, defaultHermioneTestsDir);
     const testPath = path.resolve(testDirPath, testName);
 
     try {

diff --git a/src/pluginsConfig/hermione-headless-chrome.ts b/src/pluginsConfig/hermione-headless-chrome.ts
@@ -1,5 +1,6 @@
 import _ from "lodash";
 import { HERMIONE_HEADLESS_CHROME } from "../constants/plugins";
+import { defaultHermioneTestsDir } from "../constants/defaultHermioneConfig";
 import type { HermioneConfig } from "../types/hermioneConfig";
 
 export default {
@@ -21,7 +22,7 @@ export default {
                 sets: {
                     desktop: {
                         browsers: [browserId],
-                        files: ["tests/**/*.hermione.js"],
+                        files: [`${defaultHermioneTestsDir}/**/*.hermione.js`],
                     },
                 },
             },

diff --git a/src/pluginsConfig/hermione-safari-commands.ts b/src/pluginsConfig/hermione-safari-commands.ts
@@ -1,6 +1,7 @@
 import inquirer, { DistinctQuestion } from "inquirer";
 import _ from "lodash";
 import { HERMIONE_SAFARI_COMMANDS } from "../constants/plugins";
+import { defaultHermioneTestsDir } from "../constants/defaultHermioneConfig";
 import type { HermioneConfig } from "../types/hermioneConfig";
 
 type SafariCommand =
@@ -44,7 +45,7 @@ export default {
                 sets: {
                     "touch-phone": {
                         browsers: [browserId],
-                        files: ["tests/**/*.hermione.js"],
+                        files: [`${defaultHermioneTestsDir}/**/*.hermione.js`],
                     },
                 },
                 browsers: {

diff --git a/src/utils/index.test.ts b/src/utils/index.test.ts
@@ -154,7 +154,7 @@ describe("utils", () => {
                 sets: {
                     "touch-phone": {
                         browsers: ["chrome-phone"],
-                        files: ["tests/**/*.hermione.js"],
+                        files: ["hermione-tests/**/*.hermione.js"],
                     },
                 },
             });

diff --git a/src/utils/index.ts b/src/utils/index.ts
@@ -5,11 +5,11 @@ import path from "path";
 import { Colors } from "./colors";
 import { pluginSuffixes } from "../constants/packageManagement";
 import fsUtils from "../fsUtils";
+import { defaultHermioneTestsDir } from "../constants/defaultHermioneConfig";
 import type { ConfigNote } from "../plugins";
 import type { ToolArgv } from "../types/toolArgv";
 import type { ArgvOpts, HandleGeneralPromptsCallback } from "../types/toolOpts";
 import type { HermioneConfig, Language } from "../types";
-import { defaultHermioneTestsDir } from "../constants/defaultHermioneConfig";
 
 export const optsFromArgv = (argv: ToolArgv): ArgvOpts => {
     if (!argv["_"].length) {
@@ -62,7 +62,7 @@ export const baseGeneralPromptsHandler: HandleGeneralPromptsCallback = async (he
                 sets: {
                     "touch-phone": {
                         browsers: [browserId],
-                        files: ["tests/**/*.hermione.js"],
+                        files: [`${defaultHermioneTestsDir}/**/*.hermione.js`],
                     },
                 },
                 browsers: {