Skip to content

Commit 8d8e936

Browse files
committed
fix some tests for chinese, and robustify dateTime2ms
1 parent bbb76a4 commit 8d8e936

File tree

3 files changed

+5
-4
lines changed

3 files changed

+5
-4
lines changed

src/lib/dates.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,7 @@ exports.dateTime2ms = function(s, calendar) {
157157
calendar = '';
158158
}
159159

160-
var isChinese = calendar && calendar.substr(0, 7) === 'chinese';
160+
var isChinese = isWorld && calendar.substr(0, 7) === 'chinese';
161161

162162
var match = s.match(isChinese ? DATETIME_REGEXP_CN : DATETIME_REGEXP);
163163
if(!match) return BADNUM;

test/jasmine/tests/annotations_test.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -237,7 +237,8 @@ describe('annotations autosize', function() {
237237

238238
expect(fullLayout.xaxis.range).toBeCloseToArray(x, PREC, '- xaxis');
239239
expect(fullLayout.yaxis.range).toBeCloseToArray(y, PREC, '- yaxis');
240-
expect(dateAx.range.map(dateAx.r2l)).toBeCloseToArray(x2.map(dateAx.r2l), PRECX2, 'xaxis2 ' + dateAx.range);
240+
expect(Lib.simpleMap(dateAx.range, dateAx.r2l))
241+
.toBeCloseToArray(Lib.simpleMap(x2, dateAx.r2l), PRECX2, 'xaxis2 ' + dateAx.range);
241242
expect(fullLayout.yaxis2.range).toBeCloseToArray(y2, PRECY2, 'yaxis2');
242243
expect(fullLayout.xaxis3.range).toBeCloseToArray(x3, PREC, 'xaxis3');
243244
expect(fullLayout.yaxis3.range).toBeCloseToArray(y3, PREC, 'yaxis3');

test/jasmine/tests/finance_test.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -688,10 +688,10 @@ describe('finance charts calc transforms:', function() {
688688

689689
var out = _calc([trace0, trace1]);
690690

691-
var x0 = out[0].x.map(Lib.dateTime2ms);
691+
var x0 = Lib.simpleMap(out[0].x, Lib.dateTime2ms);
692692
expect(x0[x0.length - 2] - x0[0]).toEqual(1);
693693

694-
var x2 = out[2].x.map(Lib.dateTime2ms);
694+
var x2 = Lib.simpleMap(out[2].x, Lib.dateTime2ms);
695695
expect(x2[x2.length - 2] - x2[0]).toEqual(1);
696696

697697
expect(out[1].x).toEqual([]);

0 commit comments

Comments
 (0)