merge conflict correction

Author: rtbuckner

__tests__/app/App.test.tsx

@@ -1,15 +1,19 @@
-
 import React from 'react';
-import { shallow } from 'enzyme';
+import { shallow, mount } from 'enzyme';
 import App from '../../app/App';
 describe('<App />', () => {
   let wrapper: any;
+
   beforeAll(() => {
     wrapper = shallow(<App />);
   });
-
   it('should render <Splash /> on the first visit', () => {
-    expect(wrapper).toMatchSnapshot()
+    expect(wrapper).toBeDefined();
+  });
+  it('should render <DashboardContainer /> if not on the first visit', () => {
+    jest.useFakeTimers();
+    wrapper = mount(<App />);
+    jest.runAllTimers;
+    expect(setTimeout).toHaveBeenCalledTimes(2);
   });
-  // xit('should render <DashboardContainer /> if not on the first visit');
-});
+});

app/charts/latency-chart.tsx app/charts/LatencyChart.tsxapp/charts/latency-chart.tsx renamed to app/charts/LatencyChart.tsx

@@ -13,7 +13,7 @@ interface IObj {
   time: string;
 }
 
-const ResponseCodeChart: React.FC = () => {
+const ResponseCodesChart: React.FC = () => {
   const { commsData } = useContext(CommsContext);
 
   const createChart = () => {
@@ -93,4 +93,4 @@ const ResponseCodeChart: React.FC = () => {
   return <div className="responseCodeChart">{createChart()}</div>;
 };
 
-export default ResponseCodeChart;
+export default ResponseCodesChart;