From 89ac2139fce349bf16082ab8dac32c6a6ca46d15 Mon Sep 17 00:00:00 2001 From: vilchik-elena Date: Mon, 23 Dec 2019 15:22:35 +0100 Subject: explude also font awesome --- its/plugin/src/test/java/org/sonar/css/its/IssuesTest.java | 1 - .../main/java/org/sonar/css/plugin/rules/SelectorTypeNoUnknown.java | 3 ++- .../src/test/java/org/sonar/css/plugin/rules/CssRuleTest.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/its/plugin/src/test/java/org/sonar/css/its/IssuesTest.java b/its/plugin/src/test/java/org/sonar/css/its/IssuesTest.java index b6d8c84..8d28dac 100644 --- a/its/plugin/src/test/java/org/sonar/css/its/IssuesTest.java +++ b/its/plugin/src/test/java/org/sonar/css/its/IssuesTest.java @@ -48,7 +48,6 @@ public class IssuesTest { @BeforeClass public static void prepare() { RulesConfiguration rulesConfiguration = new RulesConfiguration(); - rulesConfiguration.add("S4670", "ignoreTypes", "/^(mat|md|fa)-/"); File profile = ProfileGenerator.generateProfile(orchestrator.getServer().getUrl(), "css", "css", rulesConfiguration, Collections.emptySet()); orchestrator.getServer().restoreProfile(FileLocation.of(profile)); diff --git a/sonar-css-plugin/src/main/java/org/sonar/css/plugin/rules/SelectorTypeNoUnknown.java b/sonar-css-plugin/src/main/java/org/sonar/css/plugin/rules/SelectorTypeNoUnknown.java index 14dd755..c7bc201 100644 --- a/sonar-css-plugin/src/main/java/org/sonar/css/plugin/rules/SelectorTypeNoUnknown.java +++ b/sonar-css-plugin/src/main/java/org/sonar/css/plugin/rules/SelectorTypeNoUnknown.java @@ -29,7 +29,8 @@ import static org.sonar.css.plugin.rules.RuleUtils.splitAndTrim; @Rule(key = "S4670") public class SelectorTypeNoUnknown implements CssRule { - private static final String DEFAULT_IGNORED_TYPES = "/^(mat|md)-/"; + // prefixes for Angular Material (mat, md), Font Awesome (fa) + private static final String DEFAULT_IGNORED_TYPES = "/^(mat|md|fa)-/"; @RuleProperty( key = "ignoreTypes", diff --git a/sonar-css-plugin/src/test/java/org/sonar/css/plugin/rules/CssRuleTest.java b/sonar-css-plugin/src/test/java/org/sonar/css/plugin/rules/CssRuleTest.java index 18cbcda..e7945b7 100644 --- a/sonar-css-plugin/src/test/java/org/sonar/css/plugin/rules/CssRuleTest.java +++ b/sonar-css-plugin/src/test/java/org/sonar/css/plugin/rules/CssRuleTest.java @@ -74,7 +74,7 @@ public class CssRuleTest { @Test public void selector_type_no_unknown_default() { String optionsAsJson = new Gson().toJson(new SelectorTypeNoUnknown().stylelintOptions()); - assertThat(optionsAsJson).isEqualTo("[true,{\"ignoreTypes\":[\"/^(mat|md)-/\"]}]"); + assertThat(optionsAsJson).isEqualTo("[true,{\"ignoreTypes\":[\"/^(mat|md|fa)-/\"]}]"); } @Test -- cgit v1.2.3