Commit0307ad1

committed

fix repeatedly configured tutorial paths bug

1 parent2afc497 commit0307ad1Copy full SHA for 0307ad1

File tree

+11

-2

lines changed

+11

-2

lines changed

Lines changed: 7 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,8 @@ const _tutorial: CR.Tutorial = {`
`11`	`11`	`config:null,`
`12`	`12`	`};`
`13`	`13`
	`14`	`+constconfigured=[];`
	`15`	`+`
`14`	`16`	`exportdefaultfunctiontutorialReducer(`
`15`	`17`	`t=_tutorial,action:Action`
`16`	`18`	`):CR.Tutorial{`
`@@ -27,8 +29,11 @@ export default function tutorialReducer(`
`27`	`29`	`constcoderoadJsonPath=join(packagePath,packageJson.main);`
`28`	`30`	`let{info, pages}=require(coderoadJsonPath);`
`29`	`31`
`30`		`-// configure test paths to absolute paths`
`31`		`-pages=configPaths(dir,name,config,pages\|\|[]);`
	`32`	`+// configure test paths to absolute paths. Only once.`
	`33`	`+if(configured.indexOf(name)===-1){`
	`34`	`+pages=configPaths(dir,name,config,pages\|\|[]);`
	`35`	`+}`
	`36`	`+configured.push(name);`
`32`	`37`
`33`	`38`	`// return tutorial (info, pages) & tutorial package.json`
`34`	`39`	`return{`

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -6,18 +6,22 @@ function configTestString(`
`6`	`6`	`):string{`
`7`	`7`
`8`	`8`	`if(isWindows){`
	`9`	`+// adjust paths for windows slashes`
`9`	`10`	`testPath=testPath.split('/').join('\\');`
`10`	`11`	`}`
`11`	`12`
	`13`	`+// adjust absolute file path`
`12`	`14`	`if(config.dir){`
`13`	`15`	`testPath=join(config.dir,testPath);`
`14`	`16`	`}else{`
`15`	`17`	`testPath=join(dir,'node_modules',name,testPath);`
`16`	`18`	`}`
`17`	`19`
`18`	`20`	`if(config.testSuffix){`
	`21`	`+// prevent repeat appending test suffix`
`19`	`22`	`testPath+=config.testSuffix;`
`20`	`23`	`}`
	`24`	`+`
`21`	`25`	`returntestPath;`
`22`	`26`	`}`
`23`	`27`

Comments

(0)