@testsmith/testblocks 0.8.3 → 0.8.5

package/dist/cli/index.js

@@ -177,7 +177,7 @@ program
     .argument('<patterns...>', 'Test file patterns (glob supported)')
     .option('-H, --headed', 'Run tests in headed mode (show browser)', false)
     .option('-t, --timeout <ms>', 'Test timeout in milliseconds', '30000')
-    .option('-r, --reporter <type>', 'Reporter type: console, json, junit, html', 'console')
+    .option('-r, --reporter <types>', 'Reporter types (comma-separated): console, json, junit, html', 'console')
     .option('-o, --output <dir>', 'Output directory for reports', './testblocks-results')
     .option('-b, --base-url <url>', 'Base URL for relative URLs')
     .option('-v, --var <vars...>', 'Variables in key=value format')
@@ -275,57 +275,65 @@ program
             variables,
             procedures: globalProcedures,
         };
-        // Create reporter
-        const reporter = createReporter(options.reporter, options.output);
+        // Create reporters (supports multiple, comma-separated)
+        const reporters = createReporters(options.reporter, options.output);
         // Run tests
         const allResults = [];
         let hasFailures = false;
-        for (const file of files) {
-            // Skip _hooks.testblocks.json files - these are folder hooks, not test files
-            const basename = path.basename(file);
-            if (basename === '_hooks.testblocks.json') {
-                continue;
-            }
-            console.log(`Running: ${basename}`);
-            const content = fs.readFileSync(file, 'utf-8');
-            let testFile = JSON.parse(content);
-            // Skip files that have no tests array (e.g., hooks-only files)
-            if (!testFile.tests || !Array.isArray(testFile.tests)) {
-                console.log('  (no tests in file)\n');
-                continue;
-            }
-            // Load and merge folder hooks
-            const globalsDir = fs.existsSync(globalsPath) ? path.dirname(globalsPath) : null;
-            const folderHooks = loadFolderHooks(file, globalsDir);
-            if (folderHooks.length > 0) {
-                testFile = mergeFolderHooksIntoTestFile(testFile, folderHooks);
-            }
-            // Apply filter if specified
-            if (options.filter) {
-                const filterRegex = new RegExp(options.filter, 'i');
-                testFile.tests = testFile.tests.filter(t => filterRegex.test(t.name));
-            }
-            if (testFile.tests.length === 0) {
-                console.log('  (no tests match filter)\n');
-                continue;
-            }
-            const executor = new executor_1.TestExecutor(executorOptions);
-            const results = await executor.runTestFile(testFile);
-            allResults.push({ file, results });
-            // Report results
-            reporter.onTestFileComplete(file, testFile, results);
-            // Check for failures
-            const failed = results.some(r => r.status !== 'passed');
-            if (failed) {
-                hasFailures = true;
-                if (options.failFast) {
-                    console.log('\nStopping due to --fail-fast\n');
-                    break;
+        try {
+            for (const file of files) {
+                // Skip _hooks.testblocks.json files - these are folder hooks, not test files
+                const basename = path.basename(file);
+                if (basename === '_hooks.testblocks.json') {
+                    continue;
+                }
+                console.log(`Running: ${basename}`);
+                const content = fs.readFileSync(file, 'utf-8');
+                let testFile = JSON.parse(content);
+                // Skip files that have no tests array (e.g., hooks-only files)
+                if (!testFile.tests || !Array.isArray(testFile.tests)) {
+                    console.log('  (no tests in file)\n');
+                    continue;
+                }
+                // Load and merge folder hooks
+                const globalsDir = fs.existsSync(globalsPath) ? path.dirname(globalsPath) : null;
+                const folderHooks = loadFolderHooks(file, globalsDir);
+                if (folderHooks.length > 0) {
+                    testFile = mergeFolderHooksIntoTestFile(testFile, folderHooks);
+                }
+                // Apply filter if specified
+                if (options.filter) {
+                    const filterRegex = new RegExp(options.filter, 'i');
+                    testFile.tests = testFile.tests.filter(t => filterRegex.test(t.name));
+                }
+                if (testFile.tests.length === 0) {
+                    console.log('  (no tests match filter)\n');
+                    continue;
+                }
+                const executor = new executor_1.TestExecutor(executorOptions);
+                const results = await executor.runTestFile(testFile);
+                allResults.push({ file, results });
+                // Report results to all reporters
+                reporters.forEach(r => r.onTestFileComplete(file, testFile, results));
+                // Check for failures
+                const failed = results.some(r => r.status !== 'passed');
+                if (failed) {
+                    hasFailures = true;
+                    if (options.failFast) {
+                        console.log('\nStopping due to --fail-fast\n');
+                        break;
+                    }
                 }
             }
         }
-        // Generate final report
-        reporter.onComplete(allResults);
+        catch (error) {
+            console.error('Error during test execution:', error.message);
+            hasFailures = true;
+        }
+        finally {
+            // Always generate final reports, even on errors
+            reporters.forEach(r => r.onComplete(allResults));
+        }
         // Exit with appropriate code
         process.exit(hasFailures ? 1 : 0);
     }
@@ -432,9 +440,10 @@ program
                 'test:headed': 'testblocks run tests/**/*.testblocks.json --headed',
                 'test:html': 'testblocks run tests/**/*.testblocks.json -r html -o reports',
                 'test:junit': 'testblocks run tests/**/*.testblocks.json -r junit -o reports',
+                'test:ci': 'testblocks run tests/**/*.testblocks.json -r console,html,junit -o reports',
             },
             devDependencies: {
-                '@testsmith/testblocks': '^0.8.3',
+                '@testsmith/testblocks': '^0.8.5',
             },
         };
         fs.writeFileSync(packagePath, JSON.stringify(packageJson, null, 2));
@@ -574,18 +583,34 @@ jobs:
         run: npm ci
 
       - name: Install Playwright browsers
-        run: npx playwright install --with-deps chromium
+        run: npx testblocks install-browsers
 
       - name: Run tests
-        run: npm test
+        run: npm run test:ci
+
+      - name: Upload HTML report
+        uses: actions/upload-artifact@v4
+        if: always()
+        with:
+          name: html-report
+          path: reports/*.html
+          retention-days: 30
 
-      - name: Upload test reports
+      - name: Upload JUnit report
         uses: actions/upload-artifact@v4
         if: always()
         with:
-          name: test-reports
-          path: reports/
+          name: junit-report
+          path: reports/*.xml
           retention-days: 30
+
+      - name: Publish Test Results
+        uses: dorny/test-reporter@v1
+        if: always()
+        with:
+          name: Test Results
+          path: reports/*.xml
+          reporter: java-junit
 `;
         fs.writeFileSync(workflowPath, workflow);
         console.log('  Created: .github/workflows/testblocks.yml');
@@ -594,10 +619,30 @@ jobs:
     console.log('Next steps:');
     console.log('  1. cd ' + (directory === '.' ? '' : directory));
     console.log('  2. npm install');
-    console.log('  3. npm test\n');
+    console.log('  3. npx testblocks install-browsers');
+    console.log('  4. npm test\n');
     console.log('To open the visual test editor:');
     console.log('  testblocks serve\n');
 });
+program
+    .command('install-browsers')
+    .description('Install Playwright browsers for running web tests')
+    .option('--browser <browser>', 'Browser to install (chromium, firefox, webkit, all)', 'chromium')
+    .action(async (options) => {
+    const { execSync } = await Promise.resolve().then(() => __importStar(require('child_process')));
+    const browser = options.browser === 'all' ? '' : options.browser;
+    console.log(`Installing Playwright browser${browser ? `: ${browser}` : 's'}...`);
+    try {
+        // Use execSync to run playwright install with inherited stdio
+        const command = `npx playwright install${browser ? ` ${browser}` : ''} --with-deps`;
+        execSync(command, { stdio: 'inherit' });
+        console.log('\n✓ Browsers installed successfully!');
+    }
+    catch (error) {
+        console.error('\nFailed to install browsers:', error instanceof Error ? error.message : error);
+        process.exit(1);
+    }
+});
 program
     .command('list')
     .description('List tests in test files')
@@ -655,18 +700,35 @@ program
         open: options.open,
     });
 });
-function createReporter(type, outputDir) {
-    switch (type) {
-        case 'json':
-            return new reporters_1.JSONReporter(outputDir);
-        case 'junit':
-            return new reporters_1.JUnitReporter(outputDir);
-        case 'html':
-            return new reporters_1.HTMLReporter(outputDir);
-        case 'console':
-        default:
-            return new reporters_1.ConsoleReporter();
+function createReporters(types, outputDir) {
+    const reporterTypes = types.split(',').map(t => t.trim().toLowerCase());
+    const reporters = [];
+    for (const type of reporterTypes) {
+        switch (type) {
+            case 'json':
+                reporters.push(new reporters_1.JSONReporter(outputDir));
+                break;
+            case 'junit':
+                reporters.push(new reporters_1.JUnitReporter(outputDir));
+                break;
+            case 'html':
+                reporters.push(new reporters_1.HTMLReporter(outputDir));
+                break;
+            case 'console':
+                reporters.push(new reporters_1.ConsoleReporter());
+                break;
+            default:
+                console.warn(`Unknown reporter type: ${type}, using console`);
+                if (!reporters.some(r => r instanceof reporters_1.ConsoleReporter)) {
+                    reporters.push(new reporters_1.ConsoleReporter());
+                }
+        }
+    }
+    // Always include console reporter if not already included
+    if (!reporters.some(r => r instanceof reporters_1.ConsoleReporter)) {
+        reporters.unshift(new reporters_1.ConsoleReporter());
     }
+    return reporters;
 }
 function validateTestFile(testFile) {
     const errors = [];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@testsmith/testblocks",
-  "version": "0.8.3",
+  "version": "0.8.5",
   "description": "Visual test automation tool with Blockly - API and Playwright testing",
   "author": "Roy de Kleijn",
   "license": "MIT",