test(marshal,ses): Prefer test.skip over conditional early return (merge #2099)

Author: gibson042

packages/marshal/test/marshal-capdata.test.js

@@ -17,6 +17,14 @@ const harden = /** @type {import('ses').Harden & { isFake?: boolean }} */ (
   global.harden
 );
 
+// Unknown error names decode as generic Errors.
+// TODO: Remove after dropping support for pre-AggregateError implementations.
+const supportsAggregateError = typeof AggregateError !== 'undefined';
+const decodedAggregateErrorCtor = supportsAggregateError
+  ? AggregateError
+  : Error;
+const testIfAggregateError = supportsAggregateError ? test : test.skip;
+
 // this only includes the tests that do not use liveSlots
 
 /**
@@ -153,10 +161,6 @@ test('unserialize errors', t => {
 });
 
 test('unserialize extended errors', t => {
-  if (typeof AggregateError === 'undefined') {
-    t.pass('skip test on platforms prior to AggregateError');
-    return;
-  }
   const { unserialize } = makeTestMarshal();
   const uns = body => unserialize({ body, slots: [] });
 
@@ -171,10 +175,14 @@ test('unserialize extended errors', t => {
   const aggErr = uns(
     '{"@qclass":"error","message":"msg","name":"AggregateError","extraProp":"foo","cause":"bar","errors":["zip","zap"]}',
   );
-  t.is(getPrototypeOf(aggErr), AggregateError.prototype); // direct instance of
+  t.is(getPrototypeOf(aggErr), decodedAggregateErrorCtor.prototype); // direct instance of
   t.false('extraProp' in aggErr);
   t.false('cause' in aggErr);
-  t.is(aggErr.errors.length, 0);
+  if (supportsAggregateError) {
+    t.is(aggErr.errors.length, 0);
+  } else {
+    t.false('errors' in aggErr);
+  }
 
   const unkErr = uns(
     '{"@qclass":"error","message":"msg","name":"UnknownError","extraProp":"foo","cause":"bar","errors":["zip","zap"]}',
@@ -185,10 +193,7 @@ test('unserialize extended errors', t => {
   t.false('errors' in unkErr);
 });
 
-const testIfAggregateError =
-  typeof AggregateError !== 'undefined' ? test : test.skip;
-
-testIfAggregateError('unserialize errors w recognized extensions', t => {
+testIfAggregateError('unserialize recognized error extensions', t => {
   const { unserialize } = makeTestMarshal();
   const uns = body => unserialize({ body, slots: [] });
 
@@ -205,7 +210,7 @@ testIfAggregateError('unserialize errors w recognized extensions', t => {
   const aggErr = uns(
     `{"@qclass":"error","message":"msg","name":"AggregateError","extraProp":"foo","cause":${errEnc},"errors":[${errEnc}]}`,
   );
-  t.is(getPrototypeOf(aggErr), AggregateError.prototype); // direct instance of
+  t.is(getPrototypeOf(aggErr), decodedAggregateErrorCtor.prototype); // direct instance of
   t.false('extraProp' in aggErr);
   t.is(getPrototypeOf(aggErr.cause), URIError.prototype);
   t.is(getPrototypeOf(aggErr.errors[0]), URIError.prototype);

packages/marshal/test/marshal-smallcaps.test.js

@@ -18,6 +18,14 @@ const harden = /** @type {import('ses').Harden & { isFake?: boolean }} */ (
   global.harden
 );
 
+// Unknown error names decode as generic Errors.
+// TODO: Remove after dropping support for pre-AggregateError implementations.
+const supportsAggregateError = typeof AggregateError !== 'undefined';
+const decodedAggregateErrorCtor = supportsAggregateError
+  ? AggregateError
+  : Error;
+const testIfAggregateError = supportsAggregateError ? test : test.skip;
+
 // this only includes the tests that do not use liveSlots
 
 /**
@@ -159,10 +167,6 @@ test('smallcaps unserialize errors', t => {
 });
 
 test('smallcaps unserialize extended errors', t => {
-  if (typeof AggregateError === 'undefined') {
-    t.pass('skip test on platforms prior to AggregateError');
-    return;
-  }
   const { unserialize } = makeTestMarshal();
   const uns = body => unserialize({ body, slots: [] });
 
@@ -177,10 +181,14 @@ test('smallcaps unserialize extended errors', t => {
   const aggErr = uns(
     '#{"#error":"msg","name":"AggregateError","extraProp":"foo","cause":"bar","errors":["zip","zap"]}',
   );
-  t.is(getPrototypeOf(aggErr), AggregateError.prototype); // direct instance of
+  t.is(getPrototypeOf(aggErr), decodedAggregateErrorCtor.prototype); // direct instance of
   t.false('extraProp' in aggErr);
   t.false('cause' in aggErr);
-  t.is(aggErr.errors.length, 0);
+  if (supportsAggregateError) {
+    t.is(aggErr.errors.length, 0);
+  } else {
+    t.false('errors' in aggErr);
+  }
 
   const unkErr = uns(
     '#{"#error":"msg","name":"UnknownError","extraProp":"foo","cause":"bar","errors":["zip","zap"]}',
@@ -191,11 +199,7 @@ test('smallcaps unserialize extended errors', t => {
   t.false('errors' in unkErr);
 });
 
-test('smallcaps unserialize errors w recognized extensions', t => {
-  if (typeof AggregateError === 'undefined') {
-    t.pass('skip test on platforms prior to AggregateError');
-    return;
-  }
+testIfAggregateError('smallcaps unserialize recognized error extensions', t => {
   const { unserialize } = makeTestMarshal();
   const uns = body => unserialize({ body, slots: [] });
 
@@ -212,7 +216,7 @@ test('smallcaps unserialize errors w recognized extensions', t => {
   const aggErr = uns(
     `#{"#error":"msg","name":"AggregateError","extraProp":"foo","cause":${errEnc},"errors":[${errEnc}]}`,
   );
-  t.is(getPrototypeOf(aggErr), AggregateError.prototype); // direct instance of
+  t.is(getPrototypeOf(aggErr), decodedAggregateErrorCtor.prototype); // direct instance of
   t.false('extraProp' in aggErr);
   t.is(getPrototypeOf(refErr.cause), URIError.prototype);
   t.is(getPrototypeOf(refErr.errors[0]), URIError.prototype);

packages/ses/test/error/aggregate-error-console-demo.test.js

@@ -9,11 +9,11 @@ import '../../index.js';
 
 lockdown();
 
-test('aggregate error console demo', t => {
-  if (typeof AggregateError === 'undefined') {
-    t.pass('skip test on platforms prior to AggregateError');
-    return;
-  }
+// TODO: Remove after dropping support for pre-AggregateError implementations.
+const testIfAggregateError =
+  typeof AggregateError !== 'undefined' ? test : test.skip;
+
+testIfAggregateError('aggregate error console demo', t => {
   const e3 = Error('e3');
   const e2 = Error('e2', { cause: e3 });
   const u4 = URIError('u4', { cause: e2 });

packages/ses/test/error/aggregate-error-console.test.js

@@ -4,11 +4,11 @@ import { throwsAndLogs } from './_throws-and-logs.js';
 
 lockdown();
 
-test('aggregate error console', t => {
-  if (typeof AggregateError === 'undefined') {
-    t.pass('skip test on platforms prior to AggregateError');
-    return;
-  }
+// TODO: Remove after dropping support for pre-AggregateError implementations.
+const testIfAggregateError =
+  typeof AggregateError !== 'undefined' ? test : test.skip;
+
+testIfAggregateError('aggregate error console', t => {
   const e3 = Error('e3');
   const e2 = Error('e2', { cause: e3 });
   const u4 = URIError('u4', { cause: e2 });

packages/ses/test/error/aggregate-error.test.js

@@ -5,11 +5,11 @@ const { getOwnPropertyDescriptor } = Object;
 
 lockdown();
 
-test('aggregate error', t => {
-  if (typeof AggregateError === 'undefined') {
-    t.pass('skip test on platforms prior to AggregateError');
-    return;
-  }
+// TODO: Remove after dropping support for pre-AggregateError implementations.
+const testIfAggregateError =
+  typeof AggregateError !== 'undefined' ? test : test.skip;
+
+testIfAggregateError('aggregate error', t => {
   const e1 = Error('e1');
   const e2 = Error('e2', { cause: e1 });
   const u3 = URIError('u3', { cause: e1 });
@@ -31,12 +31,8 @@ test('aggregate error', t => {
   });
 });
 
-test('Promise.any aggregate error', async t => {
+testIfAggregateError('Promise.any aggregate error', async t => {
   await null;
-  if (typeof AggregateError === 'undefined') {
-    t.pass('skip test on platforms prior to AggregateError');
-    return;
-  }
   const e1 = Error('e1');
   const e2 = Error('e2', { cause: e1 });
   const u3 = URIError('u3', { cause: e1 });