@neurodevs/node-tdd 1.0.2 → 1.0.4

package/src/workspace/TestReporter.ts

@@ -86,9 +86,10 @@ export default class TestReporter {
     public setWatchMode(watchMode: WatchMode) {
         this.watchMode = watchMode
         if (!this.countDownTimeInterval) {
-            let label = watchMode === 'smart' ? 'Smart Watch' : 'Standard Watch'
+            let label =
+                watchMode === 'smart' ? 'Smart Watch   ' : 'Standard Watch'
             if (watchMode === 'off') {
-                label = 'Not Watching'
+                label = 'Not Watching  '
             }
             this.setWatchLabel(label)
         }
@@ -221,7 +222,7 @@ export default class TestReporter {
                     value: 'toggleDebug',
                 },
                 {
-                    label: 'Not Watching   ',
+                    label: 'Not Watching      ',
                     value: 'watchDropdown',
                     items: [
                         {
@@ -255,6 +256,7 @@ export default class TestReporter {
             this.setStatusLabel('Starting...')
         } else if (this.status === 'stopped') {
             this.refreshResults()
+            this.testLog?.scrollToTop()
             this.setStatusLabel('')
         } else if (this.status === 'running') {
             this.setStatusLabel('Running tests...')
@@ -331,22 +333,21 @@ export default class TestReporter {
     }
 
     private dropInTestLog() {
-        const parent = this.bottomLayout.getChildById('results')
+        const parent = this.bottomLayout.getChildById('results')!
 
-        if (parent) {
-            this.testLog = this.widgets.Widget('text', {
-                parent,
-                isScrollEnabled: true,
-                left: 0,
-                top: 0,
-                height: '100%',
-                width: '100%',
-                shouldLockHeightWithParent: true,
-                shouldLockWidthWithParent: true,
-            })
+        this.testLog = this.widgets.Widget('text', {
+            parent,
+            isScrollEnabled: true,
+            wordWrap: false,
+            left: 0,
+            top: 0,
+            height: '100%',
+            width: '100%',
+            shouldLockHeightWithParent: true,
+            shouldLockWidthWithParent: true,
+        })
 
-            void this.testLog.on('click', this.handleClickTestLog.bind(this))
-        }
+        void this.testLog.on('click', this.handleClickTestLog.bind(this))
     }
 
     private async handleClickTestLog(payload: { row: number; column: number }) {
@@ -437,7 +438,7 @@ export default class TestReporter {
             top: 1,
             height: 4,
             width: this.selectTestPopup.getFrame().width - 2,
-            text: `What do you wanna do with:\n\n${testFile}`,
+            text: `Selected file:\n\n${testFile}`,
         })
 
         const open = this.widgets.Widget('button', {
@@ -481,13 +482,17 @@ export default class TestReporter {
 
         for (const file of this.lastResults.testFiles ?? []) {
             const minRow = line
-            const maxRow = line + (file.tests ?? []).length
+            const lineCount =
+                1 +
+                (file.tests ?? []).length +
+                (file.status === 'running' ? 1 : 0)
+            const maxRow = line + lineCount - 1
 
             if (row >= minRow && row <= maxRow) {
                 return file.path
             }
 
-            line = maxRow
+            line = maxRow + 1
         }
 
         return undefined
@@ -657,7 +662,17 @@ export default class TestReporter {
         let logContent = ''
         let errorContent = ''
 
-        results.testFiles?.forEach((file) => {
+        const files = [...(results.testFiles ?? [])]
+
+        if (this.status === 'stopped') {
+            files.sort((a, b) => {
+                const aFailed = a.status === 'failed' ? 0 : 1
+                const bFailed = b.status === 'failed' ? 0 : 1
+                return aFailed - bFailed
+            })
+        }
+
+        files.forEach((file) => {
             logContent += this.errorLogItemGenerator.generateLogItemForFile(
                 file,
                 this.status

package/src/workspace/TkTextWidget.ts

@@ -50,7 +50,7 @@ export default class TkTextWidget extends TkBaseWidget implements TextWidget {
 
         const line = this.text.content.split('\n')[y]
 
-        await (this as TextWidget).emit('click', {
+        this.emit('click', {
             text: line,
             row: y,
             column: x,
@@ -71,7 +71,12 @@ export default class TkTextWidget extends TkBaseWidget implements TextWidget {
             width: newFrame.width ?? oldFrame.width,
             height: newFrame.height ?? oldFrame.height,
         })
-        this.text.draw()
+
+        if (this.text.scrollable) {
+            this.text.scrollTo(null, this.text.scrollY)
+        } else {
+            this.text.draw()
+        }
     }
 
     public getText(): string {
@@ -93,6 +98,10 @@ export default class TkTextWidget extends TkBaseWidget implements TextWidget {
         return this.text.scrollY
     }
 
+    public scrollToTop() {
+        this.text.scrollTo(null, 0)
+    }
+
     public getScrollX() {
         return this.text.scrollX
     }

package/src/workspace/testRunner.cli.ts

@@ -1,4 +1,5 @@
 import chokidar from 'chokidar'
+import { spawn } from 'child_process'
 import path from 'path'
 import CommandServiceImpl from './CommandService.js'
 import TestReporter from './TestReporter.js'
@@ -64,6 +65,12 @@ const reporter = new TestReporter({
         currentWatchMode = currentWatchMode === 'smart' ? 'off' : 'smart'
         reporter.setWatchMode(currentWatchMode)
     },
+    handleOpenTestFile: (filePath: string) => {
+        const fullPath = path.isAbsolute(filePath)
+            ? filePath
+            : path.join(cwd, 'src', '__tests__', filePath)
+        spawn('code', [fullPath], { detached: true, stdio: 'ignore' }).unref()
+    },
 })
 
 async function runTests() {

package/src/workspace/text.types.ts

@@ -23,4 +23,5 @@ export interface TextWidget extends BaseWidget<TextEventContract> {
     setText(content: string): void
     getScrollX(): number
     getScrollY(): number
+    scrollToTop(): void
 }