Skip to content

Commit 4ab2757

Browse files
authored
chore: fix test runner filtering when no packages have changed (#2074)
1 parent ca052d4 commit 4ab2757

File tree

1 file changed

+10
-11
lines changed

1 file changed

+10
-11
lines changed

wtr-utils.js

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@ const NO_UNIT_TESTS = ['vaadin-icons', 'vaadin-lumo-styles', 'vaadin-material-st
1717

1818
const NO_VISUAL_TESTS = ['vaadin-icon', 'vaadin-template-renderer', 'vaadin-virtual-list'];
1919

20+
const hasUnitTests = (pkg) => !NO_UNIT_TESTS.includes(pkg);
21+
const hasVisualTests = (pkg) => !NO_VISUAL_TESTS.includes(pkg) && pkg.indexOf('mixin') === -1;
22+
2023
/**
2124
* Check if lockfile has changed.
2225
*/
@@ -30,7 +33,7 @@ const isLockfileChanged = () => {
3033
*/
3134
const getChangedPackages = () => {
3235
const output = execSync('./node_modules/.bin/lerna ls --since origin/master --json --loglevel silent');
33-
return JSON.parse(output.toString());
36+
return JSON.parse(output.toString()).map((project) => project.name.replace('@vaadin/', ''));
3437
};
3538

3639
/**
@@ -60,11 +63,9 @@ const getUnitTestPackages = () => {
6063
return getAllPackages();
6164
}
6265

63-
let packages = getChangedPackages()
64-
.map((project) => project.name.replace('@vaadin/', ''))
65-
.filter((project) => NO_UNIT_TESTS.indexOf(project) === -1);
66+
let packages = getChangedPackages();
6667

67-
if (packages.length == 0) {
68+
if (packages.length === 0) {
6869
// When running in GitHub Actions, do nothing.
6970
if (process.env.GITHUB_REF) {
7071
console.log(`No local packages have changed, exiting.`);
@@ -77,7 +78,7 @@ const getUnitTestPackages = () => {
7778
console.log(`Running tests for changed packages:\n${packages.join('\n')}`);
7879
}
7980

80-
return packages;
81+
return packages.filter(hasUnitTests);
8182
};
8283

8384
/**
@@ -89,11 +90,9 @@ const getVisualTestPackages = () => {
8990
return getAllVisualPackages();
9091
}
9192

92-
let packages = getChangedPackages()
93-
.map((project) => project.name.replace('@vaadin/', ''))
94-
.filter((project) => NO_VISUAL_TESTS.indexOf(project) === -1 && project.indexOf('mixin') === -1);
93+
let packages = getChangedPackages();
9594

96-
if (packages.length == 0) {
95+
if (packages.length === 0) {
9796
// When running in GitHub Actions, do nothing.
9897
if (process.env.GITHUB_REF) {
9998
console.log(`No local packages have changed, exiting.`);
@@ -108,7 +107,7 @@ const getVisualTestPackages = () => {
108107
console.log(`Running tests for changed packages:\n${packages.join('\n')}`);
109108
}
110109

111-
return packages;
110+
return packages.filter(hasVisualTests);
112111
};
113112

114113
/**

0 commit comments

Comments
 (0)