From 6e9a5f66b2de2422bf83516d6311c5c73c8c2345 Mon Sep 17 00:00:00 2001
From: Andrew Bradley <cspotcode@gmail.com>
Date: Tue, 19 Apr 2022 19:54:02 -0400
Subject: [PATCH] finish changes  to run tests in-process

---
 src/test/repl/repl.spec.ts | 49 +++++++++++++++++++++++---------------
 1 file changed, 30 insertions(+), 19 deletions(-)

diff --git a/src/test/repl/repl.spec.ts b/src/test/repl/repl.spec.ts
index 7d519d199..55f49cb68 100644
--- a/src/test/repl/repl.spec.ts
+++ b/src/test/repl/repl.spec.ts
@@ -546,92 +546,103 @@ test.suite('REPL declares types for node built-ins within REPL', (test) => {
 });
 
 test.suite('REPL treats object literals and block scopes correctly', (test) => {
-  const macros = replMacros(test);
-  macros.noErrorsAndStdoutContains(
+  test(
     'repl should treat { key: 123 } as object literal',
+    macroReplNoErrorsAndStdoutContains,
     '{ key: 123 }',
     '{ key: 123 }'
   );
-  macros.noErrorsAndStdoutContains(
+  test(
     'repl should treat ({ key: 123 }) as object literal',
+    macroReplNoErrorsAndStdoutContains,
     '({ key: 123 })',
     '{ key: 123 }'
   );
-  macros.stderrContains(
+  test(
     'repl should treat ({ let v = 0; v; }) as object literal and error',
+    macroReplStderrContains,
     '({ let v = 0; v; })',
     semver.satisfies(ts.version, '2.7')
       ? 'error TS2304'
       : 'No value exists in scope for the shorthand property'
   );
-  macros.noErrorsAndStdoutContains(
+  test(
     'repl should treat { let v = 0; v; } as block scope',
+    macroReplNoErrorsAndStdoutContains,
     '{ let v = 0; v; }',
     '0'
   );
   test.suite('extra', (test) => {
     test.skipIf(semver.satisfies(ts.version, '2.7'));
-    const macros = replMacros(test);
-    macros.noErrorsAndStdoutContains(
+    test(
       'repl should treat { key: 123 }; as block scope',
+      macroReplNoErrorsAndStdoutContains,
       '{ key: 123 };',
       '123'
     );
-    macros.noErrorsAndStdoutContains(
+    test(
       'repl should treat {\\nkey: 123\\n}; as block scope',
+      macroReplNoErrorsAndStdoutContains,
       '{\nkey: 123\n};',
       '123'
     );
-    macros.noErrorsAndStdoutContains(
+    test(
       'repl should treat { key: 123 }[] as block scope (edge case)',
+      macroReplNoErrorsAndStdoutContains,
       '{ key: 123 }[]',
       '[]'
     );
   });
   test.suite('multiline', (test) => {
-    const macros = replMacros(test);
-    macros.noErrorsAndStdoutContains(
+    test(
       'repl should treat {\\nkey: 123\\n} as object literal',
+      macroReplNoErrorsAndStdoutContains,
       '{\nkey: 123\n}',
       '{ key: 123 }'
     );
-    macros.noErrorsAndStdoutContains(
+    test(
       'repl should treat ({\\nkey: 123\\n}) as object literal',
+      macroReplNoErrorsAndStdoutContains,
       '({\nkey: 123\n})',
       '{ key: 123 }'
     );
-    macros.stderrContains(
+    test(
       'repl should treat ({\\nlet v = 0;\\nv;\\n}) as object literal and error',
+      macroReplStderrContains,
       '({\nlet v = 0;\nv;\n})',
       semver.satisfies(ts.version, '2.7')
         ? 'error TS2304'
         : 'No value exists in scope for the shorthand property'
     );
-    macros.noErrorsAndStdoutContains(
+    test(
       'repl should treat {\\nlet v = 0;\\nv;\\n} as block scope',
+      macroReplNoErrorsAndStdoutContains,
       '{\nlet v = 0;\nv;\n}',
       '0'
     );
   });
   test.suite('property access', (test) => {
-    const macros = replMacros(test);
-    macros.noErrorsAndStdoutContains(
+    test(
       'repl should treat { key: 123 }.key as object literal property access',
+      macroReplNoErrorsAndStdoutContains,
       '{ key: 123 }.key',
       '123'
     );
-    macros.noErrorsAndStdoutContains(
+    test(
       'repl should treat { key: 123 }["key"] as object literal indexed access',
+      macroReplNoErrorsAndStdoutContains,
       '{ key: 123 }["key"]',
       '123'
     );
-    macros.stderrContains(
+    test(
       'repl should treat { key: 123 }.foo as object literal non-existent property access',
+      macroReplStderrContains,
       '{ key: 123 }.foo',
       "Property 'foo' does not exist on type"
     );
-    macros.stderrContains(
+    test(
       'repl should treat { key: 123 }["foo"] as object literal non-existent indexed access',
+      macroReplStderrContains,
       '{ key: 123 }["foo"]',
       semver.satisfies(ts.version, '2.7')
         ? 'error TS7017'