From 31b19e8bd16e3c447c8a7a7756fed9ac3663d03b Mon Sep 17 00:00:00 2001 From: Brett Jurgens Date: Thu, 21 Dec 2017 12:27:52 -0600 Subject: [PATCH 1/3] allow filter to be a regex --- src/utils/image.js | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/utils/image.js b/src/utils/image.js index ff9ca4c..5e58a83 100644 --- a/src/utils/image.js +++ b/src/utils/image.js @@ -12,8 +12,14 @@ const move = promisify(fs.move) const pathExists = promisify(fs.pathExists) const glob = promisify(globby) +function filterOnRegex (filter) { + if (!filter) { return array => array; } + const filterRegex = new RegExp(filter); + return array => array.filter(value => filterRegex.test(value)); +} + async function compareNewScreenshotsToRefScreenshots ({ dir, filter, threshold }) { - const newImgs = await glob(path.join(dir, `${filter || ''}*.new.png`)) + const newImgs = filterOnRegex(filter)(await glob(path.join(dir, `*.new.png`))) let diffCount = 0 @@ -49,7 +55,7 @@ async function compareNewScreenshotsToRefScreenshots ({ dir, filter, threshold } } async function promoteNewScreenshots ({ dir, filter }) { - const newImgs = await glob(path.join(dir, `${filter || ''}*.new.png`)) + const newImgs = filterOnRegex(filter)(await glob(path.join(dir, `*.new.png`))) for (const newImg of newImgs) { await promoteNewScreenshot(newImg) From b0904083e80c89f01fb75f7b8d8756f06bec62f3 Mon Sep 17 00:00:00 2001 From: Brett Jurgens Date: Thu, 21 Dec 2017 12:29:49 -0600 Subject: [PATCH 2/3] remove semi --- src/utils/image.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/utils/image.js b/src/utils/image.js index 5e58a83..b3c10b8 100644 --- a/src/utils/image.js +++ b/src/utils/image.js @@ -13,9 +13,9 @@ const pathExists = promisify(fs.pathExists) const glob = promisify(globby) function filterOnRegex (filter) { - if (!filter) { return array => array; } - const filterRegex = new RegExp(filter); - return array => array.filter(value => filterRegex.test(value)); + if (!filter) { return array => array } + const filterRegex = new RegExp(filter) + return array => array.filter(value => filterRegex.test(value)) } async function compareNewScreenshotsToRefScreenshots ({ dir, filter, threshold }) { From fc47b740467f9d2efccadf513a5fbae30d0c83d6 Mon Sep 17 00:00:00 2001 From: Brett Jurgens Date: Thu, 21 Dec 2017 12:30:32 -0600 Subject: [PATCH 3/3] rename function --- src/utils/image.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/utils/image.js b/src/utils/image.js index b3c10b8..be4c6fe 100644 --- a/src/utils/image.js +++ b/src/utils/image.js @@ -12,14 +12,14 @@ const move = promisify(fs.move) const pathExists = promisify(fs.pathExists) const glob = promisify(globby) -function filterOnRegex (filter) { +function filterFiles (filter) { if (!filter) { return array => array } const filterRegex = new RegExp(filter) return array => array.filter(value => filterRegex.test(value)) } async function compareNewScreenshotsToRefScreenshots ({ dir, filter, threshold }) { - const newImgs = filterOnRegex(filter)(await glob(path.join(dir, `*.new.png`))) + const newImgs = filterFiles(filter)(await glob(path.join(dir, `*.new.png`))) let diffCount = 0 @@ -55,7 +55,7 @@ async function compareNewScreenshotsToRefScreenshots ({ dir, filter, threshold } } async function promoteNewScreenshots ({ dir, filter }) { - const newImgs = filterOnRegex(filter)(await glob(path.join(dir, `*.new.png`))) + const newImgs = filterFiles(filter)(await glob(path.join(dir, `*.new.png`))) for (const newImg of newImgs) { await promoteNewScreenshot(newImg)