[formatDate] add tests for concise formatDate

apache · Apr 19, 2018 · ee3cdf9 · ee3cdf9
1 parent b38745f
commit ee3cdf9
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 7 deletions.
diff --git a/superset/assets/spec/javascripts/modules/dates_spec.js b/superset/assets/spec/javascripts/modules/dates_spec.js
@@ -3,6 +3,7 @@ import { expect } from 'chai';
 import {
   tickMultiFormat,
   formatDate,
+  formatDateVerbose,
   fDuration,
   now,
   epochTimeXHoursAgo,
@@ -25,13 +26,35 @@ describe('formatDate', () => {
     expect(formatDate(new Date('2020-01-01'))).to.equal('2020');
   });
 
+  it('shows only month when 1st of month', () => {
+    expect(formatDate(new Date('2020-03-01'))).to.equal('March');
+  });
+
+  it('does not show day of week when it is Sunday', () => {
+    expect(formatDate(new Date('2020-03-15'))).to.equal('Mar 15');
+  });
+
+  it('shows weekday when it is not Sunday (and no ms/sec/min/hr)', () => {
+    expect(formatDate(new Date('2020-03-03'))).to.equal('Tue 03');
+  });
+});
+
+describe('formatDateVerbose', () => {
+  it('is a function', () => {
+    assert.isFunction(formatDateVerbose);
+  });
+
+  it('shows only year when 1st day of the year', () => {
+    expect(formatDateVerbose(new Date('2020-01-01'))).to.equal('2020');
+  });
+
   it('shows month and year when 1st of month', () => {
-    expect(formatDate(new Date('2020-03-01'))).to.equal('Mar 2020');
+    expect(formatDateVerbose(new Date('2020-03-01'))).to.equal('Mar 2020');
   });
 
   it('shows weekday when any day of the month', () => {
-    expect(formatDate(new Date('2020-03-03'))).to.equal('Tue Mar 3');
-    expect(formatDate(new Date('2020-03-15'))).to.equal('Sun Mar 15');
+    expect(formatDateVerbose(new Date('2020-03-03'))).to.equal('Tue Mar 3');
+    expect(formatDateVerbose(new Date('2020-03-15'))).to.equal('Sun Mar 15');
   });
 });
 

diff --git a/superset/assets/spec/javascripts/modules/utils_spec.jsx b/superset/assets/spec/javascripts/modules/utils_spec.jsx
@@ -1,8 +1,13 @@
 import { it, describe } from 'mocha';
 import { expect } from 'chai';
 import {
-  tryNumify, slugify, formatSelectOptionsForRange, d3format,
-  d3FormatPreset, d3TimeFormatPreset, defaultNumberFormatter,
+  tryNumify,
+  slugify,
+  formatSelectOptionsForRange,
+  d3format,
+  d3FormatPreset,
+  d3TimeFormatPreset,
+  defaultNumberFormatter,
   mainMetric,
 } from '../../../src/modules/utils';
 
@@ -53,12 +58,13 @@ describe('utils', () => {
       expect(d3FormatPreset('smart_date')(0)).to.equal('1970');
     });
   });
-  describe('d3TimeFormatPreset', () => {
+  describe('defaultNumberFormatter', () => {
     expect(defaultNumberFormatter(10)).to.equal('10');
     expect(defaultNumberFormatter(1)).to.equal('1');
     expect(defaultNumberFormatter(1.0)).to.equal('1');
     expect(defaultNumberFormatter(10.0)).to.equal('10');
     expect(defaultNumberFormatter(10001)).to.equal('10.0k');
+    expect(defaultNumberFormatter(10100)).to.equal('10.1k');
     expect(defaultNumberFormatter(111000000)).to.equal('111M');
     expect(defaultNumberFormatter(0.23)).to.equal('230m');
 
@@ -67,6 +73,7 @@ describe('utils', () => {
     expect(defaultNumberFormatter(-1.0)).to.equal('-1');
     expect(defaultNumberFormatter(-10.0)).to.equal('-10');
     expect(defaultNumberFormatter(-10001)).to.equal('-10.0k');
+    expect(defaultNumberFormatter(-10101)).to.equal('-10.1k');
     expect(defaultNumberFormatter(-111000000)).to.equal('-111M');
     expect(defaultNumberFormatter(-0.23)).to.equal('-230m');
   });

diff --git a/superset/assets/src/modules/utils.js b/superset/assets/src/modules/utils.js
@@ -4,7 +4,7 @@ import $ from 'jquery';
 
 import { formatDate, UTC } from './dates';
 
-const siFormatter = d3.format('.1s');
+const siFormatter = d3.format('.3s');
 
 export function defaultNumberFormatter(n) {
   let si = siFormatter(n);