@testsmith/testblocks 0.9.0 → 0.9.2

package/dist/cli/executor.js

@@ -93,29 +93,39 @@ class TestExecutor {
         }
         // Create base context for hooks
         const baseContext = this.createBaseContext(testFile.variables);
+        // Check if there are any enabled tests
+        const enabledTests = testFile.tests.filter(t => !t.disabled);
+        const hasEnabledTests = enabledTests.length > 0;
+        // Add skipped results for disabled tests first
+        for (const test of testFile.tests) {
+            if (test.disabled) {
+                console.log(`  Skipping (disabled): ${test.name}`);
+                results.push({
+                    testId: test.id,
+                    testName: test.name,
+                    status: 'skipped',
+                    duration: 0,
+                    steps: [],
+                    error: { message: 'Test is disabled' },
+                    startedAt: new Date().toISOString(),
+                    finishedAt: new Date().toISOString(),
+                });
+            }
+        }
+        // Only run hooks and tests if there are enabled tests
+        if (!hasEnabledTests) {
+            console.log('  All tests disabled, skipping hooks');
+            await this.cleanup();
+            return results;
+        }
         try {
             // Run beforeAll hooks
             if (testFile.beforeAll) {
                 const steps = this.extractStepsFromBlocklyState(testFile.beforeAll);
                 await this.runSteps(steps, baseContext, 'beforeAll');
             }
-            // Run each test - pass baseContext variables so beforeAll state persists
-            for (const test of testFile.tests) {
-                // Skip disabled tests
-                if (test.disabled) {
-                    console.log(`  Skipping (disabled): ${test.name}`);
-                    results.push({
-                        testId: test.id,
-                        testName: test.name,
-                        status: 'skipped',
-                        duration: 0,
-                        steps: [],
-                        error: { message: 'Test is disabled' },
-                        startedAt: new Date().toISOString(),
-                        finishedAt: new Date().toISOString(),
-                    });
-                    continue;
-                }
+            // Run each enabled test - pass baseContext variables so beforeAll state persists
+            for (const test of enabledTests) {
                 // Check if test has data-driven sets
                 if (test.data && test.data.length > 0) {
                     // Run test for each data set
@@ -154,6 +164,7 @@ class TestExecutor {
             logger: this.createLogger(),
             plugins: this.plugins,
             procedures: this.procedures,
+            webTimeout: this.options.timeout,
         };
     }
     async runTestWithData(test, testFile, dataSet, dataIndex, sharedVariables) {
@@ -563,7 +574,7 @@ class TestExecutor {
         let screenshot;
         if (status === 'failed' && this.page) {
             try {
-                const buffer = await this.page.screenshot({ type: 'png' });
+                const buffer = await this.page.screenshot({ type: 'png', fullPage: true });
                 screenshot = `data:image/png;base64,${buffer.toString('base64')}`;
             }
             catch (screenshotError) {

package/dist/cli/index.js

@@ -208,6 +208,7 @@ program
             const testDir = path.dirname(files[0]);
             globalsPath = findGlobalsFile(testDir) || globalsPath;
         }
+        let globalTimeout;
         if (fs.existsSync(globalsPath)) {
             try {
                 const globalsContent = fs.readFileSync(globalsPath, 'utf-8');
@@ -218,6 +219,9 @@ program
                 if (globals.procedures && typeof globals.procedures === 'object') {
                     globalProcedures = globals.procedures;
                 }
+                if (typeof globals.timeout === 'number') {
+                    globalTimeout = globals.timeout;
+                }
             }
             catch (e) {
                 console.warn(`Warning: Could not load globals from ${globalsPath}: ${e.message}`);
@@ -271,10 +275,13 @@ program
         if (options.baseUrl) {
             variables.baseUrl = options.baseUrl;
         }
+        // Determine timeout: CLI option takes precedence, then globals.json, then default
+        const cliTimeout = parseInt(options.timeout, 10);
+        const effectiveTimeout = options.timeout !== '30000' ? cliTimeout : (globalTimeout ?? cliTimeout);
         // Create executor options
         const executorOptions = {
             headless: !options.headed,
-            timeout: parseInt(options.timeout, 10),
+            timeout: effectiveTimeout,
             baseUrl: options.baseUrl,
             variables,
             procedures: globalProcedures,
@@ -447,7 +454,7 @@ program
                 'test:ci': 'testblocks run tests/**/*.testblocks.json -r console,html,junit -o reports',
             },
             devDependencies: {
-                '@testsmith/testblocks': '^0.9.0',
+                '@testsmith/testblocks': '^0.9.2',
             },
         };
         fs.writeFileSync(packagePath, JSON.stringify(packageJson, null, 2));

package/dist/cli/reporters/HTMLReporter.js

@@ -49,8 +49,9 @@ class HTMLReporter {
     onTestFileComplete(file, testFile, results) {
         this.allResults.push({ file, testFile, results });
         const passed = results.filter(r => r.status === 'passed').length;
-        const failed = results.filter(r => r.status !== 'passed').length;
-        console.log(`  ${passed} passed, ${failed} failed\n`);
+        const skipped = results.filter(r => r.status === 'skipped').length;
+        const failed = results.filter(r => r.status !== 'passed' && r.status !== 'skipped').length;
+        console.log(`  ${passed} passed, ${failed} failed, ${skipped} skipped\n`);
     }
     onComplete(allResults) {
         if (!fs.existsSync(this.outputDir)) {
@@ -60,11 +61,12 @@ class HTMLReporter {
         const outputPath = path.join(this.outputDir, `report-${timestamp}.html`);
         const totalTests = allResults.reduce((sum, r) => sum + r.results.length, 0);
         const passed = allResults.reduce((sum, r) => sum + r.results.filter(t => t.status === 'passed').length, 0);
-        const failed = allResults.reduce((sum, r) => sum + r.results.filter(t => t.status !== 'passed').length, 0);
+        const skipped = allResults.reduce((sum, r) => sum + r.results.filter(t => t.status === 'skipped').length, 0);
+        const failed = allResults.reduce((sum, r) => sum + r.results.filter(t => t.status !== 'passed' && t.status !== 'skipped').length, 0);
         const totalDuration = allResults.reduce((sum, r) => sum + r.results.reduce((s, t) => s + t.duration, 0), 0);
         const html = generateHTMLReport({
             timestamp: new Date().toISOString(),
-            summary: { totalTests, passed, failed, duration: totalDuration },
+            summary: { totalTests, passed, failed, skipped, duration: totalDuration },
             testFiles: this.allResults,
         });
         fs.writeFileSync(outputPath, html);
@@ -81,19 +83,24 @@ function generateHTMLReport(data) {
     let actualTests = 0;
     let actualPassed = 0;
     let actualFailed = 0;
+    let actualSkipped = 0;
     for (const { results } of testFiles) {
         for (const result of results) {
             if (!result.isLifecycle) {
                 actualTests++;
                 if (result.status === 'passed')
                     actualPassed++;
+                else if (result.status === 'skipped')
+                    actualSkipped++;
                 else
                     actualFailed++;
             }
         }
     }
-    const passRate = actualTests > 0
-        ? ((actualPassed / actualTests) * 100).toFixed(1)
+    // Pass rate excludes skipped tests from calculation
+    const runTests = actualTests - actualSkipped;
+    const passRate = runTests > 0
+        ? ((actualPassed / runTests) * 100).toFixed(1)
         : '0';
     let html = `<!DOCTYPE html>
 <html lang="en">
@@ -123,6 +130,10 @@ ${getHTMLStyles()}
         <div class="value">${actualFailed}</div>
         <div class="label">Failed</div>
       </div>
+      <div class="summary-card skipped">
+        <div class="value">${actualSkipped}</div>
+        <div class="label">Skipped</div>
+      </div>
       <div class="summary-card">
         <div class="value">${passRate}%</div>
         <div class="label">Pass Rate</div>
@@ -150,12 +161,13 @@ function renderTestFile(file, testFile, results) {
     const lifecycleResults = results.filter(r => r.isLifecycle);
     const testResults = results.filter(r => !r.isLifecycle);
     const filePassed = testResults.filter(r => r.status === 'passed').length;
-    const fileFailed = testResults.filter(r => r.status !== 'passed').length;
+    const fileSkipped = testResults.filter(r => r.status === 'skipped').length;
+    const fileFailed = testResults.filter(r => r.status !== 'passed' && r.status !== 'skipped').length;
     let html = `
     <div class="test-file">
       <div class="test-file-header">
         <span>${(0, utils_1.escapeHtml)(testFile.name)}</span>
-        <span class="test-file-path">${(0, utils_1.escapeHtml)(file)} • ${filePassed} passed, ${fileFailed} failed</span>
+        <span class="test-file-path">${(0, utils_1.escapeHtml)(file)} • ${filePassed} passed, ${fileFailed} failed, ${fileSkipped} skipped</span>
       </div>
 `;
     // Render lifecycle hooks (beforeAll)
@@ -336,6 +348,7 @@ function getHTMLStyles() {
     .summary-card .label { font-size: 14px; color: var(--color-text-secondary); }
     .summary-card.passed .value { color: var(--color-passed); }
     .summary-card.failed .value { color: var(--color-failed); }
+    .summary-card.skipped .value { color: var(--color-skipped); }
     .test-file {
       background: var(--color-surface);
       border: 1px solid var(--color-border);

package/dist/cli/reporters/JUnitReporter.js

@@ -49,8 +49,9 @@ class JUnitReporter {
     onTestFileComplete(file, testFile, results) {
         this.allResults.push({ file, testFile, results });
         const passed = results.filter(r => r.status === 'passed').length;
-        const failed = results.filter(r => r.status !== 'passed').length;
-        console.log(`  ${passed} passed, ${failed} failed\n`);
+        const skipped = results.filter(r => r.status === 'skipped').length;
+        const failed = results.filter(r => r.status !== 'passed' && r.status !== 'skipped').length;
+        console.log(`  ${passed} passed, ${failed} failed, ${skipped} skipped\n`);
     }
     onComplete(allResults) {
         if (!fs.existsSync(this.outputDir)) {
@@ -63,7 +64,8 @@ class JUnitReporter {
             summary: {
                 totalTests: allResults.reduce((sum, r) => sum + r.results.length, 0),
                 passed: allResults.reduce((sum, r) => sum + r.results.filter(t => t.status === 'passed').length, 0),
-                failed: allResults.reduce((sum, r) => sum + r.results.filter(t => t.status !== 'passed').length, 0),
+                failed: allResults.reduce((sum, r) => sum + r.results.filter(t => t.status !== 'passed' && t.status !== 'skipped').length, 0),
+                skipped: allResults.reduce((sum, r) => sum + r.results.filter(t => t.status === 'skipped').length, 0),
                 duration: allResults.reduce((sum, r) => sum + r.results.reduce((s, t) => s + t.duration, 0), 0),
             },
             testFiles: this.allResults,
@@ -79,19 +81,25 @@ exports.JUnitReporter = JUnitReporter;
 function generateJUnitXML(data) {
     const { testFiles } = data;
     const totalTests = testFiles.reduce((sum, f) => sum + f.results.length, 0);
-    const failures = testFiles.reduce((sum, f) => sum + f.results.filter(t => t.status !== 'passed').length, 0);
+    const failures = testFiles.reduce((sum, f) => sum + f.results.filter(t => t.status !== 'passed' && t.status !== 'skipped').length, 0);
+    const skipped = testFiles.reduce((sum, f) => sum + f.results.filter(t => t.status === 'skipped').length, 0);
     const totalTime = testFiles.reduce((sum, f) => sum + f.results.reduce((s, t) => s + t.duration, 0), 0) / 1000;
     let xml = '<?xml version="1.0" encoding="UTF-8"?>\n';
-    xml += `<testsuites tests="${totalTests}" failures="${failures}" time="${totalTime.toFixed(3)}">\n`;
+    xml += `<testsuites tests="${totalTests}" failures="${failures}" skipped="${skipped}" time="${totalTime.toFixed(3)}">\n`;
     for (const { file, testFile, results } of testFiles) {
         const suiteTests = results.length;
-        const suiteFailures = results.filter(r => r.status !== 'passed').length;
+        const suiteFailures = results.filter(r => r.status !== 'passed' && r.status !== 'skipped').length;
+        const suiteSkipped = results.filter(r => r.status === 'skipped').length;
         const suiteTime = results.reduce((s, t) => s + t.duration, 0) / 1000;
-        xml += `  <testsuite name="${(0, utils_1.escapeXml)(testFile.name)}" tests="${suiteTests}" failures="${suiteFailures}" time="${suiteTime.toFixed(3)}" file="${(0, utils_1.escapeXml)(file)}">\n`;
+        xml += `  <testsuite name="${(0, utils_1.escapeXml)(testFile.name)}" tests="${suiteTests}" failures="${suiteFailures}" skipped="${suiteSkipped}" time="${suiteTime.toFixed(3)}" file="${(0, utils_1.escapeXml)(file)}">\n`;
         for (const result of results) {
             const testTime = result.duration / 1000;
             xml += `    <testcase name="${(0, utils_1.escapeXml)(result.testName)}" classname="${(0, utils_1.escapeXml)(testFile.name)}" time="${testTime.toFixed(3)}">\n`;
-            if (result.status !== 'passed' && result.error) {
+            if (result.status === 'skipped') {
+                const message = result.error?.message || 'Test skipped';
+                xml += `      <skipped message="${(0, utils_1.escapeXml)(message)}"/>\n`;
+            }
+            else if (result.status !== 'passed' && result.error) {
                 xml += `      <failure message="${(0, utils_1.escapeXml)(result.error.message)}">\n`;
                 xml += `${(0, utils_1.escapeXml)(result.error.stack || result.error.message)}\n`;
                 xml += `      </failure>\n`;

package/dist/cli/reporters/types.d.ts

@@ -18,6 +18,7 @@ export interface ReportData {
         totalTests: number;
         passed: number;
         failed: number;
+        skipped: number;
         duration: number;
     };
     testFiles: {