fixup! merge repair

Author: erights

packages/pass-style/test/passStyleOf.test.js

@@ -92,14 +92,16 @@ test('some passStyleOf rejections', t => {
   prbad2.extra = 'unexpected own property';
   harden(prbad2);
   t.throws(() => passStyleOf(prbad2), {
-    message: /\[Promise\]" - Must not have any own properties: \["extra"\]/,
+    message:
+      /\[Promise\]" - Must not have any string-named own properties: \["extra"\]/,
   });
 
   const prbad3 = Promise.resolve();
   Object.defineProperty(prbad3, 'then', { value: () => 'bad then' });
   harden(prbad3);
   t.throws(() => passStyleOf(prbad3), {
-    message: /\[Promise\]" - Must not have any own properties: \["then"\]/,
+    message:
+      /\[Promise\]" - Must not have any string-named own properties: \["then"\]/,
   });
 
   const thenable1 = harden({ then: () => 'thenable' });

packages/pass-style/test/safe-promise.test.js

@@ -18,7 +18,8 @@ test('safe promise loophole', t => {
     const p2 = Promise.resolve('p2');
     p2.silly = 'silly own property';
     t.throws(() => passStyleOf(harden(p2)), {
-      message: '"[Promise]" - Must not have any own properties: ["silly"]',
+      message:
+        '"[Promise]" - Must not have any string-named own properties: ["silly"]',
     });
     t.is(p2[toStringTag], 'Promise');
     t.is(`${p2}`, '[object Promise]');
@@ -39,9 +40,7 @@ test('safe promise loophole', t => {
     defineProperty(p3, toStringTag, {
       value: 3,
     });
-    t.throws(() => passStyleOf(harden(p3)), {
-      message: 'Own @@toStringTag value must be a string: 3',
-    });
+    t.is(passStyleOf(harden(p3)), 'promise');
   }
 
   {
@@ -50,10 +49,7 @@ test('safe promise loophole', t => {
       value: 'Promise p4',
       enumerable: true,
     });
-    t.throws(() => passStyleOf(harden(p4)), {
-      message:
-        'Own @@toStringTag must not be enumerable: {"configurable":false,"enumerable":true,"value":"Promise p4","writable":false}',
-    });
+    t.is(passStyleOf(harden(p4)), 'promise');
 
     const p5 = Promise.resolve('p5');
     defineProperty(p5, toStringTag, {