diff --git a/test/jasmine/assets/domain_ref/components.js b/test/jasmine/assets/domain_ref/components.js index 13c70e58809..22d201b68b7 100644 --- a/test/jasmine/assets/domain_ref/components.js +++ b/test/jasmine/assets/domain_ref/components.js @@ -572,14 +572,9 @@ function describeShapeComboTest(combo) { var xid = axispair[0]; var yid = axispair[1]; return [ - '#', gdId, - 'should create a plot with parameters:', '\n', - 'x-axis type:', xaxisType, '\n', - 'y-axis type:', yaxisType, '\n', - 'axis pair:', xid, yid, '\n', - 'ARO position x:', JSON.stringify(xaroPos), '\n', - 'ARO position y:', JSON.stringify(yaroPos), '\n', - 'shape type:', shapeType, '\n', + 'should plot shape:', shapeType, 'on', gdId, + xaxisType, xid, JSON.stringify(xaroPos), + yaxisType, yid, JSON.stringify(yaroPos), ].join(' '); } @@ -619,21 +614,11 @@ function describeImageComboTest(combo) { var gdId = combo[7]; var xid = axispair[0]; var yid = axispair[1]; - var xref = makeAxRef(xid, aroposx.ref); - var yref = makeAxRef(yid, aroposy.ref); // TODO Add image combo test description return [ - '#', gdId, - 'should create a plot with parameters:', '\n', - 'x-axis type:', axistypex, '\n', - 'y-axis type:', axistypey, '\n', - 'axis pair:', xid, yid, '\n', - 'ARO position x:', JSON.stringify(aroposx), '\n', - 'ARO position y:', JSON.stringify(aroposy), '\n', - 'xanchor:', xanchor, '\n', - 'yanchor:', yanchor, '\n', - 'xref:', xref, '\n', - 'yref:', yref, '\n', + 'should plot image on', gdId, + axistypex, xid, xanchor, JSON.stringify(aroposx), + axistypey, yid, yanchor, JSON.stringify(aroposy), ].join(' '); } @@ -681,19 +666,10 @@ function describeAnnotationComboTest(combo) { var gdId = combo[6]; var xid = axispair[0]; var yid = axispair[1]; - var xref = makeAxRef(xid, aroposx.ref); - var yref = makeAxRef(yid, aroposy.ref); return [ - '#', gdId, - 'should create a plot with parameters:', '\n', - 'x-axis type:', axistypex, '\n', - 'y-axis type:', axistypey, '\n', - 'axis pair:', xid, yid, '\n', - 'ARO position x:', JSON.stringify(aroposx), '\n', - 'ARO position y:', JSON.stringify(aroposy), '\n', - 'arrow axis pair:', arrowaxispair, '\n', - 'xref:', xref, '\n', - 'yref:', yref, '\n', + 'should plot annotation', arrowaxispair, 'on', gdId, + axistypex, xid, JSON.stringify(aroposx), + axistypey, yid, JSON.stringify(aroposy), ].join(' '); }