@testsmith/testblocks 0.1.0 → 0.3.0

package/dist/cli/executor.d.ts

@@ -16,6 +16,7 @@ export declare class TestExecutor {
     constructor(options?: ExecutorOptions);
     initialize(): Promise<void>;
     cleanup(): Promise<void>;
+    private requiresBrowser;
     runTestFile(testFile: TestFile): Promise<TestResult[]>;
     private createBaseContext;
     runTestWithData(test: TestCase, testFile: TestFile, dataSet: TestDataSet, dataIndex: number): Promise<TestResult>;

package/dist/cli/executor.js

@@ -42,9 +42,40 @@ class TestExecutor {
         this.browserContext = null;
         this.browser = null;
     }
+    requiresBrowser(testFile) {
+        const hasWebStep = (steps) => {
+            return steps.some(step => step.type.startsWith('web_'));
+        };
+        const hasWebStepInState = (state) => {
+            const steps = this.extractStepsFromBlocklyState(state);
+            return hasWebStep(steps);
+        };
+        // Check beforeAll/afterAll hooks
+        if (testFile.beforeAll && hasWebStepInState(testFile.beforeAll))
+            return true;
+        if (testFile.afterAll && hasWebStepInState(testFile.afterAll))
+            return true;
+        if (testFile.beforeEach && hasWebStepInState(testFile.beforeEach))
+            return true;
+        if (testFile.afterEach && hasWebStepInState(testFile.afterEach))
+            return true;
+        // Check all tests
+        for (const test of testFile.tests) {
+            if (hasWebStepInState(test.steps))
+                return true;
+            if (test.beforeEach && hasWebStepInState(test.beforeEach))
+                return true;
+            if (test.afterEach && hasWebStepInState(test.afterEach))
+                return true;
+        }
+        return false;
+    }
     async runTestFile(testFile) {
         const results = [];
-        await this.initialize();
+        // Only initialize browser if test file contains web steps
+        if (this.requiresBrowser(testFile)) {
+            await this.initialize();
+        }
         // Register procedures from the test file
         if (testFile.procedures) {
             for (const [name, procedure] of Object.entries(testFile.procedures)) {

package/dist/cli/index.js

@@ -56,6 +56,7 @@ program
     .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')
+    .option('-g, --globals <path>', 'Path to globals.json file', './globals.json')
     .option('--fail-fast', 'Stop on first test failure', false)
     .option('-p, --parallel <count>', 'Number of parallel workers', '1')
     .option('--filter <pattern>', 'Only run tests matching pattern')
@@ -72,21 +73,38 @@ program
             process.exit(1);
         }
         console.log(`Found ${files.length} test file(s)\n`);
-        // Parse variables
-        const variables = {};
+        // Load globals.json if it exists
+        let globalVariables = {};
+        const globalsPath = path.resolve(options.globals);
+        if (fs.existsSync(globalsPath)) {
+            try {
+                const globalsContent = fs.readFileSync(globalsPath, 'utf-8');
+                const globals = JSON.parse(globalsContent);
+                if (globals.variables && typeof globals.variables === 'object') {
+                    globalVariables = globals.variables;
+                }
+            }
+            catch (e) {
+                console.warn(`Warning: Could not load globals from ${globalsPath}: ${e.message}`);
+            }
+        }
+        // Parse CLI variables (these override globals)
+        const cliVariables = {};
         if (options.var) {
             for (const v of options.var) {
                 const [key, ...valueParts] = v.split('=');
                 const value = valueParts.join('=');
                 // Try to parse as JSON, otherwise use as string
                 try {
-                    variables[key] = JSON.parse(value);
+                    cliVariables[key] = JSON.parse(value);
                 }
                 catch {
-                    variables[key] = value;
+                    cliVariables[key] = value;
                 }
             }
         }
+        // Merge variables: globals first, then CLI overrides
+        const variables = { ...globalVariables, ...cliVariables };
         // Create executor options
         const executorOptions = {
             headless: !options.headed,
@@ -230,7 +248,7 @@ program
                 'test:junit': 'testblocks run tests/**/*.testblocks.json -r junit -o reports',
             },
             devDependencies: {
-                '@testsmith/testblocks': '^0.1.0',
+                '@testsmith/testblocks': '^0.3.0',
             },
         };
         fs.writeFileSync(packagePath, JSON.stringify(packageJson, null, 2));
@@ -257,8 +275,8 @@ program
                         },
                         {
                             id: 'step-2',
-                            type: 'web_expect_title',
-                            params: { EXPECTED: 'Example Domain' },
+                            type: 'web_assert_title_contains',
+                            params: { TEXT: 'Example Domain' },
                         },
                     ],
                     tags: ['web', 'smoke'],

package/dist/cli/reporters.js

@@ -205,10 +205,114 @@ class HTMLReporter {
     }
 }
 exports.HTMLReporter = HTMLReporter;
+// Format step type for display (same as StepResultItem.tsx)
+function formatStepType(type) {
+    const displayNames = {
+        'logic_log': 'Log',
+        'logic_set_variable': 'Set Variable',
+        'logic_get_variable': 'Get Variable',
+        'api_set_header': 'Set Header',
+        'api_set_headers': 'Set Headers',
+        'api_clear_headers': 'Clear Headers',
+        'api_assert_status': 'Assert Status',
+        'api_assert_body_contains': 'Assert Body',
+        'api_extract': 'Extract',
+        'api_extract_jsonpath': 'Extract (JSONPath)',
+        'api_extract_xpath': 'Extract (XPath)',
+        'web_navigate': 'Navigate',
+        'web_click': 'Click',
+        'web_fill': 'Fill',
+        'web_type': 'Type',
+        'web_press_key': 'Press Key',
+        'web_select': 'Select',
+        'web_checkbox': 'Checkbox',
+        'web_hover': 'Hover',
+        'web_wait_for_element': 'Wait for Element',
+        'web_wait_for_url': 'Wait for URL',
+        'web_wait': 'Wait',
+        'web_screenshot': 'Screenshot',
+        'web_get_text': 'Get Text',
+        'web_get_attribute': 'Get Attribute',
+        'web_get_input_value': 'Get Input Value',
+        'web_get_title': 'Get Title',
+        'web_get_url': 'Get URL',
+        'web_assert_visible': 'Assert Visible',
+        'web_assert_not_visible': 'Assert Not Visible',
+        'web_assert_text_contains': 'Assert Text Contains',
+        'web_assert_text_equals': 'Assert Text Equals',
+        'web_assert_url_contains': 'Assert URL Contains',
+        'web_assert_title_contains': 'Assert Title Contains',
+        'web_assert_enabled': 'Assert Enabled',
+        'web_assert_checked': 'Assert Checked',
+        'totp_generate': 'Generate TOTP',
+        'totp_generate_from_numeric': 'Generate TOTP (Numeric)',
+        'totp_setup': 'Setup TOTP',
+        'totp_code': 'TOTP Code',
+        'totp_time_remaining': 'TOTP Time Remaining',
+        'totp_wait_for_new_code': 'Wait for New TOTP',
+    };
+    if (displayNames[type]) {
+        return displayNames[type];
+    }
+    return type
+        .split('_')
+        .map(word => word.charAt(0).toUpperCase() + word.slice(1))
+        .join(' ');
+}
+// Get step summary from output
+function getStepSummary(stepType, output) {
+    if (!output || typeof output !== 'object')
+        return null;
+    const out = output;
+    return out._summary || null;
+}
+// Check if step is an API request
+function isApiRequestStep(stepType) {
+    return ['api_get', 'api_post', 'api_put', 'api_patch', 'api_delete'].includes(stepType);
+}
+// Format step output for display
+function formatStepOutput(output, stepType) {
+    if (output === undefined || output === null)
+        return '';
+    if (stepType === 'logic_log' && typeof output === 'object' && output !== null) {
+        const logOutput = output;
+        if (logOutput._message) {
+            return String(logOutput._message);
+        }
+    }
+    if (typeof output === 'string')
+        return output;
+    if (typeof output === 'number' || typeof output === 'boolean')
+        return String(output);
+    if (typeof output === 'object') {
+        const filtered = Object.fromEntries(Object.entries(output)
+            .filter(([key]) => !key.startsWith('_')));
+        if (Object.keys(filtered).length === 0) {
+            return '';
+        }
+        return JSON.stringify(filtered, null, 2);
+    }
+    return JSON.stringify(output, null, 2);
+}
 function generateHTMLReport(data) {
     const { timestamp, summary, testFiles } = data;
-    const passRate = summary.totalTests > 0
-        ? ((summary.passed / summary.totalTests) * 100).toFixed(1)
+    // Separate lifecycle hooks from actual tests for counting
+    let actualTests = 0;
+    let actualPassed = 0;
+    let actualFailed = 0;
+    for (const { results } of testFiles) {
+        for (const result of results) {
+            if (!result.isLifecycle) {
+                actualTests++;
+                if (result.status === 'passed')
+                    actualPassed++;
+                else
+                    actualFailed++;
+            }
+        }
+    }
+    const passRate = actualTests > 0
+        ? ((actualPassed / actualTests) * 100).toFixed(1)
         : '0';
     let html = `<!DOCTYPE html>
 <html lang="en">
@@ -271,17 +375,39 @@ function generateHTMLReport(data) {
       align-items: center;
     }
     .test-file-path { font-size: 12px; color: var(--color-text-secondary); font-weight: normal; }
-    .test-case {
-      padding: 12px 16px;
+    .lifecycle-section {
+      background: #f1f5f9;
+      padding: 8px 16px;
       border-bottom: 1px solid var(--color-border);
+    }
+    .lifecycle-header {
+      font-size: 12px;
+      font-weight: 600;
+      color: var(--color-text-secondary);
+      text-transform: uppercase;
+      letter-spacing: 0.5px;
+      margin-bottom: 4px;
+    }
+    .lifecycle-item {
       display: flex;
       align-items: center;
-      gap: 12px;
+      gap: 8px;
+      padding: 4px 0;
+      font-size: 13px;
+    }
+    .test-case {
+      padding: 12px 16px;
+      border-bottom: 1px solid var(--color-border);
     }
     .test-case:last-child { border-bottom: none; }
     .test-case.passed { border-left: 3px solid var(--color-passed); }
     .test-case.failed { border-left: 3px solid var(--color-failed); }
     .test-case.skipped { border-left: 3px solid var(--color-skipped); }
+    .test-case-header {
+      display: flex;
+      align-items: center;
+      gap: 12px;
+    }
     .status-icon {
       width: 20px;
       height: 20px;
@@ -296,18 +422,15 @@ function generateHTMLReport(data) {
     .status-icon.passed { background: var(--color-passed); }
     .status-icon.failed { background: var(--color-failed); }
     .status-icon.skipped { background: var(--color-skipped); }
-    .test-name { flex: 1; }
+    .test-name { flex: 1; font-weight: 500; }
     .test-duration { color: var(--color-text-secondary); font-size: 14px; }
-    .error-details {
+    .error-message {
       background: #fef2f2;
       border: 1px solid #fecaca;
       border-radius: 4px;
-      padding: 12px;
-      margin: 8px 16px 12px 44px;
-      font-family: monospace;
+      padding: 8px 12px;
+      margin: 8px 0 0 32px;
       font-size: 13px;
-      white-space: pre-wrap;
-      word-break: break-word;
       color: #991b1b;
     }
     .steps-toggle {
@@ -321,27 +444,87 @@ function generateHTMLReport(data) {
     .steps-toggle:hover { text-decoration: underline; }
     .steps-list {
       display: none;
-      padding: 8px 16px 12px 44px;
+      margin: 12px 0 0 32px;
+      border-left: 2px solid var(--color-border);
+      padding-left: 16px;
     }
     .steps-list.open { display: block; }
     .step {
+      padding: 8px 0;
+      border-bottom: 1px solid #f1f5f9;
+    }
+    .step:last-child { border-bottom: none; }
+    .step-header {
       display: flex;
       align-items: center;
       gap: 8px;
-      padding: 4px 0;
       font-size: 13px;
     }
-    .step-icon { font-size: 10px; }
-    .step-icon.passed { color: var(--color-passed); }
-    .step-icon.failed { color: var(--color-failed); }
-    .step-type { color: var(--color-text-secondary); }
-    .step-duration { color: var(--color-text-secondary); font-size: 12px; }
+    .step-dot {
+      width: 8px;
+      height: 8px;
+      border-radius: 50%;
+      flex-shrink: 0;
+    }
+    .step-dot.passed { background: var(--color-passed); }
+    .step-dot.failed { background: var(--color-failed); }
+    .step-type { font-weight: 500; }
+    .step-summary { color: var(--color-text-secondary); }
+    .step-duration { color: var(--color-text-secondary); font-size: 12px; margin-left: auto; }
+    .step-details {
+      margin-top: 8px;
+      padding: 8px;
+      background: #f8fafc;
+      border-radius: 4px;
+      font-size: 12px;
+    }
+    .step-error {
+      color: #991b1b;
+      margin-top: 4px;
+    }
+    .response-status {
+      display: flex;
+      align-items: center;
+      gap: 8px;
+      margin-bottom: 8px;
+    }
+    .response-label { font-weight: 500; }
+    .status-code { font-family: monospace; padding: 2px 6px; border-radius: 4px; }
+    .status-code.success { background: #dcfce7; color: #166534; }
+    .status-code.client-error { background: #fef3c7; color: #92400e; }
+    .status-code.server-error { background: #fef2f2; color: #991b1b; }
+    .response-section {
+      margin-top: 8px;
+    }
+    .response-section summary {
+      cursor: pointer;
+      font-weight: 500;
+      font-size: 12px;
+      color: var(--color-text-secondary);
+    }
+    .response-pre {
+      background: #1e293b;
+      color: #e2e8f0;
+      padding: 12px;
+      border-radius: 4px;
+      overflow-x: auto;
+      font-family: monospace;
+      font-size: 12px;
+      margin-top: 4px;
+      white-space: pre-wrap;
+      word-break: break-word;
+    }
+    .stack-trace {
+      background: #fef2f2;
+      color: #991b1b;
+    }
     .screenshot {
       max-width: 100%;
       max-height: 300px;
       border: 1px solid var(--color-border);
       border-radius: 4px;
       margin-top: 8px;
+      cursor: pointer;
     }
   </style>
 </head>
@@ -352,15 +535,15 @@ function generateHTMLReport(data) {
 
     <div class="summary">
       <div class="summary-card">
-        <div class="value">${summary.totalTests}</div>
+        <div class="value">${actualTests}</div>
         <div class="label">Total Tests</div>
       </div>
       <div class="summary-card passed">
-        <div class="value">${summary.passed}</div>
+        <div class="value">${actualPassed}</div>
         <div class="label">Passed</div>
       </div>
       <div class="summary-card failed">
-        <div class="value">${summary.failed}</div>
+        <div class="value">${actualFailed}</div>
         <div class="label">Failed</div>
       </div>
       <div class="summary-card">
@@ -374,8 +557,11 @@ function generateHTMLReport(data) {
     </div>
 `;
     for (const { file, testFile, results } of testFiles) {
-        const filePassed = results.filter(r => r.status === 'passed').length;
-        const fileFailed = results.filter(r => r.status !== 'passed').length;
+        // Separate lifecycle hooks from tests
+        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;
         html += `
     <div class="test-file">
       <div class="test-file-header">
@@ -383,36 +569,131 @@ function generateHTMLReport(data) {
         <span class="test-file-path">${escapeHtml(file)} • ${filePassed} passed, ${fileFailed} failed</span>
       </div>
 `;
-        for (const result of results) {
+        // Render lifecycle hooks (beforeAll)
+        const beforeAllHooks = lifecycleResults.filter(r => r.lifecycleType === 'beforeAll');
+        if (beforeAllHooks.length > 0) {
+            html += `      <div class="lifecycle-section">\n`;
+            html += `        <div class="lifecycle-header">Before All</div>\n`;
+            for (const hook of beforeAllHooks) {
+                const icon = hook.status === 'passed' ? '✓' : '✗';
+                const iconClass = hook.status === 'passed' ? 'passed' : 'failed';
+                html += `        <div class="lifecycle-item">
+          <span class="step-dot ${iconClass}"></span>
+          <span>${hook.steps.length} steps</span>
+          <span style="color: var(--color-text-secondary); font-size: 12px;">${hook.duration}ms</span>
+        </div>\n`;
+                if (hook.error) {
+                    html += `        <div class="error-message" style="margin: 4px 0 0 16px;">${escapeHtml(hook.error.message)}</div>\n`;
+                }
+            }
+            html += `      </div>\n`;
+        }
+        // Render actual tests
+        for (const result of testResults) {
             const statusIcon = result.status === 'passed' ? '✓' : result.status === 'failed' ? '✗' : '○';
+            const testId = `test-${Math.random().toString(36).substr(2, 9)}`;
             html += `
       <div class="test-case ${result.status}">
-        <div class="status-icon ${result.status}">${statusIcon}</div>
-        <div class="test-name">${escapeHtml(result.testName)}</div>
-        <div class="test-duration">${result.duration}ms</div>
-        <button class="steps-toggle" onclick="this.nextElementSibling.classList.toggle('open')">
-          ${result.steps.length} steps
-        </button>
-      </div>
-      <div class="steps-list">
+        <div class="test-case-header">
+          <div class="status-icon ${result.status}">${statusIcon}</div>
+          <div class="test-name">${escapeHtml(result.testName)}</div>
+          <div class="test-duration">${result.duration}ms</div>
+          <button class="steps-toggle" onclick="document.getElementById('${testId}').classList.toggle('open'); this.textContent = this.textContent.includes('▶') ? '▼ ${result.steps.length} steps' : '▶ ${result.steps.length} steps'">
+            ▶ ${result.steps.length} steps
+          </button>
+        </div>
 `;
+            if (result.error) {
+                html += `        <div class="error-message">${escapeHtml(result.error.message)}</div>\n`;
+            }
+            html += `        <div class="steps-list" id="${testId}">\n`;
             for (const step of result.steps) {
-                const stepIcon = step.status === 'passed' ? '✓' : '✗';
-                html += `
-        <div class="step">
-          <span class="step-icon ${step.status}">${stepIcon}</span>
-          <span class="step-type">${escapeHtml(step.stepType)}</span>
-          <span class="step-duration">${step.duration}ms</span>
-        </div>
+                const summary = getStepSummary(step.stepType, step.output);
+                const isApiRequest = isApiRequestStep(step.stepType);
+                const response = step.output;
+                html += `          <div class="step">
+            <div class="step-header">
+              <span class="step-dot ${step.status}"></span>
+              <span class="step-type">${escapeHtml(formatStepType(step.stepType))}</span>
+              ${summary ? `<span class="step-summary">${escapeHtml(summary)}</span>` : ''}
+              <span class="step-duration">${step.duration}ms</span>
+            </div>
 `;
+                // Show step error
+                if (step.error) {
+                    html += `            <div class="step-error">${escapeHtml(step.error.message)}</div>\n`;
+                }
+                // Show API response details
+                if (isApiRequest && response) {
+                    html += `            <div class="step-details">\n`;
+                    if (response.status) {
+                        const statusClass = response.status >= 200 && response.status < 300 ? 'success'
+                            : response.status >= 400 && response.status < 500 ? 'client-error'
+                                : response.status >= 500 ? 'server-error' : '';
+                        html += `              <div class="response-status">
+                <span class="response-label">Status:</span>
+                <span class="status-code ${statusClass}">${response.status}</span>
+              </div>\n`;
+                    }
+                    if (response.headers && Object.keys(response.headers).length > 0) {
+                        html += `              <details class="response-section">
+                <summary>Headers</summary>
+                <pre class="response-pre">${escapeHtml(JSON.stringify(response.headers, null, 2))}</pre>
+              </details>\n`;
+                    }
+                    if (response.body !== undefined) {
+                        const bodyStr = typeof response.body === 'string'
+                            ? response.body
+                            : JSON.stringify(response.body, null, 2);
+                        html += `              <details class="response-section">
+                <summary>Body</summary>
+                <pre class="response-pre">${escapeHtml(bodyStr)}</pre>
+              </details>\n`;
+                    }
+                    html += `            </div>\n`;
+                }
+                else if (step.output !== undefined && step.output !== null && !step.screenshot) {
+                    // Show generic output for non-API steps
+                    const outputStr = formatStepOutput(step.output, step.stepType);
+                    if (outputStr) {
+                        html += `            <div class="step-details">
+              <pre class="response-pre">${escapeHtml(outputStr)}</pre>
+            </div>\n`;
+                    }
+                }
+                // Show stack trace for errors
+                if (step.error?.stack) {
+                    html += `            <details class="response-section">
+              <summary>Stack Trace</summary>
+              <pre class="response-pre stack-trace">${escapeHtml(step.error.stack)}</pre>
+            </details>\n`;
+                }
+                // Show screenshot
                 if (step.screenshot) {
-                    html += `        <img class="screenshot" src="${step.screenshot}" alt="Screenshot at failure">\n`;
+                    html += `            <img class="screenshot" src="${step.screenshot}" alt="Screenshot at failure" onclick="window.open(this.src, '_blank')">\n`;
                 }
+                html += `          </div>\n`;
             }
+            html += `        </div>\n`;
             html += `      </div>\n`;
-            if (result.error) {
-                html += `      <div class="error-details">${escapeHtml(result.error.message)}${result.error.stack ? '\n\n' + escapeHtml(result.error.stack) : ''}</div>\n`;
+        }
+        // Render lifecycle hooks (afterAll)
+        const afterAllHooks = lifecycleResults.filter(r => r.lifecycleType === 'afterAll');
+        if (afterAllHooks.length > 0) {
+            html += `      <div class="lifecycle-section">\n`;
+            html += `        <div class="lifecycle-header">After All</div>\n`;
+            for (const hook of afterAllHooks) {
+                const iconClass = hook.status === 'passed' ? 'passed' : 'failed';
+                html += `        <div class="lifecycle-item">
+          <span class="step-dot ${iconClass}"></span>
+          <span>${hook.steps.length} steps</span>
+          <span style="color: var(--color-text-secondary); font-size: 12px;">${hook.duration}ms</span>
+        </div>\n`;
+                if (hook.error) {
+                    html += `        <div class="error-message" style="margin: 4px 0 0 16px;">${escapeHtml(hook.error.message)}</div>\n`;
+                }
             }
+            html += `      </div>\n`;
         }
         html += `    </div>\n`;
     }