Merge pull request #320 from quailjs/2.2/test-patching

2 2 test patching
quailjs · Aug 8, 2015 · 49c85a9 · 49c85a9
2 parents 9cabb02 + bf76766
commit 49c85a9
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 3 deletions.
diff --git a/src/js/custom/aImgAltNotRepetitive.js b/src/js/custom/aImgAltNotRepetitive.js
@@ -4,7 +4,10 @@ quail.aImgAltNotRepetitive = function(quail, test, Case) {
       element: this
     }));
     var expected = $(this).closest('.quail-test').data('expected');
-    if (quail.cleanString($(this).attr('alt')) === quail.cleanString($(this).parent('a').text())) {
+    var alt      = quail.cleanString($(this).attr('alt'));
+    var linkText = quail.cleanString($(this).closest('a').text());
+
+    if (alt.length > 0 && linkText.indexOf(alt) !== -1) {
       _case.set({
         'expected': expected,
         'status': 'failed'

diff --git a/src/js/custom/pNotUsedAsHeader.js b/src/js/custom/pNotUsedAsHeader.js
@@ -11,7 +11,8 @@ quail.pNotUsedAsHeader = function(quail, test, Case) {
       });
     }
     var failed = false;
-    if ($(this).text().search('.') < 1) {
+    // Look for any indication that the paragraph contains at least a full sentence
+    if ($(this).text().search(/[.!:;]/) < 1) {
       var $paragraph = $(this),
         priorParagraph = $paragraph.prev('p');
       // Checking if any of suspectPHeaderTags has exact the same text as a paragraph.
@@ -40,7 +41,9 @@ quail.pNotUsedAsHeader = function(quail, test, Case) {
           }
         });
       }
-      if ($paragraph.css('font-weight') === 'bold') {
+
+      var fontWeight = $paragraph.css('font-weight');
+      if (fontWeight === 'bold' || +fontWeight >= 700) { // bold
         _case.set({
           'status': 'failed'
         });

diff --git a/test/accessibility-tests/aImgAltNotRepetitive.html b/test/accessibility-tests/aImgAltNotRepetitive.html
@@ -12,5 +12,18 @@
 		  <a href="page1.html" class="quail-failed-element"><img src="../assets/rex.jpg" alt="page1"/>page1</a>
 		</div>
 
+		<div class="quail-test" data-expected="fail" data-accessibility-test="aImgAltNotRepetitive">
+		  <a href="page1.html" class="quail-failed-element"><img src="../assets/rex.jpg" alt="page1"/><i>page1</i></a>
+		</div>
+
+		<div class="quail-test" data-expected="fail" data-accessibility-test="aImgAltNotRepetitive">
+		  <a href="page1.html" class="quail-failed-element"><img src="../assets/rex.jpg" alt="page1"/>Go to page1</a>
+		</div>
+
+		<div class="quail-test" data-expected="fail" data-accessibility-test="aImgAltNotRepetitive">
+		  <a href="page1.html" class="quail-failed-element">
+		  	<i><img src="../assets/rex.jpg" alt="page1"/></i>page1</a>
+		</div>
+
 		<script src="../quail-testrunner.js"></script>	</body>
 </html>
diff --git a/test/accessibility-tests/pNotUsedAsHeader.html b/test/accessibility-tests/pNotUsedAsHeader.html
@@ -58,6 +58,15 @@
         </p>
     </div>
 
+    <div class="quail-test" data-expected="pass" data-accessibility-test="pNotUsedAsHeader">
+        <p><strong>I am a single sentence paragraph!</strong></p>
+    </div>
+
+    <div class="quail-test" data-expected="pass" data-accessibility-test="pNotUsedAsHeader">
+
+        <p>This is a <strong>regular</strong> paragraph</p>
+    </div>
+
     <div class="quail-test" data-expected="pass" data-accessibility-test="pNotUsedAsHeader">
 
         <p>This is a regular paragraph</p>