File tree Expand file tree Collapse file tree 2 files changed +18
-8
lines changed Expand file tree Collapse file tree 2 files changed +18
-8
lines changed Original file line number Diff line number Diff line change 2020 "test" : " npm-run-all lint --parallel test:unit test:cli" ,
2121 "test:cli" : " ./test/cli/run" ,
2222 "test:unit" : " mocha test/unit/test_*.js" ,
23- "lint" : " eslint --cache --ext .js --ext .jsx *.js bin samples && echo ✓"
23+ "lint" : " eslint --cache --ext .js --ext .jsx *.js bin/* samples && echo ✓"
2424 },
2525 "engines" : {
2626 "node" : " >=6"
3333 "rollup-plugin-node-resolve" : " ^3.0.3"
3434 },
3535 "devDependencies" : {
36- "eslint-config-fnd-jsx" : " ^1.1 .0" ,
36+ "eslint-config-fnd-jsx" : " ^1.3 .0" ,
3737 "faucet-pipeline-esnext" : " file:pkg/faucet-pipeline-esnext" ,
3838 "faucet-pipeline-jsx" : " file:pkg/faucet-pipeline-jsx" ,
3939 "faucet-pipeline-typescript" : " file:pkg/faucet-pipeline-typescript" ,
Original file line number Diff line number Diff line change @@ -18,7 +18,7 @@ describe("watcher", () => {
1818 watcher . terminate ( ) ;
1919 } ) ;
2020
21- it ( "responds to file changes in watch mode" , done => {
21+ it ( "responds to file changes in watch mode" , function ( done ) {
2222 let config = [ {
2323 source : entryPoint . relative ,
2424 target : "./dist/bundle.js"
@@ -55,11 +55,21 @@ console.log(\`[…] $\{util}\`); // eslint-disable-line no-console
5555 setTimeout ( _ => {
5656 fs . writeFileSync ( entryPoint . absolute , src + 'console.log("…");' ) ;
5757 } , 50 ) ;
58- // check result
59- setTimeout ( _ => { // FIXME: hacky
60- assetManager . assertWrites ( expectedBundles ) ;
58+ // check result by polling
59+ let timer = 0 ;
60+ let interval = 50 ;
61+ let threshold = this . timeout ( ) - 2 * interval ;
62+ let check = _ => {
63+ timer += interval ;
64+ if ( timer > threshold ||
65+ assetManager . _writes . length === expectedBundles . length ) {
66+ assetManager . assertWrites ( expectedBundles ) ;
67+ conclude ( ) ;
68+ return ;
69+ }
6170
62- conclude ( ) ;
63- } , 500 ) ;
71+ setTimeout ( check , interval ) ; // retry
72+ } ;
73+ setTimeout ( check , interval ) ;
6474 } ) ;
6575} ) ;
You can’t perform that action at this time.
0 commit comments