Handle Merge Conflicts

Author: gregpalace

__tests__/app/App.test.tsx

@@ -1,10 +1,15 @@
 import React from 'react';
+<<<<<<< HEAD
 import ReactDOM from 'react-dom';
 import { shallow } from 'enzyme';
+=======
+import { shallow, mount } from 'enzyme';
+>>>>>>> master
 import App from '../../app/App';
 
 describe('<App />', () => {
   let wrapper: any;
+
   beforeAll(() => {
     wrapper = shallow(<App />);
   });
@@ -16,6 +21,12 @@ describe('<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);
   });
 });

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;