Merge branch 'tab-nav' into tabnav-aria

src/TabNav.tsx

@@ -25,10 +25,10 @@ const TabNavBody = styled.nav`
 
 export type TabNavProps = ComponentProps<typeof TabNavBase>
 
-function TabNav({children, ...rest}: TabNavProps) {
+function TabNav({children, "aria-label": ariaLabel, ...rest}: TabNavProps) {
   return (
     <TabNavBase {...rest}>
-      <TabNavBody>{children}</TabNavBody>
+      <TabNavBody aria-label={ariaLabel}>{children}</TabNavBody>
     </TabNavBase>
   )
 }

src/__tests__/TabNav.tsx

@@ -1,6 +1,6 @@
 import React from 'react'
 import {TabNav} from '..'
-import {mount, render, rendersClass, behavesAsComponent, checkExports} from '../utils/testing'
+import {render, behavesAsComponent, checkExports} from '../utils/testing'
 import {COMMON} from '../constants'
 import {render as HTMLRender, cleanup} from '@testing-library/react'
 import {axe, toHaveNoViolations} from 'jest-axe'
@@ -19,13 +19,15 @@ describe('TabNav', () => {
   })
 
   it('should have no axe violations', async () => {
-    const {container} = HTMLRender(<TabNav />)
+    const {container} = HTMLRender(<TabNav aria-label="main" />)
     const results = await axe(container)
     expect(results).toHaveNoViolations()
     cleanup()
   })
 
   it('sets aria-label appropriately', () => {
-    expect(render(<TabNav aria-label="foo" />).props['aria-label']).toEqual('foo')
+    const {getByLabelText} = HTMLRender(<TabNav aria-label="stuff"/>)
+    expect(getByLabelText("stuff")).toBeTruthy();
+    expect(getByLabelText("stuff").tagName).toEqual("NAV")
   })
 })