Fix challenge tests that rely on

This commit is contained in:
Bouncey
2018-09-11 15:06:49 +01:00
committed by Mrugesh Mohapatra
parent 980994ceac
commit e7211fc67b
2 changed files with 8 additions and 16 deletions

View File

@ -26,7 +26,6 @@ import {
initConsole,
updateConsole,
initLogs,
updateLogs,
logsToConsole,
checkChallenge,
updateTests,
@ -51,10 +50,7 @@ function updateMainEpic(actions, { getState }, { document }) {
const proxyLogger = new Subject();
const frameMain = createMainFramer(document, getState, proxyLogger);
const buildAndFrameMain = actions.pipe(
ofType(
types.updateFile,
types.challengeMounted
),
ofType(types.updateFile, types.challengeMounted),
debounceTime(executeDebounceTimeout),
switchMap(() =>
buildFromFiles(getState(), true).pipe(
@ -75,12 +71,13 @@ function executeChallengeEpic(action$, { getState }, { document }) {
filter(Boolean),
switchMap(() => {
const frameReady = new Subject();
const proxyLogger = new Subject();
// Removed for investigation into freeCodeCamp/Learn#291
// const proxyLogger = new Subject();
const frameTests = createTestFramer(
document,
getState,
frameReady,
proxyLogger
frameReady
// proxyLogger
);
const challengeResults = frameReady.pipe(
pluck('checkChallengePayload'),
@ -117,7 +114,7 @@ function executeChallengeEpic(action$, { getState }, { document }) {
const build =
challengeType === backend
? buildBackendChallenge(state)
: buildFromFiles(state, true);
: buildFromFiles(state, false);
return build.pipe(
tap(frameTests),
ignoreElements(),
@ -127,11 +124,7 @@ function executeChallengeEpic(action$, { getState }, { document }) {
);
})
);
return merge(
buildAndFrameChallenge,
challengeResults,
proxyLogger.map(updateLogs)
);
return merge(buildAndFrameChallenge, challengeResults);
})
);
}

View File

@ -140,12 +140,11 @@ export const createMainFramer = (document, getState, proxyLogger) =>
writeContentToFrame
);
export const createTestFramer = (document, getState, frameReady, proxyLogger) =>
export const createTestFramer = (document, getState, frameReady) =>
flow(
createFrame(document, getState, testId),
mountFrame(document),
addDepsToDocument,
writeTestDepsToDocument(frameReady),
buildProxyConsole(proxyLogger),
writeContentToFrame
);