gaspersic/freeCodeCamp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Revert "fix: only include frame-runner when running tests (#44337)" (#44419)

Browse Source 
This reverts commit a23a47750b.
This commit is contained in:
Nicholas Carrigan (he/him)
2021-12-08 08:40:41 -08:00
committed by GitHub
parent 50b554470d
commit c19bf504b8
3 changed files with 12 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
client/src/templates/Challenges/redux/execute-challenge-saga.js
View File

@ -86,8 +86,7 @@ export function* executeChallengeSaga({ payload }) {
const protect = isLoopProtected(challengeMeta); const protect = isLoopProtected(challengeMeta);
const buildData = yield buildChallengeData(challengeData, { const buildData = yield buildChallengeData(challengeData, {
preview: false, preview: false,
protect, protect
usesTestRunner: true
}); });
const document = yield getContext('document'); const document = yield getContext('document');
const testRunner = yield call( const testRunner = yield call(

13
client/src/templates/Challenges/utils/build.js
View File

@ -130,13 +130,12 @@ async function getDOMTestRunner(buildData, { proxyLogger }, document) {
runTestInTestFrame(document, testString, testTimeout); runTestInTestFrame(document, testString, testTimeout);
} }
export function buildDOMChallenge( export function buildDOMChallenge({
{ challengeFiles, required = [], template = '' }, challengeFiles,
{ usesTestRunner } = { usesTestRunner: false } required = [],
) { template = ''
const finalRequires = [...required]; }) {
if (usesTestRunner) finalRequires.push(...frameRunner); const finalRequires = [...required, ...frameRunner];
const loadEnzyme = challengeFiles.some( const loadEnzyme = challengeFiles.some(
challengeFile => challengeFile.ext === 'jsx' challengeFile => challengeFile.ext === 'jsx'
); );

13
curriculum/test/test-challenges.js
View File

@ -570,14 +570,11 @@ async function createTestRunner(
challengeFile.editableContents = solutionFile.editableContents; challengeFile.editableContents = solutionFile.editableContents;
}); });
const { build, sources, loadEnzyme } = await buildChallenge( const { build, sources, loadEnzyme } = await buildChallenge({
{ challengeFiles,
challengeFiles, required,
required, template
template });
},
{ usesTestRunner: true }
);
const code = { const code = {
contents: sources.index, contents: sources.index,