diff --git a/resources/com/cadoles/pa11y/run-audit.sh b/resources/com/cadoles/pa11y/run-audit.sh index 793280d..027645c 100644 --- a/resources/com/cadoles/pa11y/run-audit.sh +++ b/resources/com/cadoles/pa11y/run-audit.sh @@ -10,7 +10,7 @@ cd reports export PUPPETEER_EXECUTABLE_PATH=$(which chromium-browser) export PA11Y_REPORTER="${PA11Y_REPORTER:-html}" export PA11Y_STANDARD="${PA11Y_STANDARD:-WCAG2AA}" -export PA11Y_IGNORE="${PA11Y_IGNORE:-'WCAG2AA.Principle1.Guideline1_4.1_4_3.G18.Fail;WCAG2AA.Principle1.Guideline1_4.1_4_3.G145.Fail'}" +export PA11Y_IGNORE="${PA11Y_IGNORE}" PA11Y_ARGS="" diff --git a/vars/pa11y.groovy b/vars/pa11y.groovy index 0433876..c222c27 100644 --- a/vars/pa11y.groovy +++ b/vars/pa11y.groovy @@ -1,12 +1,13 @@ def audit(String url, Map params = [:]) { def reporter = params.reporter ? params.reporter : 'html' - def username = params.username ? params.username : ''; - def password = params.password ? params.password : ''; - def standard = params.standard ? params.standard : 'WCAG2AA'; - def includeWarnings = params.includeWarnings ? params.includeWarnings : false; - def includeNotices = params.includeNotices ? params.includeNotices : false; - def cookie_value = params.cookie_value ? params.cookie_value : 'fr_FR'; - + def username = params.username ? params.username : '' + def password = params.password ? params.password : '' + def standard = params.standard ? params.standard : 'WCAG2AA' + def includeWarnings = params.includeWarnings ? params.includeWarnings : false + def includeNotices = params.includeNotices ? params.includeNotices : false + def cookie = params.cookie ? params.cookie : '' + def ignoredRules = params.ignoredRules ? params.ignoredRules : '' + def pa11yImage = buildDockerImage() def dockerArgs = """ @@ -17,7 +18,8 @@ def audit(String url, Map params = [:]) { -e PA11Y_STANDARD='${standard}' -e PA11Y_INCLUDE_WARNINGS='${includeWarnings}' -e PA11Y_INCLUDE_NOTICES='${includeNotices}' - -e PA11Y_COOKIE='${cookie_value}' + -e PA11Y_COOKIE='${cookie}' + -e PA11Y_IGNORE='${ignoredRules}' """ pa11yImage.inside(dockerArgs) { @@ -31,24 +33,22 @@ def audit(String url, Map params = [:]) { } } - - def buildDockerImage() { - dir ('.pa11y') { + dir('.pa11y') { def resourceFiles = [ 'com/cadoles/pa11y/Dockerfile', 'com/cadoles/pa11y/patty.json.tmpl', 'com/cadoles/pa11y/run-audit.sh' - ]; + ] for (res in resourceFiles) { def fileContent = libraryResource res - def fileName = res.substring(res.lastIndexOf("/")+1) + def fileName = res.substring(res.lastIndexOf('/') + 1) writeFile file:fileName, text:fileContent } - + def safeJobName = URLDecoder.decode(env.JOB_NAME).toLowerCase().replace('/', '-').replace(' ', '-') def imageTag = "${safeJobName}-${env.BUILD_ID}" - return docker.build("pa11y:${imageTag}", ".") + return docker.build("pa11y:${imageTag}", '.') } -} \ No newline at end of file +}