Merge branch 'main' into no-skipped-tests

w3c · Nov 8, 2023 · 85ac89a · 85ac89a
2 parents 24620e7 + 662303d
commit 85ac89a
Show file tree

Hide file tree

Showing 8 changed files with 20 additions and 22 deletions.
diff --git a/client/components/App/App.css b/client/components/App/App.css
@@ -61,7 +61,7 @@ a.nav-link {
 .nav-link[aria-current='true']:after {
     background: #0b60ab;
 }
-@media all and (min-width: 992px) {
+@media all and (min-width: 1200px) {
     .navbar-expand-lg .navbar-collapse ul {
         display: flex;
         flex-basis: auto;
@@ -79,7 +79,7 @@ a.nav-link {
         margin: auto;
     }
 }
-@media all and (max-width: 991px) {
+@media all and (max-width: 1199px) {
     .nav-link[aria-current='true']:after,
     .nav-link:hover:after {
         position: absolute;

diff --git a/client/components/App/App.jsx b/client/components/App/App.jsx
@@ -39,7 +39,7 @@ const App = () => {
             <Container fluid>
                 <Navbar
                     bg="light"
-                    expand="lg"
+                    expand="xl"
                     aria-label="Menu"
                     expanded={isNavbarExpanded}
                     onToggle={() => setIsNavbarExpanded(previous => !previous)}
@@ -67,7 +67,7 @@ const App = () => {
                                         '/report'
                                     )}
                                 >
-                                    Test Reports
+                                    AT Interoperability Reports
                                 </Nav.Link>
                             </li>
                             <li>

diff --git a/client/components/Reports/Report.jsx b/client/components/Reports/Report.jsx
@@ -18,8 +18,8 @@ const Report = () => {
     if (error) {
         return (
             <PageStatus
-                title="Test Reports | ARIA-AT"
-                heading="Test Reports"
+                title="AT Interop Reports | ARIA-AT"
+                heading="Assistive Technology Interoperability Reports"
                 message={error.message}
                 isError
             />
@@ -29,8 +29,8 @@ const Report = () => {
     if (loading) {
         return (
             <PageStatus
-                title="Loading - Test Reports | ARIA-AT"
-                heading="Test Reports"
+                title="Loading - AT Interop Reports | ARIA-AT"
+                heading="Assistive Technology Interoperability Reports"
             />
         );
     }

diff --git a/client/components/Reports/Reports.jsx b/client/components/Reports/Reports.jsx
@@ -13,8 +13,8 @@ const Reports = () => {
     if (error) {
         return (
             <PageStatus
-                title="Test Reports | ARIA-AT"
-                heading="Test Reports"
+                title="AT Interop Reports | ARIA-AT"
+                heading="Assistive Technology Interoperability Reports"
                 message={error.message}
                 isError
             />
@@ -24,8 +24,8 @@ const Reports = () => {
     if (loading) {
         return (
             <PageStatus
-                title="Loading - Test Reports | ARIA-AT"
-                heading="Test Reports"
+                title="Loading - AT Interop Reports | ARIA-AT"
+                heading="Assistive Technology Interoperability Reports"
             />
         );
     }

diff --git a/client/components/Reports/SummarizeTestPlanReport.jsx b/client/components/Reports/SummarizeTestPlanReport.jsx
@@ -120,7 +120,7 @@ const SummarizeTestPlanReport = ({ testPlanVersion, testPlanReports }) => {
                 <LinkContainer to="/reports">
                     <Breadcrumb.Item>
                         <FontAwesomeIcon icon={faHome} />
-                        Test Reports
+                        AT Interoperability Reports
                     </Breadcrumb.Item>
                 </LinkContainer>
                 <LinkContainer to={`/report/${testPlanVersion.id}`}>

diff --git a/client/components/Reports/SummarizeTestPlanReports.jsx b/client/components/Reports/SummarizeTestPlanReports.jsx
@@ -37,9 +37,9 @@ const SummarizeTestPlanReports = ({ testPlanVersions }) => {
         return (
             <FullHeightContainer id="main" as="main" tabIndex="-1">
                 <Helmet>
-                    <title>Test Reports | ARIA-AT</title>
+                    <title>AT Interop Reports | ARIA-AT</title>
                 </Helmet>
-                <h1>Test Reports</h1>
+                <h1>Assistive Technology Interoperability Reports</h1>
                 <p>
                     There are no results to show just yet. Please check back
                     soon!
@@ -66,9 +66,9 @@ const SummarizeTestPlanReports = ({ testPlanVersions }) => {
     return (
         <FullHeightContainer id="main" as="main" tabIndex="-1">
             <Helmet>
-                <title>Test Reports | ARIA-AT</title>
+                <title>AT Interop Reports | ARIA-AT</title>
             </Helmet>
-            <h1>Test Reports</h1>
+            <h1>Assistive Technology Interoperability Reports</h1>
             <h2>Introduction</h2>
             <p>
                 This page offers a high-level view of all results which have

diff --git a/client/components/Reports/SummarizeTestPlanVersion.jsx b/client/components/Reports/SummarizeTestPlanVersion.jsx
@@ -36,7 +36,7 @@ const SummarizeTestPlanVersion = ({ testPlanVersion, testPlanReports }) => {
                 <LinkContainer to="/reports">
                     <Breadcrumb.Item>
                         <FontAwesomeIcon icon={faHome} />
-                        Test Reports
+                        AT Interoperability Reports
                     </Breadcrumb.Item>
                 </LinkContainer>
                 <Breadcrumb.Item active>

diff --git a/server/tests/integration/dataManagement.test.js b/server/tests/integration/dataManagement.test.js
@@ -3,14 +3,12 @@ const dbCleaner = require('../util/db-cleaner');
 const { query, mutate } = require('../util/graphql-test-utilities');
 const db = require('../../models');
 
-beforeAll(() => {
-    jest.setTimeout(20000);
-});
+jest.setTimeout(20000);
 
 afterAll(async () => {
     // Closing the DB connection allows Jest to exit successfully.
     await db.sequelize.close();
-});
+}, 20000);
 
 describe('data management', () => {
     const testPlanVersionsQuery = () => {