Merge 514b862 into 87df4c8

src/Button/Button.js

@@ -34,10 +34,12 @@ Button.propTypes = {
     onClick: PropTypes.func
 };
 
-export const ButtonGroup = props => {
-    const { children } = props;
+export const ButtonGroup = ({children, ...props}) => {
     return (
-        <div aria-label='Group label' className='fd-button-group'
+        <div
+            {...props}
+            aria-label='Group label'
+            className='fd-button-group'
             role='group'>
             {children}
         </div>

src/Button/Button.test.js

@@ -93,8 +93,12 @@ describe('<Button />', () => {
             ).toBe('Sample');
         });
 
-        xtest('should allow props to be spread to the ButtonGroup component', () => {
-            // TODO: placeholder for this test description once that functionality is built
+        test('should allow props to be spread to the ButtonGroup component', () => {
+            const element = mount(<ButtonGroup data-sample='Sample' />);
+
+            expect(
+                element.getDOMNode().attributes['data-sample'].value
+            ).toBe('Sample');
         });
     });
 });