fix to make img element allow role='presentation' with non-empty alt

 - closes #298

src/reactA11yImgHasAltRule.ts

@@ -15,7 +15,7 @@ const ALT_STRING: string = 'alt';
 
 export function getFailureStringNoAlt(tagName: string): string {
     return `<${tagName}> elements must have an non-empty alt attribute or \
-use empty alt attribute and role='presentation' for presentational images. \
+use empty alt attribute as well as role='presentation' for decorative/presentational images. \
 A reference for the presentation role can be found at https://www.w3.org/TR/wai-aria/roles#presentation.`;
 }
 
@@ -24,11 +24,6 @@ export function getFailureStringEmptyAltAndNotPresentationRole(tagName: string):
 Add more details in alt attribute or specify role attribute to equal 'presentation' when 'alt' attribute is empty.`;
 }
 
-export function getFailureStringNonEmptyAltAndPresentationRole(tagName: string): string {
-    return `The value of alt attribute in <${tagName}> tag is non-empty and role value is presentation. \
-Remove role='presentation' or specify 'alt' attributeto be empty when role attributes equals 'presentation'.`;
-}
-
 /**
  * Enforces that img elements have alt text.
  */
@@ -101,13 +96,7 @@ class ImgHasAltWalker extends Lint.RuleWalker {
             const isPresentationRole: boolean = !!roleAttributeValue.toLowerCase().match(/\bpresentation\b/);
             const isEmptyAlt: boolean = isEmpty(altAttribute) || getStringLiteral(altAttribute) === '';
 
-            if (!isEmptyAlt && isPresentationRole) { // <img alt='altValue' role='presentation' />
-                this.addFailure(this.createFailure(
-                    node.getStart(),
-                    node.getWidth(),
-                    getFailureStringNonEmptyAltAndPresentationRole(tagName)
-                ));
-            } else if (isEmptyAlt && !isPresentationRole) { // <img alt='' />
+            if (isEmptyAlt && !isPresentationRole) { // <img alt='' />
                 this.addFailure(this.createFailure(
                     node.getStart(),
                     node.getWidth(),

src/tests/reactA11yImgHasAltRuleTests.ts

@@ -1,7 +1,6 @@
 import { TestHelper } from './TestHelper';
 import {
   getFailureStringNoAlt,
-  getFailureStringNonEmptyAltAndPresentationRole,
   getFailureStringEmptyAltAndNotPresentationRole
 } from '../reactA11yImgHasAltRule';
 
@@ -39,6 +38,11 @@ describe('reactA11yImgHasAlt', () => {
         const fileName: string = fileDirectory + 'ImgElementHasNonEmptyAltValueAndNotPresentationRole.tsx';
         TestHelper.assertNoViolation(ruleName, fileName);
       });
+
+      it('when the img element has non-empty alt value and presentation role', () => {
+        const fileName: string = fileDirectory + 'ImgElementHasNonEmptyAltValueAndPresentationRole.tsx';
+        TestHelper.assertNoViolation(ruleName, fileName);
+      });
     });
 
     describe('should fail', () => {
@@ -101,41 +105,6 @@ describe('reactA11yImgHasAlt', () => {
           ]
         );
       });
-
-      it('when the img element has non-empty alt value and presentation role', () => {
-        const fileName: string = fileDirectory + 'ImgElementHasNonEmptyAltValueAndPresentationRole.tsx';
-
-        TestHelper.assertViolations(
-          ruleName,
-          fileName,
-          [
-            {
-              name: fileName,
-              ruleName: ruleName,
-              startPosition: { character: 11, line: 5 },
-              failure: getFailureStringNonEmptyAltAndPresentationRole('img')
-            },
-            {
-              name: fileName,
-              ruleName: ruleName,
-              startPosition: { character: 11, line: 6 },
-              failure: getFailureStringNonEmptyAltAndPresentationRole('img')
-            },
-            {
-              name: fileName,
-              ruleName: ruleName,
-              startPosition: { character: 11, line: 7 },
-              failure: getFailureStringNonEmptyAltAndPresentationRole('img')
-            },
-            {
-              name: fileName,
-              ruleName: ruleName,
-              startPosition: { character: 11, line: 8 },
-              failure: getFailureStringNonEmptyAltAndPresentationRole('img')
-            }
-          ]
-        );
-      });
     });
   });
 
@@ -200,54 +169,6 @@ describe('reactA11yImgHasAlt', () => {
         );
       });
 
-      it('when custom element or img has non-empty alt value and presentation role', () => {
-        const fileName: string = fileDirectory + 'CustomElementHasNonEmptyAltValueAndPresentationRole.tsx';
-
-        TestHelper.assertViolationsWithOptions(
-          ruleName,
-          options,
-          fileName,
-          [
-            {
-              name: fileName,
-              ruleName: ruleName,
-              startPosition: { character: 11, line: 6 },
-              failure: getFailureStringNonEmptyAltAndPresentationRole('Picture')
-            },
-            {
-              name: fileName,
-              ruleName: ruleName,
-              startPosition: { character: 11, line: 7 },
-              failure: getFailureStringNonEmptyAltAndPresentationRole('Picture')
-            },
-            {
-              name: fileName,
-              ruleName: ruleName,
-              startPosition: { character: 11, line: 8 },
-              failure: getFailureStringNonEmptyAltAndPresentationRole('Picture')
-            },
-            {
-              name: fileName,
-              ruleName: ruleName,
-              startPosition: { character: 11, line: 9 },
-              failure: getFailureStringNonEmptyAltAndPresentationRole('img')
-            },
-            {
-              name: fileName,
-              ruleName: ruleName,
-              startPosition: { character: 11, line: 10 },
-              failure: getFailureStringNonEmptyAltAndPresentationRole('img')
-            },
-            {
-              name: fileName,
-              ruleName: ruleName,
-              startPosition: { character: 11, line: 11 },
-              failure: getFailureStringNonEmptyAltAndPresentationRole('img')
-            }
-          ]
-        );
-      });
-
       it('when custom element or img has empty alt value and not presentation role', () => {
         const fileName: string = fileDirectory + 'CustomElementHasEmptyAltValueAndNotPresentationRole.tsx';