{% include "audit-metadata.html" %}
diff --git a/backend/audit/templates/audit/my_submissions.html b/backend/audit/templates/audit/my_submissions.html
index b4d0130d8..3bbd72dea 100644
--- a/backend/audit/templates/audit/my_submissions.html
+++ b/backend/audit/templates/audit/my_submissions.html
@@ -12,7 +12,7 @@
Single audit submissions
{% if data.in_progress_audits %}
Audits in progress
-
+
The audits listed below are in progress, and you are still able to edit them before submission. Select an audit by clicking on its Status to make changes and continue the submission process.
@@ -56,7 +56,7 @@
Audits in progress
{% if data.completed_audits %}
Completed audits
-
+
The audits listed below are with the FAC for processing and can't be edited.
\ No newline at end of file
+
\ No newline at end of file
diff --git a/backend/audit/templates/audit/submission_checklist/key-info-preliminary.html b/backend/audit/templates/audit/submission_checklist/key-info-preliminary.html
index 4296d3428..de83bafa7 100644
--- a/backend/audit/templates/audit/submission_checklist/key-info-preliminary.html
+++ b/backend/audit/templates/audit/submission_checklist/key-info-preliminary.html
@@ -1,7 +1,7 @@
-
+
+ aria-label="summary-box-preliminary">
Key information
@@ -16,4 +16,4 @@
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/backend/audit/templates/audit/submission_checklist/preview-button-group.html b/backend/audit/templates/audit/submission_checklist/preview-button-group.html
index 0de190121..c1a47c0a3 100644
--- a/backend/audit/templates/audit/submission_checklist/preview-button-group.html
+++ b/backend/audit/templates/audit/submission_checklist/preview-button-group.html
@@ -7,7 +7,7 @@
3. The unlock page
{% endcomment %}
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/backend/audit/templates/audit/submission_checklist/submission-checklist.html b/backend/audit/templates/audit/submission_checklist/submission-checklist.html
index 10afa5965..245a8dc5c 100644
--- a/backend/audit/templates/audit/submission_checklist/submission-checklist.html
+++ b/backend/audit/templates/audit/submission_checklist/submission-checklist.html
@@ -106,10 +106,10 @@
{% comment %} Submit to the FAC for processing {% endcomment %}
{% if submission.enabled %}
-
There were errors when attempting to submit the form. Scroll down for more details.
{% endif %}
-
-
-
+ Cancel
+
{% include "audit-metadata.html" %}
diff --git a/backend/audit/views/home.py b/backend/audit/views/home.py
index ce30f60ef..cf86c565b 100644
--- a/backend/audit/views/home.py
+++ b/backend/audit/views/home.py
@@ -1,6 +1,7 @@
-from django.views import generic
+from django.conf import settings
from django.shortcuts import render, redirect
from django.urls import reverse
+from django.views import generic
# class based views for posts
@@ -13,9 +14,9 @@ class Home(generic.View):
"""
def get(self, request, *args, **kwargs):
- if request.user.is_authenticated:
+ if request.user.is_authenticated and not settings.DISABLE_AUTH:
url = reverse("audit:MySubmissions")
return redirect(url)
template_name = "home.html"
- extra_context = {}
+ extra_context = {"DISABLE_AUTH": settings.DISABLE_AUTH}
return render(request, template_name, extra_context)
diff --git a/backend/census_historical_migration/test_general_information_xforms.py b/backend/census_historical_migration/test_general_information_xforms.py
index c2ef1f585..b00a92f14 100644
--- a/backend/census_historical_migration/test_general_information_xforms.py
+++ b/backend/census_historical_migration/test_general_information_xforms.py
@@ -299,9 +299,7 @@ def test_missing_auditee_contact_name(self):
class TestXformReplaceEmptyOrInvalidUEIs(SimpleTestCase):
-
class MockAuditHeader:
-
def __init__(self, UEI):
self.UEI = UEI
diff --git a/backend/cypress/e2e/accessibility.cy.js b/backend/cypress/e2e/accessibility.cy.js
new file mode 100644
index 000000000..6c986c623
--- /dev/null
+++ b/backend/cypress/e2e/accessibility.cy.js
@@ -0,0 +1,151 @@
+import { terminalLog } from '../support/log-functions';
+
+const screen_sizes = ['iphone-6', ['iphone-6', 'landscape'], [3840, 2160]];
+
+function test_check_a11y(url, pageName, report_id) {
+ if (report_id) {
+ it(`Tests the full ${pageName} page for all screen sizes`, () => {
+ check_a11y(`${url}${report_id}`, 'eligibility');
+ });
+ } else {
+ it(`Tests the full ${pageName} page for all screen sizes`, () => {
+ check_a11y(url);
+ });
+ }
+}
+
+function check_a11y(url) {
+ cy.visit(url);
+ cy.injectAxe();
+ screen_sizes.forEach((size) => {
+ if (Cypress._.isArray(size)) {
+ cy.viewport(size[0], size[1]);
+ } else {
+ cy.viewport(size);
+ }
+ cy.checkA11y(null, null, terminalLog);
+ });
+}
+
+describe('A11y Testing on Home Page', () => {
+ test_check_a11y('/', 'home');
+
+ it('Tests the pop out primary nav', () => {
+ cy.visit('/');
+ cy.injectAxe();
+ cy.get('.usa-menu-btn').contains('Menu').click();
+ cy.checkA11y(null, null, terminalLog);
+ });
+
+ // Log in modal fails contrast tests with the darker background, which is expected.
+ // it('Tests the log in modal', () => {
+ // cy.get('[aria-controls="login-modal"]').contains("Submit an audit").click();
+ // cy.checkA11y(null, null, terminalLog)
+ // })
+});
+
+describe('A11y Testing on search pages', () => {
+ before(() => {
+ cy.visit('/dissemination/search/');
+ cy.get('label').contains('All years').click();
+ cy.get('[id="search-form"]').submit();
+ cy.get('tbody > :nth-child(1) > td > a')
+ .invoke('attr', 'href')
+ .as('summary_url');
+ });
+
+ it(`Tests the summary page for all screen sizes`, () => {
+ cy.get('@summary_url').then((val) => {
+ check_a11y(val);
+ });
+ });
+
+ test_check_a11y('/dissemination/search/', 'basic search');
+ test_check_a11y('/dissemination/search/advanced/', 'advanced search');
+});
+
+describe('A11y Testing on pre-submission pages', () => {
+ test_check_a11y('/audit/', 'my submissions');
+ test_check_a11y('/report_submission/eligibility/', 'eligibility');
+ test_check_a11y('/report_submission/auditeeinfo/', 'auditee info');
+ test_check_a11y(
+ '/report_submission/accessandsubmission/',
+ 'submission access'
+ );
+});
+
+describe('A11y tests on an in progress report', () => {
+ before(() => {
+ cy.visit('/audit');
+ cy.get('tr')
+ .contains('In Progress')
+ .parent()
+ .parent()
+ .contains('GSAFAC')
+ .invoke('text')
+ .as('report_id');
+ });
+
+ it(`Tests submission pages for all screen sizes`, () => {
+ cy.get('@report_id').then((val) => {
+ // Submission items:
+ check_a11y(`/audit/submission-progress/${val}`);
+ check_a11y(`/report_submission/general-information/${val}`);
+ check_a11y(`/audit/audit-info/${val}`);
+ check_a11y(`/audit/upload-report/${val}`);
+ check_a11y(`/report_submission/federal-awards/${val}`);
+ // Cross validation:
+ check_a11y(`/audit/cross-validation/${val}`);
+ check_a11y(`/audit/ready-for-certification/${val}`);
+ // Access Management:
+ check_a11y(`/audit/manage-submission/${val}`);
+ check_a11y(`/audit/manage-submission/add-editor/${val}`);
+ check_a11y(`/audit/manage-submission/auditee-certifying-official/${val}`);
+ check_a11y(`/audit/manage-submission/auditor-certifying-official/${val}`);
+ });
+ });
+});
+
+describe('A11y tests on a ready for certification report', () => {
+ before(() => {
+ cy.visit('/audit');
+ cy.get('tr')
+ .contains('Ready for Certification')
+ .parent()
+ .parent()
+ .contains('GSAFAC')
+ .invoke('text')
+ .as('report_id');
+ });
+
+ it(`Tests submission pages for all screen sizes after locking for certification`, () => {
+ cy.get('@report_id').then((val) => {
+ // Check checklist after locking for certification:
+ check_a11y(`/audit/submission-progress/${val}`);
+ // Certification and final submission pages:
+ check_a11y(`/audit/auditor-certification/${val}`);
+ check_a11y(`/audit/auditee-certification/${val}`);
+ check_a11y(`/audit/submission/${val}`);
+ });
+ });
+});
+
+describe('A11y tests on a fully submitted report', () => {
+ before(() => {
+ cy.visit('/audit');
+ cy.get('tr')
+ .contains('Accepted')
+ .parent()
+ .parent()
+ .contains('GSAFAC')
+ .invoke('text')
+ .as('report_id');
+ });
+
+ it(`Tests submission checklist for all screen sizes after submission`, () => {
+ cy.get('@report_id').then((val) => {
+ // Check the checklist after submission:
+ check_a11y(`/audit/submission-progress/${val}`);
+ });
+ });
+});
diff --git a/backend/cypress/plugins/index.js b/backend/cypress/plugins/index.js
index f39f3dcb3..139f4c51c 100644
--- a/backend/cypress/plugins/index.js
+++ b/backend/cypress/plugins/index.js
@@ -18,6 +18,17 @@
// eslint-disable-next-line no-unused-vars
module.exports = (on, config) => {
on("task", {
- generateOTP: require("cypress-otp")
+ generateOTP: require("cypress-otp"),
+ log(message) {
+ console.log(message)
+
+ return null
+ },
+ table(message) {
+ console.table(message)
+
+ return null
+ }
});
+
}
diff --git a/backend/cypress/support/commands.js b/backend/cypress/support/commands.js
index 19aa4caff..439c4e177 100644
--- a/backend/cypress/support/commands.js
+++ b/backend/cypress/support/commands.js
@@ -23,8 +23,6 @@
//
// -- This will overwrite an existing command --
// Cypress.Commands.overwrite('visit', (originalFn, url, options) => { ... })
-//import '@cypress-audit/lighthouse/commands';
-//import '@cypress-audit/pa11y/commands';
import 'cypress-file-upload';
import { testLoginGovLogin } from './login-gov.js';
import { testLogoutGov } from './logout-gov.js';
diff --git a/backend/cypress/support/e2e.js b/backend/cypress/support/e2e.js
index 8e86ba548..285ae4e4c 100644
--- a/backend/cypress/support/e2e.js
+++ b/backend/cypress/support/e2e.js
@@ -14,6 +14,8 @@
// ***********************************************************
// Import commands.js using ES2015 syntax:
+import './commands'
+import 'cypress-axe'
// Alternatively you can use CommonJS syntax:
-require('./commands');
+// require('./commands');
diff --git a/backend/cypress/support/log-functions.js b/backend/cypress/support/log-functions.js
new file mode 100644
index 000000000..7dbd2fe27
--- /dev/null
+++ b/backend/cypress/support/log-functions.js
@@ -0,0 +1,23 @@
+export function terminalLog(violations) {
+ cy.task(
+ 'log',
+ `${violations.length} accessibility violation${
+ violations.length === 1 ? '' : 's'
+ } ${violations.length === 1 ? 'was' : 'were'} detected`
+ );
+
+ console.log(violations);
+
+ // Pluck specific keys for readability. Add helpUrl if messages are not as clear as needed.
+ const violationData = violations.map(
+ ({ id, impact, description, nodes, helpUrl }) => ({
+ id,
+ impact,
+ description,
+ nodes: nodes.length,
+ helpUrl: helpUrl,
+ })
+ );
+
+ cy.task('table', violationData);
+}
diff --git a/backend/cypress/support/report-pdf.js b/backend/cypress/support/report-pdf.js
index ab2a560b7..51de615b8 100644
--- a/backend/cypress/support/report-pdf.js
+++ b/backend/cypress/support/report-pdf.js
@@ -1,16 +1,17 @@
export function testPdfAuditReport() {
- cy.get('#financial_statements').type(1);
- cy.get('#financial_statements_opinion').type(1);
- cy.get('#schedule_expenditures').type(1);
- cy.get('#schedule_expenditures_opinion').type(1);
- cy.get('#uniform_guidance_control').type(1);
- cy.get('#uniform_guidance_compliance').type(1);
- cy.get('#GAS_control').type(1);
- cy.get('#GAS_compliance').type(1);
- cy.get('#schedule_findings').type(1);
- cy.get('#schedule_prior_findings').type(1);
- cy.get('#CAP_page').type(1);
+ cy.get('[id_test="test-financial_statements"]').type(1);
+ cy.get('[id_test="test-financial_statements_opinion"]').type(1);
+ cy.get('[id_test="test-schedule_expenditures"]').type(1);
+ cy.get('[id_test="test-schedule_expenditures_opinion"]').type(1);
+ cy.get('[id_test="test-uniform_guidance_control"]').type(1);
+ cy.get('[id_test="test-uniform_guidance_compliance"]').type(1);
+ cy.get('[id_test="test-GAS_control"]').type(1);
+ cy.get('[id_test="test-GAS_compliance"]').type(1);
+ cy.get('[id_test="test-schedule_findings"]').type(1);
+ cy.get('[id_test="test-schedule_prior_findings"]').type(1);
+ cy.get('[id_test="test-CAP_page"]').type(1);
cy.get('#upload_report').selectFile('cypress/fixtures/basic.pdf');
cy.get('#continue').click(); // Performs upload and return to main page
}
+
diff --git a/backend/dissemination/management/commands/populate_aln_table.py b/backend/dissemination/management/commands/populate_aln_table.py
deleted file mode 100644
index e69de29bb..000000000
diff --git a/backend/dissemination/templates/search-alert-info.html b/backend/dissemination/templates/search-alert-info.html
index 24fdf3b4b..017daa83a 100644
--- a/backend/dissemination/templates/search-alert-info.html
+++ b/backend/dissemination/templates/search-alert-info.html
@@ -2,7 +2,7 @@
{% load sprite_helper %}
-
Searching the FAC database
+
Searching the FAC database
{% if advanced_search_flag %}
Learn more about how our advanced search flters work on our resources page.
@@ -13,19 +13,19 @@
Searching the FAC database
{% endif %}
-
Summary reports
+
Summary reports
For search results of {{ summary_report_download_limit|intcomma }} submissions or less, you can download a combined spreadsheet of all data.
If you need to download more than {{ summary_report_download_limit|intcomma }} submissions, try limiting your search parameters to download in batches.
{% if advanced_search_flag %}
-
Basic search
+
Basic search
We update advanced search nightly with new submissions. Basic search is always up-to-date. This is best for users wanting to confirm their submissions are complete.
{% else %}
-
Advanced search
+
Advanced search
Audit resolution officials may want to use the advanced search for additional filters.