|
19 | 19 |
|
20 | 20 | import * as assert from 'assert'; |
21 | 21 | import * as sinon from 'sinon'; |
22 | | -import { afterEach, beforeEach } from 'mocha'; |
| 22 | +import { afterEach, beforeEach, test } from 'mocha'; |
23 | 23 | import { DdevUtils, sys } from '../shared/utils/ddev-utils'; |
24 | 24 |
|
| 25 | +interface ExecDdevError extends Error { |
| 26 | + status: number; |
| 27 | + stderr: string; |
| 28 | + stdout?: string; |
| 29 | + command?: string; |
| 30 | + workspacePath?: string; |
| 31 | +} |
| 32 | + |
25 | 33 | suite('DdevUtils Test Suite', () => { |
26 | 34 | let sandbox: sinon.SinonSandbox; |
27 | 35 | let spawnSyncStub: sinon.SinonStub; |
@@ -106,7 +114,7 @@ suite('DdevUtils Test Suite', () => { |
106 | 114 | const result = DdevUtils.validateDdevTool('phpstan', '/test/workspace'); |
107 | 115 |
|
108 | 116 | assert.strictEqual(result.isValid, true); |
109 | | - assert.ok(result.errorType === undefined); |
| 117 | + assert.strictEqual(result.errorType, undefined); |
110 | 118 | }); |
111 | 119 |
|
112 | 120 | test('validateDdevTool returns error message for DDEV issues', () => { |
@@ -159,7 +167,7 @@ suite('DdevUtils Test Suite', () => { |
159 | 167 |
|
160 | 168 | assert.throws(() => { |
161 | 169 | DdevUtils.execDdev(['ls'], '/test/workspace'); |
162 | | - }, (err: { status: number; stderr: string; stdout?: string; command?: string; workspacePath?: string; name?: string }) => { |
| 170 | + }, (err: ExecDdevError) => { |
163 | 171 | return err.status === 1 && err.stderr === 'error'; |
164 | 172 | }); |
165 | 173 | }); |
|
0 commit comments