Skip to content

Commit 346b55f

Browse files
committed
update pixel comp script:
- rename to compare_pixels_test.js - use constants to resolves paths - rm server_app error msg
1 parent 407fa49 commit 346b55f

File tree

1 file changed

+21
-12
lines changed

1 file changed

+21
-12
lines changed

test/image/test-pixel-comparisons.js renamed to test/image/compare_pixels_test.js

Lines changed: 21 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,20 @@
11
'use strict';
22

3-
var test = require('tape');
4-
var request = require('request');
53
var fs = require('fs');
4+
var request = require('request');
65
var path = require('path');
7-
var getOptions = require('./tools/get-options');
6+
7+
var constants = require('../../tasks/util/constants');
8+
var getOptions = require('../../tasks/util/get_image_requests_options');
9+
10+
// packages inside the image server docker
11+
var test = require('tape');
812
var gm = require('gm');
9-
var statusMsg485 = require('../server_app/config/statusmsgs')['485'];
1013

11-
if (!fs.existsSync('./test-images-diffs')) fs.mkdirSync('./test-images-diffs');
12-
if (!fs.existsSync('./test-images')) fs.mkdirSync('./test-images');
14+
15+
// make artifact folders
16+
if(!fs.existsSync(constants.pathToTestImagesDiff)) fs.mkdirSync(constants.pathToTestImagesDiff);
17+
if(!fs.existsSync(constants.pathToTestImages)) fs.mkdirSync(constants.pathToTestImages);
1318

1419
var userFileName = process.argv[2];
1520

@@ -41,21 +46,20 @@ function runSingle (userFileName) {
4146
});
4247
}
4348

44-
4549
function testMock (fileName, t) {
4650
if (path.extname(fileName) !== '.json') return;
4751
if (fileName === 'font-wishlist.json' && !userFileName) return;
4852

49-
var figure = require('./mocks/' + fileName);
53+
var figure = require(path.join(constants.pathToTestImageMocks, fileName));
5054
var bodyMock = {
5155
figure: figure,
5256
format: 'png',
5357
scale: 1
5458
};
5559

5660
var imageFileName = fileName.split('.')[0] + '.png';
57-
var savedImagePath = 'test-images/' + imageFileName;
58-
var diffPath = 'test-images-diffs/' + 'diff-' + imageFileName;
61+
var savedImagePath = path.join(constants.pathToTestImages, imageFileName);
62+
var diffPath = path.join(constants.pathToTestImagesDiff, 'diff-' + imageFileName);
5963
var savedImageStream = fs.createWriteStream(savedImagePath);
6064
var options = getOptions(bodyMock, 'http://localhost:9010/');
6165
var statusCode;
@@ -68,10 +72,15 @@ function testMock (fileName, t) {
6872
};
6973

7074
if(statusCode === 485) {
71-
console.error(imageFileName, '-', statusMsg485, '- skip');
75+
console.error(imageFileName, '- skip');
7276
}
7377
else {
74-
gm.compare(savedImagePath, 'test-images-baseline/' + imageFileName, options, onEqualityCheck);
78+
gm.compare(
79+
savedImagePath,
80+
path.join(constants.pathToTestImageBaselines, imageFileName),
81+
options,
82+
onEqualityCheck
83+
);
7584
}
7685
}
7786

0 commit comments

Comments
 (0)