Fix

allegro · Apr 26, 2024 · f525fd8 · f525fd8
1 parent fadba6a
commit f525fd8
Show file tree

Hide file tree

Showing 5 changed files with 58 additions and 64 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -19,22 +19,16 @@ jobs:
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        os: [ubuntu-latest]
-        typescript_version: [ 5.2.2]
+        os: [ubuntu-latest, windows-latest]
+        typescript_version: [4.x, 5.2.2, 5.4.5]
 
     steps:
       - uses: actions/checkout@v4
       - name: Use Node.js 20.x
         uses: actions/setup-node@v4
         with:
-          node-version: '20.11.0'
+          node-version: '20.x'
       - run: npm i
       - run: npm i -D typescript@${{ matrix.typescript_version }}
       - run: npm run build
       - run: npm run test
-      - uses: actions/upload-artifact@v4
-        if: ${{ success() || failure() }}
-        with:
-          name: logs
-          path: e2e/**/ts.log
-
diff --git a/e2e/plugin/multipleFile.spec.ts b/e2e/plugin/multipleFile.spec.ts
@@ -4,14 +4,14 @@ import { fixtureWithDefaultConfig } from '../fixtures/paths';
 describe('multiple file diagnostics', () => {
   it('should show errors only on file with strict comment', async () => {
     // given
-    // const { projectPath, filePaths } = fixtureWithDefaultConfig;
-    // const fileList = [filePaths.strict, filePaths.ignored];
-    //
-    // // when
-    // const diagnostics = await getMultipleDiagnostics(projectPath, fileList);
+    const { projectPath, filePaths } = fixtureWithDefaultConfig;
+    const fileList = [filePaths.strict, filePaths.ignored];
+
+    // when
+    const diagnostics = await getMultipleDiagnostics(projectPath, fileList);
 
     // then
-    expect([1]).toHaveLength(1);
-    expect([]).toHaveLength(0);
+    expect(diagnostics[0]).toHaveLength(1);
+    expect(diagnostics[1]).toHaveLength(0);
   });
 });
diff --git a/e2e/plugin/singleFile.spec.ts b/e2e/plugin/singleFile.spec.ts
@@ -17,49 +17,49 @@ describe('single file diagnostics', () => {
     expect(diagnostics).toHaveLength(1);
   });
 
-  // it('should not enable strict mode in ignored file', async () => {
-  //   // given
-  //   const { projectPath, filePaths } = fixtureWithDefaultConfig;
-  //
-  //   // when
-  //   const diagnostics = await getDiagnostics(projectPath, filePaths.ignored);
-  //
-  //   // then
-  //   expect(diagnostics).toHaveLength(0);
-  // });
-  //
-  // it('should not enable strict mode when file is not on path', async () => {
-  //   // given
-  //   const { projectPath, filePaths } = fixtureWithPathConfig;
-  //
-  //   // when
-  //   const diagnostics = await getDiagnostics(projectPath, filePaths.excluded);
-  //
-  //   // then
-  //   expect(diagnostics).toHaveLength(0);
-  // });
-  //
-  // it('should enable strict mode when file is not on path and contains strict comment', async () => {
-  //   // given
-  //   const { projectPath, filePaths } = fixtureWithPathConfig;
-  //
-  //   // when
-  //   const diagnostics = await getDiagnostics(projectPath, filePaths.excludedWithStrictComment);
-  //
-  //   // then
-  //   expect(diagnostics).toHaveLength(1);
-  // });
-  //
-  // it('should enable strict mode with a relative path config', async () => {
-  //   // given
-  //   const { projectPath, filePaths } = fixtureWithPathConfig;
-  //
-  //   // when
-  //   const diagnosticsIncluded = await getDiagnostics(projectPath, filePaths.included);
-  //   const diagnosticsExcluded = await getDiagnostics(projectPath, filePaths.excluded);
-  //
-  //   // then
-  //   expect(diagnosticsIncluded).toHaveLength(1);
-  //   expect(diagnosticsExcluded).toHaveLength(0);
-  // });
+  it('should not enable strict mode in ignored file', async () => {
+    // given
+    const { projectPath, filePaths } = fixtureWithDefaultConfig;
+
+    // when
+    const diagnostics = await getDiagnostics(projectPath, filePaths.ignored);
+
+    // then
+    expect(diagnostics).toHaveLength(0);
+  });
+
+  it('should not enable strict mode when file is not on path', async () => {
+    // given
+    const { projectPath, filePaths } = fixtureWithPathConfig;
+
+    // when
+    const diagnostics = await getDiagnostics(projectPath, filePaths.excluded);
+
+    // then
+    expect(diagnostics).toHaveLength(0);
+  });
+
+  it('should enable strict mode when file is not on path and contains strict comment', async () => {
+    // given
+    const { projectPath, filePaths } = fixtureWithPathConfig;
+
+    // when
+    const diagnostics = await getDiagnostics(projectPath, filePaths.excludedWithStrictComment);
+
+    // then
+    expect(diagnostics).toHaveLength(1);
+  });
+
+  it('should enable strict mode with a relative path config', async () => {
+    // given
+    const { projectPath, filePaths } = fixtureWithPathConfig;
+
+    // when
+    const diagnosticsIncluded = await getDiagnostics(projectPath, filePaths.included);
+    const diagnosticsExcluded = await getDiagnostics(projectPath, filePaths.excluded);
+
+    // then
+    expect(diagnosticsIncluded).toHaveLength(1);
+    expect(diagnosticsExcluded).toHaveLength(0);
+  });
 });
diff --git a/e2e/plugin/utils/TSServer.ts b/e2e/plugin/utils/TSServer.ts
@@ -35,7 +35,7 @@ export class TSServer {
     const server = fork(tsserverPath, {
       stdio: ['pipe', 'pipe', 'pipe', 'ipc'],
       cwd: projectPath,
-      env: { TSS_LOG: '-logToFile true -file ./ts.log -level verbose' }, // creates tsserver log from tests
+      // env: { TSS_LOG: '-logToFile true -file ./ts.log -level verbose' }, // creates tsserver log from tests
     });
     this._exitPromise = new Promise((resolve, reject) => {
       server.on('exit', (code: string) => resolve(code));

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "typescript-strict-plugin",
-  "version": "2.4.1",
+  "version": "2.4.2",
   "description": "Typescript tools that help with migration to the strict mode",
   "author": "Allegro",
   "contributors": [
@@ -39,7 +39,7 @@
   },
   "jest": {
     "preset": "ts-jest",
-    "testTimeout": 15000,
+    "testTimeout": 20000,
     "roots": [
       "src",
       "e2e"