fix tests

Author: lobsterkatie

packages/nextjs/test/config/loaders.test.ts

@@ -10,39 +10,74 @@ import {
 } from './fixtures';
 import { materializeFinalWebpackConfig } from './testUtils';
 
+type MatcherResult = { pass: boolean; message: () => string };
+
+expect.extend({
+  stringEndingWith(received: string, expectedEnding: string): MatcherResult {
+    const failsTest = !received.endsWith(expectedEnding);
+    const generateErrorMessage = () =>
+      failsTest
+        ? // Regular error message for match failing
+          `expected string ending with '${expectedEnding}', but got '${received}'`
+        : // Error message for the match passing if someone has called it with `expect.not`
+          `expected string not ending with '${expectedEnding}', but got '${received}'`;
+
+    return {
+      pass: !failsTest,
+      message: generateErrorMessage,
+    };
+  },
+});
+
+declare global {
+  // eslint-disable-next-line @typescript-eslint/no-namespace
+  namespace jest {
+    interface Expect {
+      stringEndingWith: (expectedEnding: string) => MatcherResult;
+    }
+  }
+}
+
 describe('webpack loaders', () => {
-  it('adds loader to server config', async () => {
-    const finalWebpackConfig = await materializeFinalWebpackConfig({
-      exportedNextConfig,
-      incomingWebpackConfig: serverWebpackConfig,
-      incomingWebpackBuildContext: serverBuildContext,
+  describe('server loaders', () => {
+    it('adds server `RewriteFrames` loader to server config', async () => {
+      const finalWebpackConfig = await materializeFinalWebpackConfig({
+        exportedNextConfig,
+        incomingWebpackConfig: serverWebpackConfig,
+        incomingWebpackBuildContext: serverBuildContext,
+      });
+
+      expect(finalWebpackConfig.module.rules).toContainEqual({
+        test: /sentry\.server\.config\.(jsx?|tsx?)/,
+        use: [
+          {
+            loader: expect.stringEndingWith('prefixLoader.js'),
+            options: expect.objectContaining({ templatePrefix: 'serverRewriteFrames' }),
+          },
+        ],
+      });
     });
+  });
+
+  describe('client loaders', () => {
+    it("doesn't add `RewriteFrames` loader to client config", async () => {
+      const finalWebpackConfig = await materializeFinalWebpackConfig({
+        exportedNextConfig,
+        incomingWebpackConfig: clientWebpackConfig,
+        incomingWebpackBuildContext: clientBuildContext,
+      });
 
-    expect(finalWebpackConfig.module!.rules).toEqual(
-      expect.arrayContaining([
-        {
-          test: expect.any(RegExp),
+      expect(finalWebpackConfig.module.rules).not.toContainEqual(
+        expect.objectContaining({
           use: [
             {
-              loader: expect.any(String),
-              // Having no criteria for what the object contains is better than using `expect.any(Object)`, because that
-              // could be anything
-              options: expect.objectContaining({}),
+              loader: expect.stringEndingWith('prefixLoader.js'),
+              options: expect.objectContaining({ templatePrefix: expect.stringContaining('RewriteFrames') }),
             },
           ],
-        },
-      ]),
-    );
-  });
-
-  it("doesn't add loader to client config", async () => {
-    const finalWebpackConfig = await materializeFinalWebpackConfig({
-      exportedNextConfig,
-      incomingWebpackConfig: clientWebpackConfig,
-      incomingWebpackBuildContext: clientBuildContext,
+        }),
+      );
     });
-
-    expect(finalWebpackConfig.module).toBeUndefined();
   });
 });
 

packages/nextjs/test/config/testUtils.ts

@@ -7,6 +7,7 @@ import {
   NextConfigObject,
   SentryWebpackPluginOptions,
   WebpackConfigObject,
+  WebpackConfigObjectWithModuleRules,
 } from '../../src/config/types';
 import { constructWebpackConfigFunction, SentryWebpackPlugin } from '../../src/config/webpack';
 import { withSentryConfig } from '../../src/config/withSentryConfig';
@@ -57,7 +58,7 @@ export async function materializeFinalWebpackConfig(options: {
   userSentryWebpackPluginConfig?: Partial<SentryWebpackPluginOptions>;
   incomingWebpackConfig: WebpackConfigObject;
   incomingWebpackBuildContext: BuildContext;
-}): Promise<WebpackConfigObject> {
+}): Promise<WebpackConfigObjectWithModuleRules> {
   const { exportedNextConfig, userSentryWebpackPluginConfig, incomingWebpackConfig, incomingWebpackBuildContext } =
     options;
 
@@ -83,7 +84,7 @@ export async function materializeFinalWebpackConfig(options: {
   const webpackEntryProperty = finalWebpackConfigValue.entry as EntryPropertyFunction;
   finalWebpackConfigValue.entry = await webpackEntryProperty();
 
-  return finalWebpackConfigValue;
+  return finalWebpackConfigValue as WebpackConfigObjectWithModuleRules;
 }
 
 // helper function to make sure we're checking the correct plugin's data