@@ -480,24 +480,22 @@ test.serial('push command succeeds for simple Excel with 1 sheet', async t => {
480480 let path_ = 'test/fixtures/test-data/files/excel/sample-1-sheet.xls'
481481 const argName = '--name=test-excel-1-sheet'
482482 let result = await runcli ( 'push' , path_ , argName , '--debug' )
483- let stdout = result . stdout . split ( '\n' )
484483 // Check what's printed in console while in debug mode, e.g., if schema is included:
485- let hasSchemaForFirstSheet = stdout . find ( item => item . includes ( '"name": "number"' ) )
484+ let hasSchemaForFirstSheet = result . stdout . includes ( '"name": "number"' )
486485 t . truthy ( hasSchemaForFirstSheet )
487- let hasPublishedMessage = stdout . find ( item => item . includes ( 'your data is published!' ) )
488- let hasURLtoShowcase = stdout . find ( item => item . includes ( 'https://datahub.io/test/test-excel-1-sheet/v/' ) )
486+ let hasPublishedMessage = result . stdout . includes ( 'your data is published!' )
487+ let hasURLtoShowcase = result . stdout . includes ( 'https://datahub.io/test/test-excel-1-sheet/v/' )
489488 t . truthy ( hasPublishedMessage )
490489 t . truthy ( hasURLtoShowcase )
491490 let whatsInClipboard = await clipboardy . read ( )
492491 t . true ( whatsInClipboard . includes ( 'https://datahub.io/test/test-excel-1-sheet/v/' ) )
493492
494493 path_ = 'test/fixtures/test-data/files/excel/sample-1-sheet.xlsx'
495494 result = await runcli ( 'push' , path_ , argName , '--debug' )
496- stdout = result . stdout . split ( '\n' )
497- hasSchemaForFirstSheet = stdout . find ( item => item . includes ( '"name": "number"' ) )
495+ hasSchemaForFirstSheet = result . stdout . includes ( '"name": "number"' )
498496 t . truthy ( hasSchemaForFirstSheet )
499- hasPublishedMessage = stdout . find ( item => item . includes ( 'your data is published!' ) )
500- hasURLtoShowcase = stdout . find ( item => item . includes ( 'https://datahub.io/test/test-excel-1-sheet/v/' ) )
497+ hasPublishedMessage = result . stdout . includes ( 'your data is published!' )
498+ hasURLtoShowcase = result . stdout . includes ( 'https://datahub.io/test/test-excel-1-sheet/v/' )
501499 t . truthy ( hasPublishedMessage )
502500 t . truthy ( hasURLtoShowcase )
503501 whatsInClipboard = await clipboardy . read ( )
@@ -517,49 +515,44 @@ test.serial('push command succeeds for Excel with selected sheet', async t => {
517515 const argName = '--name=test-excel-2-sheets'
518516 let argSheets = '--sheets=2'
519517 let result = await runcli ( 'push' , path_ , argName , argSheets , '--debug' )
520- let stdout = result . stdout . split ( '\n' )
521518 // Check what's printed in console while in debug mode, e.g., if schema is included:
522- let hasSchemaForSecondSheet = stdout . find ( item => item . includes ( '"name": "header4"' ) )
519+ let hasSchemaForSecondSheet = result . stdout . includes ( '"name": "header4"' )
523520 t . truthy ( hasSchemaForSecondSheet )
524- let hasPublishedMessage = stdout . find ( item => item . includes ( 'your data is published!' ) )
525- let hasURLtoShowcase = stdout . find ( item => item . includes ( 'https://datahub.io/test/test-excel-2-sheets/v/' ) )
521+ let hasPublishedMessage = result . stdout . includes ( 'your data is published!' )
522+ let hasURLtoShowcase = result . stdout . includes ( 'https://datahub.io/test/test-excel-2-sheets/v/' )
526523 t . truthy ( hasPublishedMessage )
527524 t . truthy ( hasURLtoShowcase )
528525 let whatsInClipboard = await clipboardy . read ( )
529526 t . true ( whatsInClipboard . includes ( 'https://datahub.io/test/test-excel-2-sheets/v/' ) )
530527
531528 path_ = 'test/fixtures/test-data/files/excel/sample-2-sheets.xlsx'
532529 result = await runcli ( 'push' , path_ , argName , argSheets , '--debug' )
533- stdout = result . stdout . split ( '\n' )
534530 // Check what's printed in console while in debug mode, e.g., if schema is included:
535- hasSchemaForSecondSheet = stdout . find ( item => item . includes ( '"name": "header4"' ) )
531+ hasSchemaForSecondSheet = result . stdout . includes ( '"name": "header4"' )
536532 t . truthy ( hasSchemaForSecondSheet )
537- hasPublishedMessage = stdout . find ( item => item . includes ( 'your data is published!' ) )
538- hasURLtoShowcase = stdout . find ( item => item . includes ( 'https://datahub.io/test/test-excel-2-sheets/v/' ) )
533+ hasPublishedMessage = result . stdout . includes ( 'your data is published!' )
534+ hasURLtoShowcase = result . stdout . includes ( 'https://datahub.io/test/test-excel-2-sheets/v/' )
539535 t . truthy ( hasPublishedMessage )
540536 t . truthy ( hasURLtoShowcase )
541537 whatsInClipboard = await clipboardy . read ( )
542538 t . true ( whatsInClipboard . includes ( 'https://datahub.io/test/test-excel-2-sheets/v/' ) )
543539
544540 argSheets = '--sheets=5'
545541 result = await runcli ( 'push' , path_ , argName , argSheets , '--debug' )
546- stdout = result . stdout . split ( '\n' )
547- let hasErrorMsg = stdout . find ( item => item . includes ( 'Error! sheet index 5 is out of range' ) )
542+ let hasErrorMsg = result . stdout . includes ( 'Error! sheet index 5 is out of range' )
548543 t . truthy ( hasErrorMsg )
549544
550545 argSheets = '--sheets=all'
551546 result = await runcli ( 'push' , path_ , argName , argSheets , '--debug' )
552- stdout = result . stdout . split ( '\n' )
553- let hasSchemaForFirstSheet = stdout . find ( item => item . includes ( '"name": "header1"' ) )
554- hasSchemaForSecondSheet = stdout . find ( item => item . includes ( '"name": "header4"' ) )
547+ let hasSchemaForFirstSheet = result . stdout . includes ( '"name": "header1"' )
548+ hasSchemaForSecondSheet = result . stdout . includes ( '"name": "header4"' )
555549 t . truthy ( hasSchemaForFirstSheet )
556550 t . truthy ( hasSchemaForSecondSheet )
557551
558552 argSheets = '--sheets=1,2'
559553 result = await runcli ( 'push' , path_ , argName , argSheets , '--debug' )
560- stdout = result . stdout . split ( '\n' )
561- hasSchemaForFirstSheet = stdout . find ( item => item . includes ( '"name": "header1"' ) )
562- hasSchemaForSecondSheet = stdout . find ( item => item . includes ( '"name": "header4"' ) )
554+ hasSchemaForFirstSheet = result . stdout . includes ( '"name": "header1"' )
555+ hasSchemaForSecondSheet = result . stdout . includes ( '"name": "header4"' )
563556 t . truthy ( hasSchemaForFirstSheet )
564557 t . truthy ( hasSchemaForSecondSheet )
565558} )
0 commit comments