diff --git a/test/append.js b/test/append.js index f2f67923..75653d40 100644 --- a/test/append.js +++ b/test/append.js @@ -15,9 +15,9 @@ module.exports = function (_, dir, next, gm) { var args = m.args(); assert.equal('convert', args[0]); - assert.equal('/Users/aaronheckmann/test/gm/gm/test/../examples/imgs/lost.png',args[1]); - assert.equal('/Users/aaronheckmann/test/gm/gm/test/../examples/imgs/original.jpg',args[2]); - assert.equal('/Users/aaronheckmann/test/gm/gm/test/../examples/imgs/original.jpg',args[3]); + assert.ok(/examples\/imgs\/lost\.png$/.test(args[1])); + assert.ok(/examples\/imgs\/original\.jpg$/,args[2]); + assert.ok(/examples\/imgs\/original\.jpg$/,args[3]); assert.equal('-background',args[4]); assert.equal('#222',args[5]); assert.equal('-append',args[6]); @@ -46,8 +46,8 @@ function horizontal (dir, next, gm) { var args = m.args(); assert.equal('convert', args[0]); - assert.equal('/Users/aaronheckmann/test/gm/gm/test/../examples/imgs/original.jpg',args[1]); - assert.equal('/Users/aaronheckmann/test/gm/gm/test/../examples/imgs/lost.png',args[2]); + assert.ok(/examples\/imgs\/original\.jpg$/.test(args[1])); + assert.ok(/examples\/imgs\/lost\.png$/.test(args[2])); assert.equal('+append',args[3]); assert.equal('-',args[4]); diff --git a/test/gravity.js b/test/gravity.js index 2b4868de..2bbda41d 100644 --- a/test/gravity.js +++ b/test/gravity.js @@ -10,11 +10,11 @@ module.exports = function (img, dir, finish, gm) { .extent(300,300); var args = m.args(); + assert.equal('convert', args[0]); + assert.equal('-size', args[1]); + assert.equal('300x300', args[2]); + args= args.slice(4); assert.deepEqual(args, [ - 'convert', - '-size', - '300x300', - '/Users/aaronheckmann/test/gm/gm/test/../examples/imgs/original.jpg', '-scale', '200x100', '-gravity', diff --git a/test/polygon.js b/test/polygon.js index a98f86b0..8d56628c 100644 --- a/test/polygon.js +++ b/test/polygon.js @@ -10,9 +10,9 @@ module.exports = function (gm, dir, finish, GM) { .drawPolygon([60, 10], [183, 73], [185, 13], [167, 35], [165, 17], [163, 19]); var args = m.args(); + assert.equal('convert', args[0]); + args = args.slice(2); assert.deepEqual(args, [ - 'convert', - '/Users/aaronheckmann/test/gm/gm/test/../examples/imgs/original.jpg', '-blur', '8x4', '-strokewidth', diff --git a/test/polyline.js b/test/polyline.js index ff5e2a95..91dadae7 100644 --- a/test/polyline.js +++ b/test/polyline.js @@ -10,9 +10,9 @@ module.exports = function (gm, dir, finish, GM) { .drawPolyline([40, 10], [143, 153], [185, 53], [147, 15], [145, 17], [43, 19]); var args = m.args(); + assert.equal('convert', args[0]); + args = args.slice(2); assert.deepEqual(args, [ - 'convert', - '/Users/aaronheckmann/test/gm/gm/test/../examples/imgs/original.jpg', '-blur', '8x4', '-strokewidth',