Skip to content

Commit

Permalink
change " to ' per code climate
Browse files Browse the repository at this point in the history
  • Loading branch information
whyzdev committed Dec 19, 2016
1 parent 4a5bbe1 commit 71125e7
Show file tree
Hide file tree
Showing 2 changed files with 30 additions and 39 deletions.
2 changes: 1 addition & 1 deletion lib/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ module.exports = { process: processMermaid }
function processMermaid(files, _options, _next) {
var options = _options || {}
, outputDir = options.outputDir || process.cwd()
, outputSuffix = options.outputSuffix || ""
, outputSuffix = options.outputSuffix || ''
, next = _next || function() {}
, phantomArgs = [
phantomscript
Expand Down
67 changes: 29 additions & 38 deletions test/cli_test-samples.js
Original file line number Diff line number Diff line change
@@ -1,20 +1,17 @@
'use strict';
var exec = require('child_process').exec;
var fs = require('fs')
, path = require('path')
var path = require('path')

var test = require('tape')
, async = require('async')
, clone = require('clone')
, rimraf = require('rimraf')

var test_dir = "test/fixtures/samples/".replace('/',path.sep)
var test_dir = 'test/fixtures/samples/'.replace('/',path.sep)

rimraf.sync(test_dir+'*.actual.*');

function exec_mermaid(args, verify) {
exec('bin/mermaid.js ' + args,
{env: {PATH: "./node_modules/.bin"+path.delimiter+process.env.PATH}},
{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);
Expand All @@ -23,19 +20,17 @@ function exec_mermaid(args, verify) {

test('mermaid cli help', function(t) {
t.plan(1);
var args = [ "--help", ]
exec_mermaid(args.join(" "),
function(error, stdout, stderr) {
t.notOk(error, 'no error')
var args = [ '--help' ]
exec_mermaid(args.join(' '), function(error, stdout, stderr) {
t.notOk(stderr, 'no error')
t.end()
});
});

test('mermaid cli help', function(t) {
t.plan(1);
var args = [ "--badopt", ]
exec_mermaid(args.join(" "),
function(error, stdout, stderr) {
var args = [ '--badopt' ]
exec_mermaid(args.join(' '), function(error, stdout, stderr) {
t.ok(stderr, 'should get error')
t.end()
});
Expand All @@ -44,13 +39,12 @@ test('mermaid cli help', function(t) {
//todo
test.skip('sequence syntax error', function(t) {
t.plan(1);
var args = [ "--svg",
"--outputDir=" + test_dir,
"--outputSuffix=.actual",
test_dir+"sequence_err.mmd",
var args = [ '--svg',
'--outputDir=' + test_dir,
'--outputSuffix=.actual',
test_dir+'sequence_err.mmd'
]
exec_mermaid(args.join(" "),
function(error, stdout, stderr) {
exec_mermaid(args.join(' '), function(error, stdout, stderr) {
t.ok(stderr, 'should get error')
t.end()
});
Expand All @@ -59,14 +53,13 @@ test.skip('sequence syntax error', function(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",
var args = [ '--svg',
'--outputDir=' + test_dir,
'--outputSuffix='+(textPlacement ? '_'+textPlacement : '')+'.actual',
textPlacement ? '--sequenceConfig='+test_dir+'sequence_text_'+textPlacement+'.cfg' : '',
test_dir+'sequence_text.mmd'
]
exec_mermaid(args.join(" "),
function(error, stdout, stderr) {
exec_mermaid(args.join(' '), function(error, stdout, stderr) {
t.notOk(stderr, 'no error')
t.end()
});
Expand All @@ -75,27 +68,25 @@ test.skip('sequence syntax error', function(t) {

test('sequence png', function(t) {
t.plan(1);
var args = [ "--png",
"--outputDir=" + test_dir,
"--outputSuffix=.actual",
test_dir+"sequence_text.mmd",
var args = [ '--png',
'--outputDir=' + test_dir,
'--outputSuffix=.actual',
test_dir+'sequence_text.mmd'
]
exec_mermaid(args.join(" "),
function(error, stdout, stderr) {
exec_mermaid(args.join(' '), function(error, stdout, stderr) {
t.notOk(stderr, 'no error')
t.end()
});
})

test('flowchart svg text', function(t) {
t.plan(1);
var args = [ "--svg",
"--outputDir=" + test_dir,
"--outputSuffix=.actual",
test_dir+"flowchart_text.mmd",
var args = [ '--svg',
'--outputDir=' + test_dir,
'--outputSuffix=.actual',
test_dir+'flowchart_text.mmd'
]
exec_mermaid(args.join(" "),
function(error, stdout, stderr) {
exec_mermaid(args.join(' '), function(error, stdout, stderr) {
t.notOk(stderr, 'no error')
t.end()
});
Expand Down

0 comments on commit 71125e7

Please sign in to comment.