From bc94fc3d6d65fa49af6b39b757f70a0a0305439e Mon Sep 17 00:00:00 2001 From: Tyler Long Date: Mon, 10 Apr 2017 22:24:20 +0800 Subject: [PATCH] Convert test/cli_test-sample.js to ES6 --- test/cli_test-samples.js | 188 +++++++++++++++++++-------------------- 1 file changed, 93 insertions(+), 95 deletions(-) diff --git a/test/cli_test-samples.js b/test/cli_test-samples.js index f3fb4f7cd..fa21a20e3 100644 --- a/test/cli_test-samples.js +++ b/test/cli_test-samples.js @@ -1,141 +1,139 @@ -'use strict'; -var exec = require('child_process').exec; -var path = require('path') +const exec = require('child_process').exec +const path = require('path') - var test = require('tape') - , rimraf = require('rimraf') +const test = require('tape') +const rimraf = require('rimraf') -var test_dir = 'test/fixtures/samples/'.replace('/',path.sep) -var phantomjs = 'node_modules/.bin/phantomjs '.replace('/',path.sep) -var load_html_save_screenshot_png_scripts = test_dir+path.sep+'load_html_save_screenshot_png.phantomjs' +const testDir = 'test/fixtures/samples/'.replace('/', path.sep) +const phantomjs = 'node_modules/.bin/phantomjs '.replace('/', path.sep) +const loadHtmlSaveScreenshotPngScripts = testDir + path.sep + 'load_html_save_screenshot_png.phantomjs' -rimraf.sync(test_dir+'*.actual.*'); +rimraf.sync(testDir + '*.actual.*') -function prepend_output_args(args) { - return '--outputDir=' + test_dir + ' --outputSuffix=.actual' + args +function prependOutputArgs (args) { + return '--outputDir=' + testDir + ' --outputSuffix=.actual' + args } -function exec_mermaid(args, verify) { - var cmd = 'bin/mermaid.js ' + args - exec_cmd(cmd, verify) +function execMermaid (args, verify) { + const cmd = 'bin/mermaid.js ' + args + execCmd(cmd, verify) } -function exec_phantomjs_to_load_html_save_screenshot_png(html, verify) { - var cmd = (phantomjs + ' ' + load_html_save_screenshot_png_scripts + - ' ' + html + ' ' + html + '.actual.png'); - exec_cmd(cmd, verify) +function execPhantomjsToLoadHtmlSaveScreenshotPng (html, verify) { + const cmd = (phantomjs + ' ' + loadHtmlSaveScreenshotPngScripts + + ' ' + html + ' ' + html + '.actual.png') + execCmd(cmd, verify) } -function exec_cmd(cmd, verify) { +function execCmd (cmd, verify) { console.log('cmd: ', cmd) exec(cmd, - {env: {PATH: './node_modules/.bin'+path.delimiter+process.env.PATH}}, - function(error, stdout, stderr) { - console.log('error:',error,'\nstdout:\n',stdout,'\nstderr:\n',stderr); - verify(error, stdout, stderr); - }); + { env: { PATH: './node_modules/.bin' + path.delimiter + process.env.PATH } }, + function (error, stdout, stderr) { + console.log('error:', error, '\nstdout:\n', stdout, '\nstderr:\n', stderr) + verify(error, stdout, stderr) + }) } -function verify_no_error(t) { - return function(error, stdout, stderr) { - t.notOk(stderr, 'no error') +function verifyNoError (t) { + return function (error, stdout, stderr) { + t.notOk(stderr, 'no stderr') t.end() } } -function verify_error(t) { - return function(error, stdout, stderr) { +function verifyError (t) { + return function (error, stdout, stderr) { t.ok(stderr, 'should get error') t.end() } } -test('mermaid cli help', function(t) { - t.plan(1); - var args = [ '--help' ] - exec_mermaid(args.join(' '), verify_no_error(t)); -}); +test('mermaid cli help', function (t) { + t.plan(1) + const args = ['--help'] + execMermaid(args.join(' '), verifyNoError(t)) +}) -test('mermaid cli help', function(t) { - t.plan(1); - var args = [ '--badopt' ] - exec_mermaid(args.join(' '), verify_error(t)); -}); +test('mermaid cli help', function (t) { + t.plan(1) + const args = ['--badopt'] + execMermaid(args.join(' '), verifyError(t)) +}) -test.skip('sequence syntax error', function(t) { - t.plan(1); - var args = [ '--svg', - test_dir+'sequence_err.mmd' +test.skip('sequence syntax error', function (t) { + t.plan(1) + const args = ['--svg', + testDir + 'sequence_err.mmd' ] - exec_mermaid(prepend_output_args(args.join(' ')), verify_no_error(t)); + execMermaid(prependOutputArgs(args.join(' ')), verifyNoError(t)) }); -['', 'fo', 'tspan', 'old'].forEach(function(textPlacement) { - test('sequence svg text placelment: '+textPlacement, function(t) { - t.plan(1); - var args = [ '--svg', - '--outputDir=' + test_dir, - '--outputSuffix='+(textPlacement ? '_'+textPlacement : '')+'.actual', - textPlacement ? '--sequenceConfig='+test_dir+'sequence_text_'+textPlacement+'.cfg' : '', - test_dir+'sequence_text.mmd' +['', 'fo', 'tspan', 'old'].forEach(function (textPlacement) { + test('sequence svg text placelment: ' + textPlacement, function (t) { + t.plan(1) + const args = ['--svg', + '--outputDir=' + testDir, + '--outputSuffix=' + (textPlacement ? '_' + textPlacement : '') + '.actual', + textPlacement ? '--sequenceConfig=' + testDir + 'sequence_text_' + textPlacement + '.cfg' : '', + testDir + 'sequence_text.mmd' ] - exec_mermaid(args.join(' '), verify_no_error(t)); + execMermaid(args.join(' '), verifyNoError(t)) }) -}); +}) -test('sequence png', function(t) { - t.plan(1); - var args = [ '--png', - test_dir+'sequence_text.mmd' +test('sequence png', function (t) { + t.plan(1) + const args = ['--png', + testDir + 'sequence_text.mmd' ] - exec_mermaid(prepend_output_args(args.join(' ')), verify_no_error(t)); -}); + execMermaid(prependOutputArgs(args.join(' ')), verifyNoError(t)) +}) -test('flowchart svg text', function(t) { - t.plan(1); - var args = [ '--svg', +test('flowchart svg text', function (t) { + t.plan(1) + const args = ['--svg', '--css=dist/mermaid.css', '--width=500', - test_dir+'flowchart_text.mmd' + testDir + 'flowchart_text.mmd' ] - exec_mermaid(prepend_output_args(args.join(' ')), verify_no_error(t)); + execMermaid(prependOutputArgs(args.join(' ')), verifyNoError(t)) }); -['svg', 'png'].forEach(function(format) { - test('flowchart '+format+'text2', function(t) { - t.plan(1); - var args = [ '--'+format, - '--css=dist/mermaid.forest.css', - '--width=500', - test_dir+'flowchart_text2.mmd' - ] - exec_mermaid(prepend_output_args(args.join(' ')), verify_no_error(t)); -}) }); +['svg', 'png'].forEach(function (format) { + test('flowchart ' + format + 'text2', function (t) { + t.plan(1) + const args = ['--' + format, + '--css=dist/mermaid.forest.css', + '--width=500', + testDir + 'flowchart_text2.mmd' + ] + execMermaid(prependOutputArgs(args.join(' ')), verifyNoError(t)) + }) +}) - -test('gantt axis formatter svg', function(t) { - t.plan(1); - var args = [ '--svg', +test('gantt axis formatter svg', function (t) { + t.plan(1) + const args = ['--svg', '--css=dist/mermaid.css', '--width=500', - '--ganttConfig='+test_dir+'gantt_axis_formatter.cfg', - test_dir+'gantt_axis_formatter.mmd' + '--ganttConfig=' + testDir + 'gantt_axis_formatter.cfg', + testDir + 'gantt_axis_formatter.mmd' ] - exec_mermaid(prepend_output_args(args.join(' ')), verify_no_error(t)); -}); + execMermaid(prependOutputArgs(args.join(' ')), verifyNoError(t)) +}) - -test('gitgraph sample svg', function(t) { - t.plan(1); - var args = [ '-s', '-v', +test('gitgraph sample svg', function (t) { + t.plan(1) + const args = ['-s', '-v', '--width=500', - test_dir+'gitgraph.mmd' + testDir + 'gitgraph.mmd' ] - exec_mermaid(prepend_output_args(args.join(' ')), verify_no_error(t)); -}); + execMermaid(prependOutputArgs(args.join(' ')), verifyNoError(t)) +}) -test('load sample.html in phantomjs and save screenshot png', function(t) { - t.plan(1); - exec_phantomjs_to_load_html_save_screenshot_png(test_dir+'samples.html', - verify_no_error(t)); -}); +test('load sample.html in phantomjs and save screenshot png', function (t) { + t.plan(1) + execPhantomjsToLoadHtmlSaveScreenshotPng(testDir + 'samples.html', + verifyNoError(t)) +})