Handle relative paths in exceptions for react-no-dangerous-html rule (#…

…539) * handle relative paths in exceptions for react-no-dangerous-html rule * replace backslash with forward slash to match ts.SourceFile.fileName on windows
microsoft · Oct 14, 2018 · 03a964c · 03a964c
1 parent 6961c32
commit 03a964c
Show file tree

Hide file tree

Showing 82 changed files with 882 additions and 786 deletions.
diff --git a/src/reactNoDangerousHtmlRule.ts b/src/reactNoDangerousHtmlRule.ts
@@ -1,4 +1,5 @@
 import * as ts from 'typescript';
+import {Utils} from './utils/Utils';
 import * as Lint from 'tslint';
 
 import {ErrorTolerantWalker} from './utils/ErrorTolerantWalker';
@@ -117,7 +118,7 @@ class NoDangerousHtmlWalker extends ErrorTolerantWalker {
         }
         let found = false;
         exceptions.forEach((exception : Exception) : void => {
-            if (exception.file === this.getSourceFile().fileName) {
+            if (Utils.absolutePath(exception.file) === this.getSourceFile().fileName) {
                 if (exception.method === methodName) {
                     if (exception.comment != null) {
                         found = true;

diff --git a/src/tests/ChaiPreferContainsToIndexOfRuleTests.ts b/src/tests/ChaiPreferContainsToIndexOfRuleTests.ts
@@ -1,3 +1,4 @@
+import {Utils} from '../utils/Utils';
 import {TestHelper} from './TestHelper';
 
 /**
@@ -33,7 +34,7 @@ describe('chaiPreferContainsToIndexOfRule', () : void => {
         TestHelper.assertViolations(ruleName, script, [
             {
                 "failure": "Found chai call with indexOf that can be converted to .contain assertion: ",
-                "name": "file.ts",
+                "name": Utils.absolutePath("file.ts"),
                 "ruleName": "chai-prefer-contains-to-index-of",
                 "startPosition": { "character": 13, "line": 2 }
             }
@@ -48,7 +49,7 @@ describe('chaiPreferContainsToIndexOfRule', () : void => {
         TestHelper.assertViolations(ruleName, script, [
             {
                 "failure": "Found chai call with indexOf that can be converted to .contain assertion: ",
-                "name": "file.ts",
+                "name": Utils.absolutePath("file.ts"),
                 "ruleName": "chai-prefer-contains-to-index-of",
                 "startPosition": { "character": 13, "line": 2 }
             }
@@ -63,7 +64,7 @@ describe('chaiPreferContainsToIndexOfRule', () : void => {
         TestHelper.assertViolations(ruleName, script, [
             {
                 "failure": "Found chai call with indexOf that can be converted to .contain assertion: ",
-                "name": "file.ts",
+                "name": Utils.absolutePath("file.ts"),
                 "ruleName": "chai-prefer-contains-to-index-of",
                 "startPosition": { "character": 13, "line": 2 }
             }
@@ -78,11 +79,11 @@ describe('chaiPreferContainsToIndexOfRule', () : void => {
         TestHelper.assertViolations(ruleName, script, [
             {
                 "failure": "Found chai call with indexOf that can be converted to .contain assertion: ",
-                "name": "file.ts",
+                "name": Utils.absolutePath("file.ts"),
                 "ruleName": "chai-prefer-contains-to-index-of",
                 "startPosition": { "character": 13, "line": 2 }
             }
         ]);
     });
 
-});
+});
diff --git a/src/tests/ChaiVagueErrorsRuleTests.ts b/src/tests/ChaiVagueErrorsRuleTests.ts
@@ -1,3 +1,4 @@
+import {Utils} from '../utils/Utils';
 import {TestHelper} from './TestHelper';
 
 /**
@@ -39,25 +40,25 @@ describe('chaiVagueErrorsRule', () : void => {
         TestHelper.assertViolations(ruleName, script, [
             {
                 "failure": "Found chai call with vague failure message. Please add an explicit failure message",
-                "name": "file.ts",
+                "name": Utils.absolutePath("file.ts"),
                 "ruleName": "chai-vague-errors",
                 "startPosition": { "character": 13, "line": 2 }
             },
             {
                 "failure": "Found chai call with vague failure message. Please add an explicit failure message",
-                "name": "file.ts",
+                "name": Utils.absolutePath("file.ts"),
                 "ruleName": "chai-vague-errors",
                 "startPosition": { "character": 13, "line": 3 }
             },
             {
                 "failure": "Found chai call with vague failure message. Please add an explicit failure message",
-                "name": "file.ts",
+                "name": Utils.absolutePath("file.ts"),
                 "ruleName": "chai-vague-errors",
                 "startPosition": { "character": 13, "line": 4 }
             },
             {
                 "failure": "Found chai call with vague failure message. Please add an explicit failure message",
-                "name": "file.ts",
+                "name": Utils.absolutePath("file.ts"),
                 "ruleName": "chai-vague-errors",
                 "startPosition": { "character": 13, "line": 5 }
             }
@@ -74,19 +75,19 @@ describe('chaiVagueErrorsRule', () : void => {
         TestHelper.assertViolations(ruleName, script, [
             {
                 "failure": "Found chai call with vague failure message. Please add an explicit failure message",
-                "name": "file.ts",
+                "name": Utils.absolutePath("file.ts"),
                 "ruleName": "chai-vague-errors",
                 "startPosition": { "character": 13, "line": 2 }
             },
             {
                 "failure": "Found chai call with vague failure message. Please add an explicit failure message",
-                "name": "file.ts",
+                "name": Utils.absolutePath("file.ts"),
                 "ruleName": "chai-vague-errors",
                 "startPosition": { "character": 13, "line": 3 }
             },
             {
                 "failure": "Found chai call with vague failure message. Please add an explicit failure message",
-                "name": "file.ts",
+                "name": Utils.absolutePath("file.ts"),
                 "ruleName": "chai-vague-errors",
                 "startPosition": { "character": 13, "line": 4 }
             }
@@ -103,19 +104,19 @@ describe('chaiVagueErrorsRule', () : void => {
         TestHelper.assertViolations(ruleName, script, [
             {
                 "failure": "Found chai call with vague failure message. Please add an explicit failure message",
-                "name": "file.ts",
+                "name": Utils.absolutePath("file.ts"),
                 "ruleName": "chai-vague-errors",
                 "startPosition": { "character": 13, "line": 2 }
             },
             {
                 "failure": "Found chai call with vague failure message. Please add an explicit failure message",
-                "name": "file.ts",
+                "name": Utils.absolutePath("file.ts"),
                 "ruleName": "chai-vague-errors",
                 "startPosition": { "character": 13, "line": 3 }
             },
             {
                 "failure": "Found chai call with vague failure message. Please add an explicit failure message",
-                "name": "file.ts",
+                "name": Utils.absolutePath("file.ts"),
                 "ruleName": "chai-vague-errors",
                 "startPosition": { "character": 13, "line": 4 }
             }
@@ -132,19 +133,19 @@ describe('chaiVagueErrorsRule', () : void => {
         TestHelper.assertViolations(ruleName, script, [
             {
                 "failure": "Found chai call with vague failure message. Please add an explicit failure message",
-                "name": "file.ts",
+                "name": Utils.absolutePath("file.ts"),
                 "ruleName": "chai-vague-errors",
                 "startPosition": { "character": 13, "line": 2 }
             },
             {
                 "failure": "Found chai call with vague failure message. Please add an explicit failure message",
-                "name": "file.ts",
+                "name": Utils.absolutePath("file.ts"),
                 "ruleName": "chai-vague-errors",
                 "startPosition": { "character": 13, "line": 3 }
             },
             {
                 "failure": "Found chai call with vague failure message. Please add an explicit failure message",
-                "name": "file.ts",
+                "name": Utils.absolutePath("file.ts"),
                 "ruleName": "chai-vague-errors",
                 "startPosition": { "character": 13, "line": 4 }
             }
@@ -161,19 +162,19 @@ describe('chaiVagueErrorsRule', () : void => {
         TestHelper.assertViolations(ruleName, script, [
             {
                 "failure": "Found chai call with vague failure message. Please add an explicit failure message",
-                "name": "file.ts",
+                "name": Utils.absolutePath("file.ts"),
                 "ruleName": "chai-vague-errors",
                 "startPosition": { "character": 13, "line": 2 }
             },
             {
                 "failure": "Found chai call with vague failure message. Please add an explicit failure message",
-                "name": "file.ts",
+                "name": Utils.absolutePath("file.ts"),
                 "ruleName": "chai-vague-errors",
                 "startPosition": { "character": 13, "line": 3 }
             },
             {
                 "failure": "Found chai call with vague failure message. Please add an explicit failure message",
-                "name": "file.ts",
+                "name": Utils.absolutePath("file.ts"),
                 "ruleName": "chai-vague-errors",
                 "startPosition": { "character": 13, "line": 4 }
             }
@@ -194,43 +195,43 @@ describe('chaiVagueErrorsRule', () : void => {
         TestHelper.assertViolations(ruleName, script, [
             {
                 "failure": "Found chai call with vague failure message. Please add an explicit failure message",
-                "name": "file.ts",
+                "name": Utils.absolutePath("file.ts"),
                 "ruleName": "chai-vague-errors",
                 "startPosition": { "character": 13, "line": 2 }
             },
             {
                 "failure": "Found chai call with vague failure message. Please add an explicit failure message",
-                "name": "file.ts",
+                "name": Utils.absolutePath("file.ts"),
                 "ruleName": "chai-vague-errors",
                 "startPosition": { "character": 13, "line": 3 }
             },
             {
                 "failure": "Found chai call with vague failure message. Please add an explicit failure message",
-                "name": "file.ts",
+                "name": Utils.absolutePath("file.ts"),
                 "ruleName": "chai-vague-errors",
                 "startPosition": { "character": 13, "line": 4 }
             },
             {
                 "failure": "Found chai call with vague failure message. Please add an explicit failure message",
-                "name": "file.ts",
+                "name": Utils.absolutePath("file.ts"),
                 "ruleName": "chai-vague-errors",
                 "startPosition": { "character": 13, "line": 5 }
             },
             {
                 "failure": "Found chai call with vague failure message. Please add an explicit failure message",
-                "name": "file.ts",
+                "name": Utils.absolutePath("file.ts"),
                 "ruleName": "chai-vague-errors",
                 "startPosition": { "character": 13, "line": 6 }
             },
             {
                 "failure": "Found chai call with vague failure message. Please add an explicit failure message",
-                "name": "file.ts",
+                "name": Utils.absolutePath("file.ts"),
                 "ruleName": "chai-vague-errors",
                 "startPosition": { "character": 13, "line": 7 }
             },
             {
                 "failure": "Found chai call with vague failure message. Please add an explicit failure message",
-                "name": "file.ts",
+                "name": Utils.absolutePath("file.ts"),
                 "ruleName": "chai-vague-errors",
                 "startPosition": { "character": 13, "line": 8 }
             }
@@ -249,31 +250,31 @@ describe('chaiVagueErrorsRule', () : void => {
         TestHelper.assertViolations(ruleName, script, [
             {
                 "failure": "Found chai call with vague failure message. Please add an explicit failure message",
-                "name": "file.ts",
+                "name": Utils.absolutePath("file.ts"),
                 "ruleName": "chai-vague-errors",
                 "startPosition": { "character": 13, "line": 2 }
             },
             {
                 "failure": "Found chai call with vague failure message. Please add an explicit failure message",
-                "name": "file.ts",
+                "name": Utils.absolutePath("file.ts"),
                 "ruleName": "chai-vague-errors",
                 "startPosition": { "character": 13, "line": 3 }
             },
             {
                 "failure": "Found chai call with vague failure message. Please add an explicit failure message",
-                "name": "file.ts",
+                "name": Utils.absolutePath("file.ts"),
                 "ruleName": "chai-vague-errors",
                 "startPosition": { "character": 13, "line": 4 }
             },
             {
                 "failure": "Found chai call with vague failure message. Please add an explicit failure message",
-                "name": "file.ts",
+                "name": Utils.absolutePath("file.ts"),
                 "ruleName": "chai-vague-errors",
                 "startPosition": { "character": 13, "line": 5 }
             },
             {
                 "failure": "Found chai call with vague failure message. Please add an explicit failure message",
-                "name": "file.ts",
+                "name": Utils.absolutePath("file.ts"),
                 "ruleName": "chai-vague-errors",
                 "startPosition": { "character": 13, "line": 6 }
             }
@@ -292,28 +293,28 @@ describe('chaiVagueErrorsRule', () : void => {
             {
                 "failure": "Found chai call with vague failure message. " +
                     "Move the strict equality comparison from the expect call into the assertion value",
-                "name": "file.ts",
+                "name": Utils.absolutePath("file.ts"),
                 "ruleName": "chai-vague-errors",
                 "startPosition": { "character": 13, "line": 2 }
             },
             {
                 "failure": "Found chai call with vague failure message. " +
                     "Move the strict equality comparison from the expect call into the assertion value",
-                "name": "file.ts",
+                "name": Utils.absolutePath("file.ts"),
                 "ruleName": "chai-vague-errors",
                 "startPosition": { "character": 13, "line": 3 }
             },
             {
                 "failure": "Found chai call with vague failure message. " +
                     "Move the strict inequality comparison from the expect call into the assertion value. ",
-                "name": "file.ts",
+                "name": Utils.absolutePath("file.ts"),
                 "ruleName": "chai-vague-errors",
                 "startPosition": { "character": 13, "line": 4 }
             },
             {
                 "failure": "Found chai call with vague failure message. " +
                     "Move the strict inequality comparison from the expect call into the assertion value. ",
-                "name": "file.ts",
+                "name": Utils.absolutePath("file.ts"),
                 "ruleName": "chai-vague-errors",
                 "startPosition": { "character": 13, "line": 5 }
             }
@@ -330,17 +331,17 @@ describe('chaiVagueErrorsRule', () : void => {
             {
                 "failure": "Found chai call with vague failure message. " +
                     "Move the strict inequality comparison from the expect call into the assertion value. ",
-                "name": "file.ts",
+                "name": Utils.absolutePath("file.ts"),
                 "ruleName": "chai-vague-errors",
                 "startPosition": { "character": 13, "line": 2 }
             },
             {
                 "failure": "Found chai call with vague failure message. " +
                     "Move the strict equality comparison from the expect call into the assertion value",
-                "name": "file.ts",
+                "name": Utils.absolutePath("file.ts"),
                 "ruleName": "chai-vague-errors",
                 "startPosition": { "character": 13, "line": 3 }
             }
         ]);
     });
-});
+});