Skip to content

Commit ea32334

Browse files
authored
Merge pull request #1607 from w3c/development
Create October 30, Release (2) Includes the following changes: * #1602 * #1604, which addresses #1578
2 parents 5dbfd44 + 48066d3 commit ea32334

25 files changed

+395
-41
lines changed

client/components/App/App.jsx

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@ const App = () => {
4646
<Navbar.Brand
4747
className="logo"
4848
as={Link}
49-
to="/"
50-
aria-current={location.pathname === '/'}
49+
to="/reports"
50+
aria-current={location.pathname === '/reports'}
5151
>
5252
ARIA-AT
5353
</Navbar.Brand>
@@ -58,6 +58,15 @@ const App = () => {
5858
className="justify-content-end"
5959
>
6060
<Nav>
61+
<li>
62+
<Nav.Link
63+
as={Link}
64+
to="/about"
65+
aria-current={location.pathname.startsWith('/about')}
66+
>
67+
About
68+
</Nav.Link>
69+
</li>
6170
<li>
6271
<Nav.Link
6372
as={Link}

client/components/Home/Home.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ const Home = () => {
1919
className={clsx(styles.homePage, styles.container)}
2020
>
2121
<Helmet>
22-
<title>Home | ARIA-AT</title>
22+
<title>About | ARIA-AT</title>
2323
</Helmet>
2424
<KeyMetricsBanner />
2525
<section className={styles.heroSection}>

client/components/Reports/SummarizeTestPlanReports.jsx

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -69,12 +69,6 @@ const SummarizeTestPlanReports = ({
6969
<KeyMetricsBanner />
7070
<section className={styles.contentSection}>
7171
<h1>Assistive Technology Interoperability Reports</h1>
72-
<h2>Introduction</h2>
73-
<p>
74-
This page offers a high-level view of all results which have been
75-
collected, reviewed and published by the ARIA-AT project. Follow a
76-
link in the table below to view detailed results.
77-
</p>
7872

7973
<Tabs
8074
tabs={[
@@ -84,9 +78,9 @@ const SummarizeTestPlanReports = ({
8478
<>
8579
<h2>Test Plan Support Levels</h2>
8680
<p id="support-levels-table-description">
87-
The percentage of assertions which passed when each Test
88-
Plan was executed by a given Assistive Technology and
89-
Browser.
81+
The percentage of 'Must' + 'Should' assertions that are
82+
passing for a given combination of assistive technology and
83+
browser.
9084
</p>
9185
<Table
9286
bordered

client/routes/index.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@ import TestQueueConflicts from '../components/TestQueue/Conflicts';
1919

2020
export default () => (
2121
<Routes>
22-
<Route index path="/" exact element={<Home />} />
22+
<Route path="/" element={<Navigate to="/reports" replace />} />
23+
<Route exact path="/about" element={<Home />} />
2324
<Route exact path="/signup-instructions" element={<SignupInstructions />} />
2425
<Route
2526
exact

client/tests/e2e/Reports.e2e.test.js

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,6 @@ describe('Reports page', () => {
1010
'h1 ::-p-text(Assistive Technology Interoperability Reports)'
1111
);
1212

13-
await page.waitForSelector('h2 ::-p-text(Introduction)');
14-
1513
// Check that tabs exist
1614
await page.waitForSelector('button ::-p-text(Test Plans)');
1715
await page.waitForSelector('button ::-p-text(ARIA Features)');

client/tests/e2e/smokeTest.e2e.test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ describe('smoke test', () => {
5555

5656
it('loads various pages without crashing', async () => {
5757
await Promise.all([
58-
getPage({ role: false, url: '/' }, async page => {
58+
getPage({ role: false, url: '/about' }, async page => {
5959
await page.waitForSelector('h1');
6060
const h1Text = await text(page, 'h1');
6161
expect(h1Text).toBe(

client/tests/e2e/snapshots/saved/_404.html

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@
1414
<nav
1515
aria-label="Menu"
1616
class="navbar navbar-expand-xl navbar-light bg-light">
17-
<a aria-current="false" class="logo navbar-brand" href="/">ARIA-AT</a
17+
<a aria-current="false" class="logo navbar-brand" href="/reports"
18+
>ARIA-AT</a
1819
><a class="skip-link" href="#main">Skip to main content</a
1920
><button
2021
aria-controls="basic-navbar-nav"
@@ -27,6 +28,9 @@
2728
class="justify-content-end navbar-collapse collapse"
2829
id="basic-navbar-nav">
2930
<div class="navbar-nav">
31+
<li>
32+
<a aria-current="false" class="nav-link" href="/about">About</a>
33+
</li>
3034
<li>
3135
<a aria-current="false" class="nav-link" href="/reports"
3236
>AT Interoperability Reports</a

0 commit comments

Comments
 (0)