fix tests

Author: mydea

dev-packages/node-integration-tests/suites/express/requestUser/test.ts

@@ -5,28 +5,21 @@ describe('express user handling', () => {
     cleanupChildProcesses();
   });
 
-  test('picks user from request', done => {
+  test('ignores user from request', done => {
+    expect.assertions(2);
+
     createRunner(__dirname, 'server.js')
       .expect({
-        event: {
-          user: {
-            id: '1',
-            email: 'test@sentry.io',
-          },
-          exception: {
-            values: [
-              {
-                value: 'error_1',
-              },
-            ],
-          },
+        event: event => {
+          expect(event.user).toBeUndefined();
+          expect(event.exception?.values?.[0]?.value).toBe('error_1');
         },
       })
       .start(done)
       .makeRequest('get', '/test1', { expectError: true });
   });
 
-  test('setUser overwrites user from request', done => {
+  test('using setUser in middleware works', done => {
     createRunner(__dirname, 'server.js')
       .expect({
         event: {

packages/core/test/lib/integrations/requestdata.test.ts

@@ -59,13 +59,13 @@ describe('`RequestData` integration', () => {
 
   describe('option conversion', () => {
     it('leaves `ip` and `user` at top level of `include`', () => {
-      const requestDataEventProcessor = initWithRequestDataIntegrationOptions({ include: { ip: false, user: true } });
+      const requestDataEventProcessor = initWithRequestDataIntegrationOptions({ include: { ip: false } });
 
       void requestDataEventProcessor(event, {});
       expect(addNormalizedRequestDataToEventSpy).toHaveBeenCalled();
       const passedOptions = addNormalizedRequestDataToEventSpy.mock.calls[0]?.[3];
 
-      expect(passedOptions?.include).toEqual(expect.objectContaining({ ip: false, user: true }));
+      expect(passedOptions?.include).toEqual(expect.objectContaining({ ip: false }));
     });
 
     it('moves `true` request keys into `request` include, but omits `false` ones', async () => {
@@ -80,18 +80,5 @@ describe('`RequestData` integration', () => {
       expect(passedOptions?.include?.request).toEqual(expect.arrayContaining(['data']));
       expect(passedOptions?.include?.request).not.toEqual(expect.arrayContaining(['cookies']));
     });
-
-    it('moves `true` user keys into `user` include, but omits `false` ones', async () => {
-      const requestDataEventProcessor = initWithRequestDataIntegrationOptions({
-        include: { user: { id: true, email: false } },
-      });
-
-      void requestDataEventProcessor(event, {});
-
-      const passedOptions = addNormalizedRequestDataToEventSpy.mock.calls[0]?.[3];
-
-      expect(passedOptions?.include?.user).toEqual(expect.arrayContaining(['id']));
-      expect(passedOptions?.include?.user).not.toEqual(expect.arrayContaining(['email']));
-    });
   });
 });