style(run-e2e): small cleanup

Author: Illia Obukhau

.github/workflows/WebAutomatedTests.yml

@@ -11,9 +11,6 @@ concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
 
-env:
-  IS_NOT_FORK_PR: ${{ github.event_name == 'pull_request' && github.event.pull_request.head.repo.full_name == 'mendix/web-widgets' }}
-
 jobs:
   harden-security:
     name: Check SHA in GH Actions
@@ -24,6 +21,7 @@ jobs:
       - uses: zgosalvez/github-actions-ensure-sha-pinned-actions@570fff1eb64d52ffae87990c117c2748c317b58c # v2.0.0
 
   test:
+    # Run job only if it's push to main or PR from web-widgets, don't run for fork PRs
     if: >-
       ${{ github.event_name == 'push' ||
           github.event_name == 'pull_request' && 

automation/run-e2e/bin/run-e2e-in-chunks.mjs

@@ -47,7 +47,7 @@ function main() {
     if (filters.length > 0) {
         execSync(command, { stdio: "inherit" });
     } else {
-        console.log(c.cyan("No packages in chunk, skip e2e."));
+        console.log(c.yellow("No packages in chunk, skip e2e."));
     }
 }
 

automation/run-e2e/lib/ci.mjs

@@ -10,15 +10,14 @@ import { setupTestProject } from "./setup-test-project.mjs";
 import { updateWidget } from "./utils.mjs";
 
 const MX_VERSION_MAP_URL =
+    // Remove after merge
     "https://raw.githubusercontent.com/mendix/widgets-resources/master/configs/e2e/mendix-versions.json";
-
-// const MX_VERSION_MAP_URL =
-//     "https://raw.githubusercontent.com/mendix/web-widgets/main/automation/run-e2e/mendix-versions.json";
+// Uncomment after merge
+// "https://raw.githubusercontent.com/mendix/web-widgets/main/automation/run-e2e/mendix-versions.json";
 
 const { ls, cat } = sh;
 
 export async function ci() {
-    // assert.ok(process.env.CI, "This command meant to run in CI env");
     console.log(c.cyan("Run e2e tests in CI environment"));
 
     const parseArgsOptions = {
@@ -31,7 +30,7 @@ export async function ci() {
         configuration: {
             // https://github.com/yargs/yargs-parser#boolean-negation
             "boolean-negation": true,
-            // https://github.com/yargs/yargs-parser#boolean-negation
+            // https://github.com/yargs/yargs-parser#camel-case-expansion
             "camel-case-expansion": true
         }
     };
@@ -94,19 +93,16 @@ async function getMendixVersion(options) {
         return process.env.MENDIX_VERSION;
     }
 
-    try {
-        const versionMapResponse = await fetch(MX_VERSION_MAP_URL);
-        if (versionMapResponse.ok) {
-            const { mxVersion } = options;
-            const versionMap = await versionMapResponse.json();
-            if (mxVersion in versionMap) {
-                return versionMap[mxVersion];
-            }
-
-            return versionMap.latest;
+    const versionMapResponse = await fetch(MX_VERSION_MAP_URL);
+    if (versionMapResponse.ok) {
+        const { mxVersion } = options;
+        const versionMap = await versionMapResponse.json();
+        if (mxVersion in versionMap) {
+            return versionMap[mxVersion];
         }
-    } catch (err) {
-        console.err(err);
-        throw new Error("Couldn't fetch mendix-versions.json");
+
+        return versionMap.latest;
+    } else {
+        throw new Error(`Couldn't fetch mendix-versions.json: ${versionMapResponse.statusText}`);
     }
 }

automation/run-e2e/lib/dev.mjs

@@ -20,7 +20,7 @@ export async function dev() {
         configuration: {
             // https://github.com/yargs/yargs-parser#boolean-negation
             "boolean-negation": true,
-            // https://github.com/yargs/yargs-parser#boolean-negation
+            // https://github.com/yargs/yargs-parser#camel-case-expansion
             "camel-case-expansion": true
         }
     };