Commit0f06b1b

authored

Merge pull request#384 from coderoad/feature/subtask-markdown

update subtask schema

2 parents12c1fe1 +ed664e3 commit0f06b1bCopy full SHA for 0f06b1b

File tree

-6

lines changed

src/services/testRunner
- index.ts
typings
- tutorial.d.ts
web-app/src
- containers/Tutorial/components
  - Level.tsx
- services/state/actions
  - editor.ts

-6

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -112,7 +112,7 @@ const createTestRunner = (data: TT.Tutorial, callbacks: Callbacks) => {`
`112`	`112`	`summary:tap.summary,`
`113`	`113`	`}`
`114`	`114`
`115`		`-if(step.setup.subtasks){`
	`115`	`+if(step.subtasks){`
`116`	`116`	`constsubtaskSummary=parseSubtasks(tap.summary,position.stepId\|\|'')`
`117`	`117`
`118`	`118`	`callbacks.onFail(position,{`

Lines changed: 1 addition & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -27,8 +27,8 @@ export type Step = {`
`27`	`27`	`content:string`
`28`	`28`	`setup:StepActions`
`29`	`29`	`solution:Maybe<StepActions>`
`30`		`-subtasks?:{[index:number]:boolean}`
`31`	`30`	`hints?:string[]`
	`31`	`+subtasks?:string[]`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`/** A tutorial for use in VSCode CodeRoad */`
`@@ -52,7 +52,6 @@ export type StepActions = {`
`52`	`52`	`files?:string[]`
`53`	`53`	`watchers?:string[]`
`54`	`54`	`filter?:string`
`55`		`-subtasks?:string[]`
`56`	`55`	`}`
`57`	`56`
`58`	`57`	`exportinterfaceTestRunnerArgs{`

Lines changed: 2 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -199,8 +199,8 @@ const Level = ({`
`199`	`199`	`returnnull`
`200`	`200`	`}`
`201`	`201`	`letsubtasks=null`
`202`		`-if(step?.setup?.subtasks){`
`203`		`-subtasks=step.setup.subtasks.map((subtask:string,subtaskIndex:number)=>({`
	`202`	`+if(step?.subtasks){`
	`203`	`+subtasks=step.subtasks.map((subtask:string,subtaskIndex:number)=>({`
`204`	`204`	`name:subtask,`
`205`	`205`	`pass:!!(testStatus?.summary ?testStatus.summary[subtaskIndex] :false),`
`206`	`206`	`}))`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ export default (editorSend: any) => ({`
`57`	`57`	`},`
`58`	`58`	`})`
`59`	`59`
`60`		`-if(step.setup.subtasks){`
	`60`	`+if(step.subtasks){`
`61`	`61`	`// load subtask summary by running tests and parsing result`
`62`	`62`	`editorSend({`
`63`	`63`	`type:'EDITOR_RUN_TEST',`

Comments

(0)