govuk_publishing_components 1.6.0 → 1.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a8d9bbd3501a6dc341847fe5f7e1e55862a12a26
-  data.tar.gz: c17cb2fca96844fd7d3038656550fba5cd378e9a
+  metadata.gz: c89ac97d233cfea87960f74561b440b7b512f4f5
+  data.tar.gz: 8eead0093c99748abd32686edd8e7f664f8485d4
 SHA512:
-  metadata.gz: f608ae560744b49d350b8d72b3ee0062a2ea899ddb76cb0219cf941d8e92336d4681695bb145d810e83670bb64afc5382eb010aa49ceba5a7e72036a68a70eb6
-  data.tar.gz: a2f28ab4fd0aae15e63479a7e2b5afe2c7ee819726bbddd954555b294a973f08f6413f352923e7b66c341f6d5b137effdf741703ed1e2e43a875d9526623fc9d
+  metadata.gz: 605d6cab7fa68c8257bad9e133f95ce3e4050a3bf66729bfe60caa281947b876a5a9a79cb0bd96d792075c7746ab8fb2a8b5feb7343f5c145f488e6f6fcb55e8
+  data.tar.gz: 3c563b212ffa0a53cda59aba21e4873e1a2c18476b98ab103237ebc150844272749786bbc71b8a1e0d1f0aee248d026e15279529fb38524c1fa1babc5f569bfb

data/app/assets/javascripts/govuk_publishing_components/accessibility-test.js

@@ -7,7 +7,7 @@
     }
 
     if (!document.querySelector(selector)) {
-      return callback('No selector "' + selector + '" found')
+      return callback()
     }
 
     var axeOptions = {
@@ -15,20 +15,27 @@
       include: [selector]
     }
 
+    // TODO: Remove when aXe core patched
+    // https://github.com/dequelabs/axe-core/issues/525
+    if (document.querySelector('svg') && !(document.querySelector('svg').children instanceof HTMLCollection)) {
+      delete axeOptions['restoreScroll']
+    }
+
     axe.run(selector, axeOptions, function (err, results) {
       if (err) {
-        callback('aXe Error: ' + err)
+        return callback('aXe Error: ' + err)
       }
 
-      var violations = (typeof results === 'undefined') ? [] : results.violations
-      var incompleteWarnings = (typeof results === 'undefined') ? [] : results.incomplete
-
-      if (violations.length === 0 && incompleteWarnings.length === 0) {
-        return callback('No accessibility issues found')
+      if (typeof results === "undefined") {
+        return callback('aXe Error: Expected results but none returned')
       }
 
-      var incompleteWarningsObj = _processIncompleteWarnings(incompleteWarnings)
-      var errorText = _processViolations(violations, results.url)
+      var errorText = _processViolations(results.violations, results.url)
+      var incompleteWarningsObj = _processIncompleteWarnings(results.incomplete)
+
+      var bodyClass = results.violations.length === 0 ? "js-test-a11y-success" : "js-test-a11y-failed"
+      document.body.classList.add(bodyClass);
+      document.body.classList.add("js-test-a11y-finished");
 
       callback(undefined, errorText, incompleteWarningsObj)
     })
@@ -51,33 +58,36 @@
           ].join('\n\n\n')
         }).join('\n\n- - -\n\n')
       )
-    }
-    else {
-      console.info("aXe: No accessibility errors found")
+    } else {
+      return false
     }
   }
 
   var _processIncompleteWarnings = function(incompleteWarnings) {
-    return (
-      incompleteWarnings.map(function (incomplete) {
-        var help = incomplete.help
-        var helpUrl = _formatHelpUrl(incomplete.helpUrl)
-        var cssSelector = incomplete.nodes.map(function (node) {
+    if (incompleteWarnings.length !== 0) {
+      return (
+        incompleteWarnings.map(function (incomplete) {
+          var help = incomplete.help
+          var helpUrl = _formatHelpUrl(incomplete.helpUrl)
+          var cssSelector = incomplete.nodes.map(function (node) {
+            return {
+              'selector': node.target,
+              'reason': node.any.map(function(item) {
+                return item.message
+              })
+            }
+          })
+
           return {
-            'selector': node.target,
-            'reason': node.any.map(function(item) {
-              return item.message
-            })
+            'summary': help,
+            'selectors': cssSelector,
+            'url': helpUrl
           }
         })
-
-        return {
-          'summary': help,
-          'selectors': cssSelector,
-          'url': helpUrl
-        }
-      })
-    )
+      )
+    } else {
+      return false
+    }
   }
 
   var _formatHelpUrl = function (helpUrl) {
@@ -143,7 +153,7 @@
     document.addEventListener('DOMContentLoaded', function () {
       AccessibilityTest('[data-module="test-a11y"]', function (err, violations, incompleteWarnings) {
         if (err) {
-          return
+          _throwUncaughtError(err)
         }
         if (incompleteWarnings) _renderIncompleteWarnings(incompleteWarnings)
         if (violations) _throwUncaughtError(violations)

data/app/controllers/govuk_publishing_components/application_controller.rb

@@ -6,6 +6,7 @@ module GovukPublishingComponents
     protect_from_forgery with: :exception
     before_action :set_custom_slimmer_headers
     before_action :set_x_frame_options_header
+    before_action :set_no_banner_cookie
 
   private
 
@@ -16,5 +17,19 @@ module GovukPublishingComponents
     def set_x_frame_options_header
       response.headers["X-Frame-Options"] = "ALLOWALL"
     end
+
+    def set_no_banner_cookie
+      cookies['govuk_takenUserSatisfactionSurvey'] = {
+        value: 'yes',
+        domain: 'localhost',
+        path: '/component-guide'
+      }
+
+      cookies['seen_cookie_message'] = {
+        value: 'yes',
+        domain: 'localhost',
+        path: '/component-guide'
+      }
+    end
   end
 end

data/app/models/govuk_publishing_components/shared_accessibility_criteria.rb

@@ -7,7 +7,7 @@ Links in the component must:
 - accept focus
 - be focusable with a keyboard
 - be usable with a keyboard
-- indicate when it has focus
+- indicate when they have focus
 - change in appearance when touched (in the touch-down state)
 - change in appearance when hovered
 - be usable with touch

data/lib/govuk_publishing_components/version.rb

@@ -1,3 +1,3 @@
 module GovukPublishingComponents
-  VERSION = '1.6.0'.freeze
+  VERSION = '1.7.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: govuk_publishing_components
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.7.0
 platform: ruby
 authors:
 - GOV.UK Dev
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-13 00:00:00.000000000 Z
+date: 2017-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails