fixed tests

cerner · Oct 23, 2023 · fb409b2 · fb409b2
1 parent a4d7f99
commit fb409b2
Show file tree

Hide file tree

Showing 7 changed files with 1,491 additions and 13,938 deletions.
diff --git a/packages/terra-data-grid/src/DataGrid.jsx b/packages/terra-data-grid/src/DataGrid.jsx
@@ -649,4 +649,4 @@ const DataGrid = injectIntl((props) => {
 DataGrid.propTypes = propTypes;
 DataGrid.defaultProps = defaultProps;
 
-export default forwardRef((props, ref) => <DataGrid {...props} focusFuncRef={ref} />);
+export default forwardRef((props, ref) => <DataGrid {...props} focusFuncRef={ref} />);
diff --git a/packages/terra-data-grid/src/subcomponents/ColumnResizeHandle.jsx b/packages/terra-data-grid/src/subcomponents/ColumnResizeHandle.jsx
@@ -150,7 +150,7 @@ const ColumnResizeHandle = (props) => {
         setNavigationEnabled(false);
         // Lock focus into component
         resizeHandleRef.current.focus();
-        
+
         // set styles for keyboard
         setResizeHandleStyles(['resize-handle', 'resize-handle-selected']);
 

diff --git a/packages/terra-data-grid/tests/jest/ColumnResizeHandle.test.jsx b/packages/terra-data-grid/tests/jest/ColumnResizeHandle.test.jsx
@@ -41,7 +41,7 @@ describe('ColumnResizeHandle', () => {
     expect(resizeHandle.props()['aria-valuenow']).toBe(null);
     expect(resizeHandle.props()['aria-valuemin']).toBe(null);
     expect(resizeHandle.props()['aria-valuemax']).toBe(null);
-    expect(wrapper.find('.resize-handle').props().role).toBe('divider');
+    expect(wrapper.find('.resize-handle').props().role).toBe(null);
 
     expect(wrapper).toMatchSnapshot();
   });
@@ -152,7 +152,7 @@ describe('ColumnResizeHandle', () => {
 
     expect(wrapper.find('.resize-handle').props()['aria-label']).toBe(null);
     expect(wrapper.find('.resize-handle').props()['aria-valuetext']).toBe(null);
-    expect(wrapper.find('.resize-handle').props().role).toBe('divider');
+    expect(wrapper.find('.resize-handle').props().role).toBe(null);
   });
 
   it('increases column width with right arrow', () => {

diff --git a/packages/terra-data-grid/tests/jest/FlowsheetDataGrid.test.jsx b/packages/terra-data-grid/tests/jest/FlowsheetDataGrid.test.jsx
@@ -55,11 +55,7 @@ describe('FlowsheetDataGrid', () => {
       />,
     );
 
-<<<<<<< HEAD
     const dataGrid = wrapper.find('ForwardRef');
-=======
-    const dataGrid = wrapper.find('#test-terra-flowsheet-data-grid');
->>>>>>> c4b58f1ad (fixed jest tests)
     const pinnedColumns = dataGrid.prop('pinnedColumns');
     expect(pinnedColumns).toEqual(
       [

diff --git a/packages/terra-data-grid/tests/jest/__snapshots__/ColumnHeaderCell.test.jsx.snap b/packages/terra-data-grid/tests/jest/__snapshots__/ColumnHeaderCell.test.jsx.snap
@@ -521,11 +521,7 @@ exports[`ColumnHeaderCell renders a pinned column header cell 1`] = `
             onMouseEnter={[Function]}
             onMouseLeave={[Function]}
             onMouseUp={[Function]}
-<<<<<<< HEAD
-            role="divider"
-=======
             role={null}
->>>>>>> c4b58f1ad (fixed jest tests)
             style={
               Object {
                 "height": "undefinedpx",