Skip to content

Commit 7196ed5

Browse files
author
gokulprasanth-ni
committed
update print evaluated rules code
Signed-off-by: gokulprasanth-ni <[email protected]>
1 parent e278153 commit 7196ed5

File tree

1 file changed

+5
-9
lines changed

1 file changed

+5
-9
lines changed

tests/print-evaluated-rules/index.js

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ const __dirname = path.dirname(__filename);
2727
.wrap(null).argv;
2828

2929
const hasWarn = function (config) {
30-
return JSON.stringify(config).includes('"warn"');
30+
return JSON.stringify(normalizeRulesSeverityToString(config.rules)).indexOf('"warn"') !== -1;
3131
};
3232

3333
const testDir = path.resolve(__dirname, '..');
@@ -94,7 +94,7 @@ const __dirname = path.dirname(__filename);
9494
return;
9595
}
9696

97-
const getDivergedRules = rules => Object.keys(rules)
97+
const getDivergedRules = rules => (Object.keys(rules)
9898
.filter(key => !key.startsWith('@angular-eslint'))
9999
.filter(
100100
key => !configTypescript.rules[key]
@@ -103,14 +103,10 @@ const __dirname = path.dirname(__filename);
103103
.reduce((config, key) => {
104104
config[key] = rules[key];
105105
return config;
106-
}, {});
106+
}, {}));
107107

108-
const angularDivergedRules = getDivergedRules(
109-
angularRules.map(config => config.rules)
110-
);
111-
const angularTemplateDivergedRules = getDivergedRules(
112-
angularTemplateRules.map(config => config.rules)
113-
);
108+
const angularDivergedRules = getDivergedRules(Object.assign({}, ...angularRules.slice(-2).map(item => item.rules)));
109+
const angularTemplateDivergedRules = getDivergedRules(Object.assign({}, ...angularTemplateRules.slice(-2).map(item => item.rules)));
114110
const angularHasDivergedRules = !!Object.keys(angularDivergedRules).length
115111
|| !!Object.keys(angularTemplateDivergedRules).length;
116112

0 commit comments

Comments
 (0)