Skip to content

Commit e18f1a2

Browse files
committed
Merge branch 'main' into test/385-notifications-page
# Conflicts: # jest.config.js
2 parents 878cbb8 + aae524d commit e18f1a2

File tree

29 files changed

+21575
-116
lines changed

29 files changed

+21575
-116
lines changed

.github/scripts/check-coverage-thresholds.js

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ for (const key of ['branches', 'functions', 'lines', 'statements']) {
1414
if (current > threshold) {
1515
errors.push(
1616
`Coverage for ${key} (${current}%) is above the threshold (${threshold}%).\n\tPlease update the coverageThreshold.global.${key} in the jest.config.js to ${current}!`
17-
)
17+
);
1818
failed = true;
1919
}
2020
}
@@ -26,6 +26,6 @@ if (failed) {
2626
console.log('Please update the coverage thresholds in jest.config.js.');
2727
console.log('You will need to commit again once you have updated the jst.config.js file.');
2828
console.log('This is only necessary until we hit 100% coverage.\n\n');
29-
errors.forEach(err => console.error(`${err}\n`));
29+
errors.forEach((err) => console.error(`${err}\n`));
3030
process.exit(1);
31-
}
31+
}

.gitignore

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,4 +42,3 @@ testem.log
4242
# System files
4343
.DS_Store
4444
Thumbs.db
45-
package-lock.json

jest.config.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@ module.exports = {
5353
'<rootDir>/src/app/features/project/',
5454
'<rootDir>/src/app/features/registries/',
5555
'<rootDir>/src/app/features/settings/addons/',
56-
'<rootDir>/src/app/features/settings/developer-apps/',
5756
'<rootDir>/src/app/features/settings/settings-container.component.ts',
5857
'<rootDir>/src/app/features/settings/tokens/components/',
5958
'<rootDir>/src/app/features/settings/tokens/mappers/',

0 commit comments

Comments
 (0)