simplify API for image-exporter run wrapper

etpinard · etpinard · commit 0b5b574979cb · 2017-09-01T13:29:33.000-04:00
diff --git a/test/image/assets/run.js b/test/image/assets/run.js
@@ -2,16 +2,22 @@ var imageExporter = require('image-exporter');
 var path = require('path');
 var constants = require('../../../tasks/util/constants');
 
-function run(input, argv, write) {
+function run(mockList, input, argv, write) {
     argv = argv || {};
 
+    if(!Array.isArray(mockList) || mockList.length === 0) {
+        throw new Error('Empty mockList list');
+    }
     if(!Array.isArray(input) || input.length === 0) {
         throw new Error('Empty input list');
     }
+    if(mockList.length !== input.length) {
+        throw new Error('mockList and input must have same length');
+    }
 
     var app = imageExporter.run({
         input: input,
-        write: write,
+        write: function(info, _, done) { write(info, done); },
         parallelLimit: argv.queue ? 1 : argv['parallel-limit'],
         debug: argv.debug,
         component: {
@@ -28,12 +34,12 @@ function run(input, argv, write) {
     var failed = [];
 
     app.on('after-export', function(info) {
-        var mockName = getMockName(info);
+        var mockName = mockList[info.itemIndex];
         console.log('ok ' + mockName);
     });
 
     app.on('export-error', function(info) {
-        var mockName = getMockName(info);
+        var mockName = mockList[info.itemIndex];
 
         var msg = 'not ok (' + info.code + '): ' + mockName + ' - ' + info.msg;
         if(info.error) msg += ' ' + info.error;
@@ -54,13 +60,6 @@ function run(input, argv, write) {
         }
     });
 
-    function getMockName(info) {
-        var item = input[info.itemIndex];
-        var mockPath = item.figure ? item.figure : item;
-        var mockName = path.parse(mockPath).name;
-        return mockName;
-    }
-
     return app;
 }
 
diff --git a/test/image/compare_pixels_test.js b/test/image/compare_pixels_test.js
@@ -78,7 +78,7 @@ if(argv._.indexOf('gl2d_*') !== -1) {
 
 var input = mockList.map(function(m) { return getImagePaths(m).mock; });
 
-run(input, argv, function write(info, _, done) {
+run(mockList, input, argv, function write(info, done) {
     var mockName = mockList[info.itemIndex];
     var paths = getImagePaths(mockName);
     var imgData = info.body;
diff --git a/test/image/export_test.js b/test/image/export_test.js
@@ -16,9 +16,6 @@ var argv = require('minimist')(process.argv.slice(2), {
     }
 });
 
-// image-exporter cannot generate pdf & eps at the same time for some reason
-argv['parallel-limit'] = 1;
-
 // no 'png' as it is tested in `compare_pixels_test.js`
 var FORMATS = ['jpeg', 'webp', 'svg', 'pdf', 'eps'];
 
@@ -65,13 +62,14 @@ if(argv.help) {
     process.exit(0);
 }
 
-var mockList = argv._.length > 0 ? getMockList(argv._) : DEFAULT_LIST;
+var _mockList = argv._.length > 0 ? getMockList(argv._) : DEFAULT_LIST;
+var mockList = [];
 var input = [];
 
-mockList.forEach(function(mockName) {
+_mockList.forEach(function(mockName) {
     FORMATS.forEach(function(format) {
+        mockList.push(mockName + '.' + format)
         input.push({
-            fid: mockName,
             figure: getImagePaths(mockName).mock,
             format: format,
             width: WIDTH,
@@ -80,8 +78,8 @@ mockList.forEach(function(mockName) {
     });
 });
 
-run(input, argv, function write(info, _, done) {
-    var mockName = input[info.itemIndex].fid;
+run(mockList, input, argv, function write(info, done) {
+    var mockName = mockList[info.itemIndex];
     var format = info.format;
     var paths = getImagePaths(mockName, format);
 
@@ -95,7 +93,7 @@ run(input, argv, function write(info, _, done) {
             didExport = stats.size > MIN_SIZE;
         } else {
             var dims = sizeOf(paths.test);
-            didExport = (dims.width === 200) && (dims.height === HEIGHT);
+            didExport = (dims.width === WIDTH) && (dims.height === HEIGHT);
         }
 
         done(didExport ? '' : format);
diff --git a/test/image/make_baseline.js b/test/image/make_baseline.js
@@ -49,7 +49,7 @@ if(argv.help) {
 var mockList = getMockList(argv._);
 var input = mockList.map(function(m) { return getImagePaths(m).mock; });
 
-run(input, argv, function write(info, _, done) {
+run(mockList, input, argv, function write(info, done) {
     var mockName = mockList[info.itemIndex];
     var imgData = info.body;
     var paths = getImagePaths(mockName);
