@bigbinary/neeto-playwright-reporter 3.0.0-beta.3 → 3.0.0-beta.5

package/bin/neetoplaydash.mjs

@@ -1,6 +1,7 @@
 #!/usr/bin/env node
 
 import { spawn, execSync } from "child_process";
+import fs from "fs";
 import path from "path";
 import { fileURLToPath } from "url";
 import * as R from "ramda";
@@ -9,30 +10,54 @@ import smartOrchestrationApi from "./smartOrchestration.js";
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
 
-const buildFullTitle = (parentTitles, specTitle) =>
-  [...parentTitles, specTitle].join(" ");
+const TEST_LIST_SEPARATOR = " › ";
+
+const buildTestListTitle = (
+  projectName,
+  file,
+  line,
+  column,
+  suiteTitles,
+  specTitle
+) => {
+  const parts = [
+    `[${projectName}]`,
+    `${file}:${line}:${column}`,
+    ...suiteTitles,
+    specTitle,
+  ];
+  return parts.join(TEST_LIST_SEPARATOR);
+};
 
-const collectSpecs = (suite, parentTitles = []) =>
+const collectSpecs = (suite, suiteTitles = []) =>
   R.concat(
-    R.map(
-      spec => ({
-        id: spec.id,
-        title: buildFullTitle(parentTitles, spec.title),
-      }),
+    R.chain(
+      spec =>
+        R.map(
+          test => ({
+            id: spec.id,
+            title: buildTestListTitle(
+              test.projectName,
+              spec.file,
+              spec.line,
+              spec.column,
+              suiteTitles,
+              spec.title
+            ),
+          }),
+          spec.tests || []
+        ),
       suite.specs || []
     ),
     R.chain(
       childSuite =>
-        collectSpecs(childSuite, [...parentTitles, childSuite.title]),
+        collectSpecs(childSuite, [...suiteTitles, childSuite.title]),
       suite.suites || []
     )
   );
 
 const extractTestTitlesAndIds = json =>
-  R.chain(
-    project => R.chain(file => collectSpecs(file, []), project.suites || []),
-    json.suites || []
-  );
+  R.chain(fileSuite => collectSpecs(fileSuite, []), json.suites || []);
 
 const args = process.argv.slice(2);
 
@@ -163,9 +188,6 @@ const escapeShellArg = arg => {
   return arg;
 };
 
-const escapeRegexSpecialChars = str =>
-  str.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
-
 const extractShardInfo = args => {
   let currentShard = null;
   let totalShards = null;
@@ -208,6 +230,14 @@ const filterArgs = (args, filterableArg) => {
 
 const filterShardArgs = args => filterArgs(args, "--shard");
 const filterGrepArgs = args => filterArgs(args, "--grep");
+const filterGrepInvertArgs = args => filterArgs(args, "--grep-invert");
+const filterTestListArgs = args => filterArgs(args, "--test-list");
+const filterTestListInvertArgs = args => filterArgs(args, "--test-list-invert");
+
+const filterAllTestSelectionArgs = args =>
+  filterTestListInvertArgs(
+    filterTestListArgs(filterGrepInvertArgs(filterGrepArgs(args)))
+  );
 
 const removeConsecutiveDuplicates = (args, value) => {
   return args.filter((arg, index) => {
@@ -219,7 +249,9 @@ const removeConsecutiveDuplicates = (args, value) => {
 };
 
 const { currentShard, totalShards } = extractShardInfo(playwrightArgs);
-const filteredPlaywrightArgs = filterGrepArgs(filterShardArgs(playwrightArgs));
+const filteredPlaywrightArgs = filterAllTestSelectionArgs(
+  filterShardArgs(playwrightArgs)
+);
 
 const env = {
   ...process.env,
@@ -231,6 +263,11 @@ env.NEETO_PROJECT_KEY = projectKey;
 env.NEETO_API_KEY = apiKey;
 env.NEETO_CI_BUILD_ID = ciBuildId;
 
+if (reporterOptions.baseURL) {
+  env.NEETO_PLAYDASH_API_BASE_URL = reporterOptions.baseURL;
+  process.env.NEETO_PLAYDASH_API_BASE_URL = reporterOptions.baseURL;
+}
+
 if (currentShard !== null) {
   env.NEETO_PLAYDASH_CURRENT_SHARD = currentShard.toString();
 }
@@ -303,7 +340,19 @@ child.on("close", async code => {
       projectKey,
     });
     const executableTests = smartOrchestrationResponse.data.tests;
-    const greppedTests = executableTests.map(escapeRegexSpecialChars).join("|");
+
+    const tmpDir = path.join(process.cwd(), "tmp");
+    if (!fs.existsSync(tmpDir)) {
+      fs.mkdirSync(tmpDir, { recursive: true });
+    }
+
+    const testListFileName = `test-list-neeto-playdash-${
+      currentShard || 0
+    }.txt`;
+    const testListFilePath = path.join(tmpDir, testListFileName);
+    const testListContent = executableTests.join("\n");
+    fs.writeFileSync(testListFilePath, testListContent, "utf-8");
+
     const deduplicatedArgs = removeConsecutiveDuplicates(
       filteredPlaywrightArgs,
       "test"
@@ -311,18 +360,32 @@ child.on("close", async code => {
     const escapedArgs = deduplicatedArgs.map(escapeShellArg);
     const command = `npx playwright ${escapedArgs.join(
       " "
-    )} --reporter="@bigbinary/neeto-playwright-reporter" --grep="${greppedTests}"`;
+    )} --reporter="@bigbinary/neeto-playwright-reporter" --test-list="${testListFilePath}"`;
     const runChild = spawn(command, {
       env,
       stdio: "inherit",
       shell: true,
     });
 
+    const cleanupTestListFile = () => {
+      try {
+        if (fs.existsSync(testListFilePath)) {
+          fs.unlinkSync(testListFilePath);
+        }
+      } catch (error) {
+        console.error(
+          `Warning: Failed to delete test list file: ${error.message}`
+        );
+      }
+    };
+
     runChild.on("close", exitCode => {
+      cleanupTestListFile();
       process.exit(exitCode || 0);
     });
 
     runChild.on("error", error => {
+      cleanupTestListFile();
       console.error(`Error executing test command: ${error.message}`);
       process.exit(1);
     });

package/bin/smartOrchestration.js

@@ -1,10 +1,10 @@
 import axios from "axios";
 
-const API_BASE_URL =
-  process.env.NEETO_PLAYDASH_API_BASE_URL ||
-  "https://connect.neetoplaydash.com";
-
 const create = ({ payload, apiKey, projectKey }) => {
+  const API_BASE_URL =
+    process.env.NEETO_PLAYDASH_API_BASE_URL ||
+    "https://connect.neetoplaydash.com";
+
   return axios.post(
     "/api/v2/reporter/smart_orchestration/distribute_tests",
     { smart_orchestration: payload },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bigbinary/neeto-playwright-reporter",
-  "version": "3.0.0-beta.3",
+  "version": "3.0.0-beta.5",
   "description": "The custom playwright reporter for neeto-playwright-dashboard.",
   "repository": "git@github.com:bigbinary/neeto-playwright-reporter.git",
   "license": "Apache-2.0",