Merge "Fix failed tests"

diff --git a/test/utils/DateTimeChartUtil.test.js b/test/utils/DateTimeChartUtil.test.js
index 3f7be00..4f2b181 100644 (file)
--- a/test/utils/DateTimeChartUtil.test.js
+++ b/test/utils/DateTimeChartUtil.test.js
@@ -37,7 +37,7 @@ describe('DateTimeChartUtil Tests', () => {
 
   it('getTicks', () => {
     const timestamps = [
-      {timestamp: 1521691200000, date: 'Thu, 22 Mar 2018 04:00:00 GMT'},
+      {timestamp: 1521604800000, date: 'Thu, 21 Mar 2018 04:00:00 GMT'},
       {timestamp: 1521777600000, date: 'Thu, 23 Mar 2018 04:00:00 GMT'},
       {timestamp: 1521950400000, date: 'Thu, 25 Mar 2018 04:00:00 GMT'},
       {timestamp: 1522296000000, date: 'Thu, 29 Mar 2018 04:00:00 GMT'}
@@ -55,7 +55,7 @@ describe('DateTimeChartUtil Tests', () => {
 
   it('getTicksData', () => {
     const timestamps = [
-      {timestamp: 1521691200000, date: 'Thu, 22 Mar 2018 04:00:00 GMT'},
+      {timestamp: 1521604800000, date: 'Thu, 21 Mar 2018 04:00:00 GMT'},
       {timestamp: 1521777600000, date: 'Thu, 23 Mar 2018 04:00:00 GMT'},
       {timestamp: 1521950400000, date: 'Thu, 25 Mar 2018 04:00:00 GMT'},
       {timestamp: 1522296000000, date: 'Thu, 29 Mar 2018 04:00:00 GMT'}
@@ -64,9 +64,9 @@ describe('DateTimeChartUtil Tests', () => {
     let mergedData = getTicksData(timestamps, ticksPerDay, 'timestamp');
     // expect original 4 objects plus 4 additional objects for the missing days
     // (4 additional objects will only have timestamp attribute, no date attribute)
-    expect(mergedData.length).toBe(8);
-    expect(mergedData[0]['timestamp']).toBe(1521691200000);
-    expect(mergedData[0]['date']).toBe('Thu, 22 Mar 2018 04:00:00 GMT');
+    expect(mergedData.length).toBe(12);
+    expect(mergedData[0]['timestamp']).toBe(1521604800000);
+    expect(mergedData[0]['date']).toBe('Thu, 21 Mar 2018 04:00:00 GMT');
     expect(mergedData[1]['timestamp']).toBe(1521777600000);
     expect(mergedData[1]['date']).toBe('Thu, 23 Mar 2018 04:00:00 GMT');
     expect(mergedData[2]['timestamp']).toBe(1521950400000);

diff --git a/test/utils/SpinnerContainer.test.js b/test/utils/SpinnerContainer.test.js
index 088ad2a..90c7cf5 100644 (file)
--- a/test/utils/SpinnerContainer.test.js
+++ b/test/utils/SpinnerContainer.test.js
@@ -9,8 +9,8 @@ describe('SpinnerContainer', () => {
   it('render spinner - visible', () => {
     const spinner = mount(
       <SpinnerContainer loading={true}>
-        <div class='test-div'>Testing Spinner Child</div>
-        <div class='test-div'>Testing Spinner Child</div>
+        <div className='test-div'>Testing Spinner Child</div>
+        <div className='test-div'>Testing Spinner Child</div>
       </SpinnerContainer>
     );
     expect(spinner.props().loading).toEqual(true); // check that the props match
@@ -24,7 +24,7 @@ describe('SpinnerContainer', () => {
   it('render spinner - not visible', () => {
     const spinner = mount(
       <SpinnerContainer loading={false}>
-        <div class='test-div'>Testing Spinner</div>
+        <div className='test-div'>Testing Spinner</div>
       </SpinnerContainer>
     );
     expect(spinner.props().loading).toEqual(false);