From c19bf504b817b3027ed687c2eed04cfe83c5d716 Mon Sep 17 00:00:00 2001
From: "Nicholas Carrigan (he/him)" <nhcarrigan@gmail.com>
Date: Wed, 8 Dec 2021 08:40:41 -0800
Subject: [PATCH] Revert "fix: only include frame-runner when running tests
 (#44337)" (#44419)

This reverts commit a23a47750b869cbb31c0f1a17869b7c89b705b90.
---
 .../Challenges/redux/execute-challenge-saga.js      |  3 +--
 client/src/templates/Challenges/utils/build.js      | 13 ++++++-------
 curriculum/test/test-challenges.js                  | 13 +++++--------
 3 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/client/src/templates/Challenges/redux/execute-challenge-saga.js b/client/src/templates/Challenges/redux/execute-challenge-saga.js
index 028e84ea90..4f1bdde20c 100644
--- a/client/src/templates/Challenges/redux/execute-challenge-saga.js
+++ b/client/src/templates/Challenges/redux/execute-challenge-saga.js
@@ -86,8 +86,7 @@ export function* executeChallengeSaga({ payload }) {
     const protect = isLoopProtected(challengeMeta);
     const buildData = yield buildChallengeData(challengeData, {
       preview: false,
-      protect,
-      usesTestRunner: true
+      protect
     });
     const document = yield getContext('document');
     const testRunner = yield call(
diff --git a/client/src/templates/Challenges/utils/build.js b/client/src/templates/Challenges/utils/build.js
index 832552697b..9f393ee230 100644
--- a/client/src/templates/Challenges/utils/build.js
+++ b/client/src/templates/Challenges/utils/build.js
@@ -130,13 +130,12 @@ async function getDOMTestRunner(buildData, { proxyLogger }, document) {
     runTestInTestFrame(document, testString, testTimeout);
 }
 
-export function buildDOMChallenge(
-  { challengeFiles, required = [], template = '' },
-  { usesTestRunner } = { usesTestRunner: false }
-) {
-  const finalRequires = [...required];
-  if (usesTestRunner) finalRequires.push(...frameRunner);
-
+export function buildDOMChallenge({
+  challengeFiles,
+  required = [],
+  template = ''
+}) {
+  const finalRequires = [...required, ...frameRunner];
   const loadEnzyme = challengeFiles.some(
     challengeFile => challengeFile.ext === 'jsx'
   );
diff --git a/curriculum/test/test-challenges.js b/curriculum/test/test-challenges.js
index 9cf2b3417e..07ea985f1f 100644
--- a/curriculum/test/test-challenges.js
+++ b/curriculum/test/test-challenges.js
@@ -570,14 +570,11 @@ async function createTestRunner(
     challengeFile.editableContents = solutionFile.editableContents;
   });
 
-  const { build, sources, loadEnzyme } = await buildChallenge(
-    {
-      challengeFiles,
-      required,
-      template
-    },
-    { usesTestRunner: true }
-  );
+  const { build, sources, loadEnzyme } = await buildChallenge({
+    challengeFiles,
+    required,
+    template
+  });
 
   const code = {
     contents: sources.index,