@@ -9,7 +9,7 @@ var supplyAllDefaults = require('../assets/supply_defaults');
99
1010'use strict' ;
1111
12- module . exports = function checkTextTemplate ( mock , selector , tests ) {
12+ module . exports = function checkTextTemplate ( mock , selector , tests , skipExtra ) {
1313 var isGL = Registry . traceIs ( mock [ 0 ] . type , 'gl' ) ;
1414 var isPolar = Registry . traceIs ( mock [ 0 ] . type , 'polar' ) ;
1515 var isScatterLike = Registry . traceIs ( mock [ 0 ] . type , 'scatter-like' ) ;
@@ -46,35 +46,37 @@ module.exports = function checkTextTemplate(mock, selector, tests) {
4646 } ) ;
4747 }
4848
49- var N = tests [ 0 ] [ 1 ] . length ;
50- var i ;
49+ // Extra tests
50+ if ( ! skipExtra ) {
51+ var N = tests [ 0 ] [ 1 ] . length ;
52+ var i ;
5153
52- // Generate customdata
53- var customdata = [ ] ;
54- for ( i = 0 ; i < N ; i ++ ) {
55- customdata . push ( Lib . randstr ( { } ) ) ;
56- }
57- mock [ 0 ] . customdata = customdata ;
58- tests . push ( [ '%{customdata}' , customdata ] ) ;
54+ // Generate customdata
55+ var customdata = [ ] ;
56+ for ( i = 0 ; i < N ; i ++ ) {
57+ customdata . push ( Lib . randstr ( { } ) ) ;
58+ }
59+ mock [ 0 ] . customdata = customdata ;
60+ tests . push ( [ '%{customdata}' , customdata ] ) ;
5961
60- // Generate meta
61- mock [ 0 ] . meta = { 'colname' : 'A' } ;
62- var metaSolution = [ ] ;
63- for ( i = 0 ; i < N ; i ++ ) {
64- metaSolution . push ( mock [ 0 ] . meta . colname ) ;
65- }
66- tests . push ( [ '%{meta.colname}' , metaSolution ] ) ;
62+ // Generate meta
63+ mock [ 0 ] . meta = { 'colname' : 'A' } ;
64+ var metaSolution = [ ] ;
65+ for ( i = 0 ; i < N ; i ++ ) {
66+ metaSolution . push ( mock [ 0 ] . meta . colname ) ;
67+ }
68+ tests . push ( [ '%{meta.colname}' , metaSolution ] ) ;
6769
68- // Make sure that empty text shows up as an empty string
69- var emptyTextMock = Lib . extendDeep ( [ ] , mock ) ;
70- var emptyTextSolution = [ ] ;
71- emptyTextMock [ 0 ] . text = [ ] ;
72- for ( i = 0 ; i < N ; i ++ ) {
73- emptyTextMock [ 0 ] . text [ i ] = '' ;
74- emptyTextSolution [ i ] = 'text:' ;
70+ // Make sure that empty text shows up as an empty string
71+ var emptyTextMock = Lib . extendDeep ( [ ] , mock ) ;
72+ var emptyTextSolution = [ ] ;
73+ emptyTextMock [ 0 ] . text = [ ] ;
74+ for ( i = 0 ; i < N ; i ++ ) {
75+ emptyTextMock [ 0 ] . text [ i ] = '' ;
76+ emptyTextSolution [ i ] = 'text:' ;
77+ }
78+ tests . push ( [ 'text:%{text}' , emptyTextSolution , emptyTextMock ] ) ;
7579 }
76- tests . push ( [ 'text:%{text}' , emptyTextSolution , emptyTextMock ] ) ;
77-
7880 if ( isGL ) {
7981 tests . forEach ( function ( test ) {
8082 it ( '@gl should support texttemplate' , function ( done ) {
0 commit comments