fix(rules): Fix message when a failure occurs (#534)

Author: wKoza

src/templateConditionalComplexityRule.ts

@@ -31,7 +31,7 @@ export class Rule extends Lint.Rules.AbstractRule {
   };
 
   // tslint:disable-next-line:max-line-length
-  static COMPLEXITY_FAILURE_STRING = 'The condition complexity (cost \'%s\') exceeded the defined limit (cost \'%s\'). The conditional expression should be move in the component\'s template.';
+  static COMPLEXITY_FAILURE_STRING = 'The condition complexity (cost \'%s\') exceeded the defined limit (cost \'%s\'). The conditional expression should be moved into the component.';
 
   static COMPLEXITY_MAX = 3;
 
@@ -86,7 +86,7 @@ class TemplateConditionalComplexityVisitor extends BasicTemplateAstVisitor {
 
         if (complexity > complexityMax) {
           const span = prop.sourceSpan;
-          let failureConfig: string[] = [String(complexity), String(Rule.COMPLEXITY_MAX)];
+          let failureConfig: string[] = [String(complexity), String(complexityMax)];
           failureConfig.unshift(Rule.COMPLEXITY_FAILURE_STRING);
           this.addFailure(this.createFailure(span.start.offset, span.end.offset - span.start.offset,
             sprintf.apply(this, failureConfig))

src/templateCyclomaticComplexityRule.ts

@@ -63,7 +63,7 @@ class TemplateConditionalComplexityVisitor extends BasicTemplateAstVisitor {
 
     if (this.complexity > complexityMax) {
       const span = prop.sourceSpan;
-      let failureConfig: string[] = [String(Rule.COMPLEXITY_MAX)];
+      let failureConfig: string[] = [String(complexityMax)];
       failureConfig.unshift(Rule.COMPLEXITY_FAILURE_STRING);
       this.addFailure(this.createFailure(span.start.offset, span.end.offset - span.start.offset,
           sprintf.apply(this, failureConfig))

test/templateConditionalComplexityRule.spec.ts

@@ -1,7 +1,5 @@
 // tslint:disable:max-line-length
 import { assertSuccess, assertAnnotated } from './testHelper';
-import { Replacement } from 'tslint';
-import { expect } from 'chai';
 
 describe('complexity', () => {
     describe('success', () => {
@@ -94,8 +92,9 @@ describe('complexity', () => {
       `;
             assertAnnotated({
                 ruleName: 'template-conditional-complexity',
-                message: 'The condition complexity (cost \'5\') exceeded the defined limit (cost \'3\'). The conditional expression should be move in the component\'s template.',
-                source
+                message: 'The condition complexity (cost \'5\') exceeded the defined limit (cost \'4\'). The conditional expression should be moved into the component.',
+                source,
+                options: [4]
             });
         });
 
@@ -118,7 +117,7 @@ describe('complexity', () => {
       `;
             assertAnnotated({
                 ruleName: 'template-conditional-complexity',
-                message: 'The condition complexity (cost \'5\') exceeded the defined limit (cost \'3\'). The conditional expression should be move in the component\'s template.',
+                message: 'The condition complexity (cost \'5\') exceeded the defined limit (cost \'3\'). The conditional expression should be moved into the component.',
                 source
             });
         });

test/templateCyclomaticComplexityRule.spec.ts

@@ -1,7 +1,5 @@
 // tslint:disable:max-line-length
 import { assertSuccess, assertAnnotated } from './testHelper';
-import { Replacement } from 'tslint';
-import { expect } from 'chai';
 
 describe('cyclomatic complexity', () => {
     describe('success', () => {