Linter + broken test on IE10

kamilogorek · kamilogorek · commit 68b248a2a171 · 2019-10-03T10:38:04.000+02:00
diff --git a/packages/browser/test/integration/subjects/throw-object.js b/packages/browser/test/integration/subjects/throw-object.js
@@ -1,7 +1,7 @@
 function throwObjectError() {
   // never do this; just making sure Raven.js handles this case
   // gracefully
-  throw { error: "stuff is broken" };
+  throw { error: "stuff is broken", somekey: "ok" };
 }
 
 throwObjectError();
diff --git a/packages/browser/test/integration/suites/onerror.js b/packages/browser/test/integration/suites/onerror.js
@@ -61,11 +61,22 @@ describe("window.onerror", function() {
     }).then(function(summary) {
       assert.equal(summary.events[0].exception.values[0].type, "Error");
 
-      // #<Object> is covering default Android 4.4 and 5.1 browser
-      assert.match(
-        summary.events[0].exception.values[0].value,
-        /^(\[object Object\]|#<Object>)$/
-      );
+      // ¯\_(ツ)_/¯
+      if (summary.window.isBelowIE11()) {
+        assert.equal(
+          summary.events[0].exception.values[0].value,
+          "[object Object]"
+        );
+      } else {
+        assert.equal(
+          summary.events[0].exception.values[0].value,
+          "Custom Object"
+        );
+        assert.equal(
+          summary.events[0].message,
+          "Non-Error exception captured with keys: error, somekey"
+        );
+      }
       assert.equal(
         summary.events[0].exception.values[0].stacktrace.frames.length,
         1
diff --git a/packages/node/src/handlers.ts b/packages/node/src/handlers.ts
@@ -138,28 +138,34 @@ function extractRequestData(req: { [key: string]: any }, keys: boolean | string[
 const DEFAULT_USER_KEYS = ['id', 'username', 'email'];
 
 /** JSDoc */
-function extractUserData(req: { [key: string]: any }, keys: boolean | string[]): { [key: string]: string } {
-  const user: { [key: string]: string } = {};
+function extractUserData(
+  req: {
+    ip?: string;
+    connection?: {
+      remoteAddress?: string;
+    };
+    user?: {
+      [key: string]: any;
+    };
+  },
+  keys: boolean | string[],
+): { [key: string]: any } {
+  const user: { [key: string]: any } = {};
   const attributes = Array.isArray(keys) ? keys : DEFAULT_USER_KEYS;
 
   attributes.forEach(key => {
-    if (key in req.user) {
-      user[key] = (req.user as { [key: string]: string })[key];
+    if (req.user && key in req.user) {
+      user[key] = req.user[key];
     }
   });
 
   // client ip:
   //   node: req.connection.remoteAddress
   //   express, koa: req.ip
-  const ip =
-    req.ip ||
-    (req.connection &&
-      (req.connection as {
-        remoteAddress?: string;
-      }).remoteAddress);
+  const ip = req.ip || (req.connection && req.connection.remoteAddress);
 
   if (ip) {
-    user.ip_address = ip as string;
+    user.ip_address = ip;
   }
 
   return user;

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`function throwObjectError() {`
`2`	`2`	`// never do this; just making sure Raven.js handles this case`
`3`	`3`	`// gracefully`
`4`		`- throw { error: "stuff is broken" };`
	`4`	`+ throw { error: "stuff is broken", somekey: "ok" };`
`5`	`5`	`}`
`6`	`6`
`7`	`7`	`throwObjectError();`