fix(AbstractNav): Re-add role attribute to abstract nav (#4331)

* Update tests to match host component rather than React component * Pass the role along to the Component
react-bootstrap · Aug 24, 2019 · 6c2dd84 · 6c2dd84
1 parent f5db00a
commit 6c2dd84
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 5 deletions.
diff --git a/src/AbstractNav.js b/src/AbstractNav.js
@@ -126,7 +126,12 @@ const AbstractNav = React.forwardRef(
             getControllerId: getControllerId || noop,
           }}
         >
-          <Component {...props} onKeyDown={handleKeyDown} ref={mergedRef} />
+          <Component
+            {...props}
+            onKeyDown={handleKeyDown}
+            ref={mergedRef}
+            role={role}
+          />
         </NavContext.Provider>
       </SelectableContext.Provider>
     );

diff --git a/test/NavSpec.js b/test/NavSpec.js
@@ -217,7 +217,7 @@ describe('<Nav>', () => {
         </Nav>,
       );
 
-      wrapper.assertSingle('.nav[role="tablist"]');
+      wrapper.assertSingle('div.nav[role="tablist"]');
       wrapper.find('a[role="tab"]').length.should.equal(2);
     });
   });

diff --git a/test/TabContainerSpec.js b/test/TabContainerSpec.js
@@ -86,8 +86,7 @@ describe('<TabContainer>', () => {
         </div>
       </TabContainer>,
     );
-
-    instance.assertSingle('.nav[role="tablist"]');
+    instance.assertSingle('div.nav[role="tablist"]');
 
     instance
       .find('NavLink a')
@@ -112,7 +111,7 @@ describe('<TabContainer>', () => {
       </TabContainer>,
     );
 
-    instance.assertSingle('.nav[role="navigation"]');
+    instance.assertSingle('div.nav[role="navigation"]');
 
     // make sure its not passed to the Nav.Link
     expect(
-Original file line number
+Diff line change
@@ Expand Up / @@ -217,7 +217,7 @@ describe('<Nav>', () => { @@
             </Nav>,
           );
-          wrapper.assertSingle('.nav[role="tablist"]');
+          wrapper.assertSingle('div.nav[role="tablist"]');
           wrapper.find('a[role="tab"]').length.should.equal(2);
         });
       });
@@ Expand Down @@