mirror of
https://github.com/mermaid-js/mermaid.git
synced 2025-08-29 21:26:51 +02:00
fix gantt chart cli configuration one more time missing }; make sequenceConfig cli configuration work; added guantt and sequence files in tape cli output tests
This commit is contained in:
@@ -13,15 +13,14 @@ var isWin = /^win/.test(process.platform);
|
||||
var phantomCmd;
|
||||
if(isWin){
|
||||
phantomCmd = 'node_modules/.bin/phantomjs.cmd'
|
||||
console.log('is win');
|
||||
console.log('is win');
|
||||
console.log('is win')
|
||||
}
|
||||
else{
|
||||
phantomCmd = 'node_modules/.bin/phantomjs'
|
||||
}
|
||||
var singleFile = {
|
||||
files: [fileTestMermaid]
|
||||
, outputDir: path.join(process.cwd(),'test/tmp2/')
|
||||
, outputDir: path.join(process.cwd(),'test/tmp_single')
|
||||
, phantomPath: path.join(process.cwd(),phantomCmd)
|
||||
, width : 1200
|
||||
, css: path.join(__dirname, '..', 'dist', 'mermaid.css')
|
||||
@@ -29,8 +28,12 @@ var singleFile = {
|
||||
, ganttConfig: null
|
||||
}
|
||||
, multiFile = {
|
||||
files: [path.join('test','fixtures','test.mermaid'), path.join('test','fixtures','test2.mermaid')]
|
||||
, outputDir: 'test/tmp2/'
|
||||
files: [path.join('test','fixtures','test.mermaid'),
|
||||
path.join('test','fixtures','test2.mermaid'),
|
||||
path.join('test','fixtures','gantt.mermaid'),
|
||||
path.join('test','fixtures','sequence.mermaid'),
|
||||
]
|
||||
, outputDir: 'test/tmp_multi'
|
||||
, phantomPath: path.join(process.cwd(),phantomCmd)
|
||||
, width : 1200
|
||||
, css: path.join(__dirname, '..', 'dist', 'mermaid.css')
|
||||
@@ -45,6 +48,7 @@ test('output of single png', function(t) {
|
||||
var expected = ['test.mermaid.png']
|
||||
|
||||
opt = clone(singleFile)
|
||||
opt.outputDir += '_png'
|
||||
opt.png = true
|
||||
|
||||
mermaid.process(opt.files, opt, function(code) {
|
||||
@@ -57,9 +61,11 @@ test('output of single png', function(t) {
|
||||
test('output of multiple png', function(t) {
|
||||
t.plan(3)
|
||||
|
||||
var expected = ['test.mermaid.png', 'test2.mermaid.png']
|
||||
var expected = ['test.mermaid.png', 'test2.mermaid.png',
|
||||
'gantt.mermaid.png', 'sequence.mermaid.png']
|
||||
|
||||
opt = clone(multiFile)
|
||||
opt.outputDir += '_png'
|
||||
opt.png = true
|
||||
|
||||
mermaid.process(opt.files, opt, function(code) {
|
||||
@@ -75,6 +81,7 @@ test('output of single svg', function(t) {
|
||||
var expected = ['test.mermaid.svg']
|
||||
|
||||
opt = clone(singleFile)
|
||||
opt.outputDir += '_svg'
|
||||
opt.svg = true
|
||||
|
||||
mermaid.process(opt.files, opt, function(code) {
|
||||
@@ -87,9 +94,11 @@ test('output of single svg', function(t) {
|
||||
test('output of multiple svg', function(t) {
|
||||
t.plan(3)
|
||||
|
||||
var expected = ['test.mermaid.svg', 'test2.mermaid.svg']
|
||||
var expected = ['test.mermaid.svg', 'test2.mermaid.svg',
|
||||
'gantt.mermaid.svg', 'sequence.mermaid.svg']
|
||||
|
||||
opt = clone(multiFile)
|
||||
opt.outputDir += '_svg'
|
||||
opt.svg = true
|
||||
|
||||
mermaid.process(opt.files, opt, function(code) {
|
||||
@@ -110,28 +119,22 @@ test('output including CSS', function(t) {
|
||||
, two
|
||||
|
||||
opt.png = true
|
||||
opt.outputDir += '_css_png'
|
||||
opt2.png = true
|
||||
opt2.outputDir += '_css_png'
|
||||
|
||||
|
||||
mermaid.process(opt.files, opt, function(code) {
|
||||
t.equal(code, 0, 'has clean exit code')
|
||||
filename = path.join(opt.outputDir, path.basename(expected[0]))
|
||||
one = fs.statSync(filename)
|
||||
//console.log('one: '+opt.files[0]);
|
||||
|
||||
opt2.css = path.join('test','fixtures','test.css')
|
||||
//console.log(opt2.css);
|
||||
|
||||
console.log('Generating #2');
|
||||
//console.log('two: '+opt2.files[0]);
|
||||
console.log('Generating #2');
|
||||
mermaid.process(opt2.files, opt2, function(code) {
|
||||
t.equal(code, 0, 'has clean exit code')
|
||||
two = fs.statSync(filename)
|
||||
|
||||
//console.log('one: '+one.size);
|
||||
//console.log('two: '+two.size);
|
||||
|
||||
|
||||
t.notEqual(one.size, two.size)
|
||||
|
||||
verifyFiles(expected, opt.outputDir, t)
|
||||
@@ -151,8 +154,9 @@ function verifyFiles(expected, dir, t) {
|
||||
}
|
||||
, function(err) {
|
||||
t.notOk(err, 'all files passed')
|
||||
|
||||
rimraf(dir, function(rmerr) {
|
||||
var delete_tmps = true
|
||||
var _rimraf=delete_tmps ? rimraf : function(dir, f) { f(0); }
|
||||
_rimraf(dir, function(rmerr) {
|
||||
t.notOk(rmerr, 'cleaned up')
|
||||
t.end()
|
||||
})
|
||||
|
Reference in New Issue
Block a user