test: improve

webpack-contrib · Apr 11, 2024 · 3f45fe1 · 3f45fe1
1 parent 4a00573
commit 3f45fe1
Show file tree

Hide file tree

Showing 10 changed files with 331 additions and 9 deletions.
diff --git a/src/utils.js b/src/utils.js
@@ -767,16 +767,16 @@ function getCompileFn(loaderContext, implementation, options) {
 
             // Check again because awaiting the initialization function
             // introduces a race condition.
-            if (!sassModernCompilers.has(implementation)) {
-              sassModernCompilers.set(implementation, compiler);
+            if (!sassModernCompilers.has(webpackCompiler)) {
+              sassModernCompilers.set(webpackCompiler, compiler);
               webpackCompiler.hooks.shutdown.tap("sass-loader", () => {
                 compiler.dispose();
               });
             }
           }
 
           return sassModernCompilers
-            .get(implementation)
+            .get(webpackCompiler)
             .compileStringAsync(data, rest);
         }
 

diff --git a/test/additionalData-option.test.js b/test/additionalData-option.test.js
@@ -1,5 +1,6 @@
 import {
   compile,
+  close,
   getCodeFromBundle,
   getCodeFromSass,
   getCompiler,
@@ -35,6 +36,8 @@ describe("additionalData option", () => {
         expect(codeFromBundle.css).toMatchSnapshot("css");
         expect(getWarnings(stats)).toMatchSnapshot("warnings");
         expect(getErrors(stats)).toMatchSnapshot("errors");
+
+        await close(compiler);
       });
 
       it(`should work as a function ('${implementationName}', '${api}' API, '${syntax}' syntax)`, async () => {
@@ -60,6 +63,8 @@ describe("additionalData option", () => {
         expect(codeFromBundle.css).toMatchSnapshot("css");
         expect(getWarnings(stats)).toMatchSnapshot("warnings");
         expect(getErrors(stats)).toMatchSnapshot("errors");
+
+        await close(compiler);
       });
 
       it(`should work as an async function ('${implementationName}', '${api}' API, '${syntax}' syntax)`, async () => {
@@ -85,6 +90,8 @@ describe("additionalData option", () => {
         expect(codeFromBundle.css).toMatchSnapshot("css");
         expect(getWarnings(stats)).toMatchSnapshot("warnings");
         expect(getErrors(stats)).toMatchSnapshot("errors");
+
+        await close(compiler);
       });
 
       it(`should use same EOL on all os ('${implementationName}', '${api}' API, '${syntax}' syntax)`, async () => {
@@ -106,6 +113,8 @@ a {
         expect(codeFromBundle.css).toMatchSnapshot("css");
         expect(getWarnings(stats)).toMatchSnapshot("warnings");
         expect(getErrors(stats)).toMatchSnapshot("errors");
+
+        await close(compiler);
       });
     });
   });

diff --git a/test/helpers/close.js b/test/helpers/close.js
@@ -0,0 +1,10 @@
+export default (compiler) =>
+  new Promise((resolve, reject) => {
+    compiler.close((error) => {
+      if (error) {
+        return reject(error);
+      }
+
+      return resolve();
+    });
+  });
diff --git a/test/helpers/index.js b/test/helpers/index.js
@@ -1,4 +1,5 @@
 import compile from "./compiler";
+import close from "./close";
 import customFunctions from "./customFunctions";
 import customImporter from "./customImporter";
 import getCodeFromBundle from "./getCodeFromBundle";
@@ -13,6 +14,7 @@ import readAsset from "./readAsset";
 
 export {
   compile,
+  close,
   customFunctions,
   customImporter,
   getCodeFromBundle,

diff --git a/test/implementation-option.test.js b/test/implementation-option.test.js
@@ -4,6 +4,7 @@ import dartSass from "sass";
 import * as sassEmbedded from "sass-embedded";
 
 import {
+  close,
   compile,
   getCodeFromBundle,
   getCompiler,
@@ -149,6 +150,8 @@ describe("implementation option", () => {
       sassEmbeddedSpy.mockClear();
       sassEmbeddedSpyModernAPI.mockClear();
       sassEmbeddedCompilerSpies.mockClear();
+
+      await close(compiler);
     });
   });
 
@@ -162,6 +165,8 @@ describe("implementation option", () => {
 
     expect(getWarnings(stats)).toMatchSnapshot("warnings");
     expect(getErrors(stats)).toMatchSnapshot("errors");
+
+    await close(compiler);
   });
 
   it("not specify", async () => {
@@ -182,6 +187,8 @@ describe("implementation option", () => {
 
     nodeSassSpy.mockClear();
     dartSassSpy.mockClear();
+
+    await close(compiler);
   });
 
   it("not specify with legacy API", async () => {
@@ -204,6 +211,8 @@ describe("implementation option", () => {
 
     nodeSassSpy.mockClear();
     dartSassSpy.mockClear();
+
+    await close(compiler);
   });
 
   it("not specify with modern API", async () => {
@@ -226,6 +235,8 @@ describe("implementation option", () => {
 
     nodeSassSpy.mockClear();
     dartSassSpyModernAPI.mockClear();
+
+    await close(compiler);
   });
 
   it("not specify with modern-compiler API", async () => {
@@ -250,6 +261,8 @@ describe("implementation option", () => {
     nodeSassSpy.mockClear();
     dartSassSpyModernAPI.mockClear();
     dartSassCompilerSpies.mockClear();
+
+    await close(compiler);
   });
 
   it.each(["dart-sass", "sass-embedded"])(
@@ -279,6 +292,8 @@ describe("implementation option", () => {
 
       dartSassCompilerSpies.mockClear();
       sassEmbeddedCompilerSpies.mockClear();
+
+      await close(compiler);
     },
   );
 
@@ -295,6 +310,8 @@ describe("implementation option", () => {
 
     expect(getWarnings(stats)).toMatchSnapshot("warnings");
     expect(getErrors(stats)).toMatchSnapshot("errors");
+
+    await close(compiler);
   });
 
   it('should throw an error when the "info" is unparseable', async () => {
@@ -308,6 +325,8 @@ describe("implementation option", () => {
 
     expect(getWarnings(stats)).toMatchSnapshot("warnings");
     expect(getErrors(stats)).toMatchSnapshot("errors");
+
+    await close(compiler);
   });
 
   it('should throw error when the "info" does not exist', async () => {
@@ -322,6 +341,8 @@ describe("implementation option", () => {
 
     expect(getWarnings(stats)).toMatchSnapshot("warnings");
     expect(getErrors(stats)).toMatchSnapshot("errors");
+
+    await close(compiler);
   });
 
   it("should try to load using valid order", async () => {
@@ -360,6 +381,8 @@ describe("implementation option", () => {
 
     expect(getWarnings(stats)).toMatchSnapshot("warnings");
     expect(getErrors(stats)).toMatchSnapshot("errors");
+
+    await close(compiler);
   });
 
   it("should not swallow an error when trying to load a sass implementation", async () => {
@@ -389,5 +412,7 @@ describe("implementation option", () => {
 
     expect(getWarnings(stats)).toMatchSnapshot("warnings");
     expect(getErrors(stats)).toMatchSnapshot("errors");
+
+    await close(compiler);
   });
 });