Skip to content

Commit 13ef2bc

Browse files
archmojarchmoj
committed
Merge remote-tracking branch 'origin/master' into drop-failTest
to resolve conflicts in test/jasmine/tests/bar_test.js test/jasmine/tests/contourgl_test.js test/jasmine/tests/funnel_test.js test/jasmine/tests/pointcloud_test.js test/jasmine/tests/sankey_test.js test/jasmine/tests/shapes_test.js test/jasmine/tests/waterfall_test.js
2 parents 0a22d26 + 444be40 commit 13ef2bc

File tree

93 files changed

+1215
-1239
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

93 files changed

+1215
-1239
lines changed

‎test/jasmine/assets/domain_ref/components.js‎

Lines changed: 9 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -572,14 +572,9 @@ function describeShapeComboTest(combo) {
572572
var xid = axispair[0];
573573
var yid = axispair[1];
574574
return [
575-
'#', gdId,
576-
'should create a plot with parameters:', '\n',
577-
'x-axis type:', xaxisType, '\n',
578-
'y-axis type:', yaxisType, '\n',
579-
'axis pair:', xid, yid, '\n',
580-
'ARO position x:', JSON.stringify(xaroPos), '\n',
581-
'ARO position y:', JSON.stringify(yaroPos), '\n',
582-
'shape type:', shapeType, '\n',
575+
'should plot shape:', shapeType, 'on', gdId,
576+
xaxisType, xid, JSON.stringify(xaroPos),
577+
yaxisType, yid, JSON.stringify(yaroPos),
583578
].join(' ');
584579
}
585580

@@ -619,21 +614,11 @@ function describeImageComboTest(combo) {
619614
var gdId = combo[7];
620615
var xid = axispair[0];
621616
var yid = axispair[1];
622-
var xref = makeAxRef(xid, aroposx.ref);
623-
var yref = makeAxRef(yid, aroposy.ref);
624617
// TODO Add image combo test description
625618
return [
626-
'#', gdId,
627-
'should create a plot with parameters:', '\n',
628-
'x-axis type:', axistypex, '\n',
629-
'y-axis type:', axistypey, '\n',
630-
'axis pair:', xid, yid, '\n',
631-
'ARO position x:', JSON.stringify(aroposx), '\n',
632-
'ARO position y:', JSON.stringify(aroposy), '\n',
633-
'xanchor:', xanchor, '\n',
634-
'yanchor:', yanchor, '\n',
635-
'xref:', xref, '\n',
636-
'yref:', yref, '\n',
619+
'should plot image on', gdId,
620+
axistypex, xid, xanchor, JSON.stringify(aroposx),
621+
axistypey, yid, yanchor, JSON.stringify(aroposy),
637622
].join(' ');
638623
}
639624

@@ -681,19 +666,10 @@ function describeAnnotationComboTest(combo) {
681666
var gdId = combo[6];
682667
var xid = axispair[0];
683668
var yid = axispair[1];
684-
var xref = makeAxRef(xid, aroposx.ref);
685-
var yref = makeAxRef(yid, aroposy.ref);
686669
return [
687-
'#', gdId,
688-
'should create a plot with parameters:', '\n',
689-
'x-axis type:', axistypex, '\n',
690-
'y-axis type:', axistypey, '\n',
691-
'axis pair:', xid, yid, '\n',
692-
'ARO position x:', JSON.stringify(aroposx), '\n',
693-
'ARO position y:', JSON.stringify(aroposy), '\n',
694-
'arrow axis pair:', arrowaxispair, '\n',
695-
'xref:', xref, '\n',
696-
'yref:', yref, '\n',
670+
'should plot annotation', arrowaxispair, 'on', gdId,
671+
axistypex, xid, JSON.stringify(aroposx),
672+
axistypey, yid, JSON.stringify(aroposy),
697673
].join(' ');
698674
}
699675

‎test/jasmine/tests/animate_test.js‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ describe('Test animate API', function() {
104104
return Promise.resolve().then(delay(arguments[5].duration));
105105
});
106106

107-
Plotly.plot(gd, mockCopy.data, mockCopy.layout).then(function() {
107+
Plotly.newPlot(gd, mockCopy.data, mockCopy.layout).then(function() {
108108
return Plotly.addFrames(gd, mockCopy.frames);
109109
}).then(done);
110110
});
@@ -598,7 +598,7 @@ describe('Animate API details', function() {
598598
beforeEach(function(done) {
599599
gd = createGraphDiv();
600600
mockCopy = Lib.extendDeep({}, mock);
601-
Plotly.plot(gd, mockCopy.data, mockCopy.layout).then(done);
601+
Plotly.newPlot(gd, mockCopy.data, mockCopy.layout).then(done);
602602
});
603603

604604
afterEach(function() {
@@ -720,7 +720,7 @@ describe('Animating multiple axes', function() {
720720
});
721721

722722
it('updates ranges of secondary axes', function(done) {
723-
Plotly.plot(gd, [
723+
Plotly.newPlot(gd, [
724724
{y: [1, 2, 3]},
725725
{y: [1, 2, 3], yaxis: 'y2'}
726726
], {
@@ -750,7 +750,7 @@ describe('Animating multiple axes', function() {
750750
});
751751

752752
it('updates ranges of secondary axes (date + category case)', function(done) {
753-
Plotly.plot(gd, [
753+
Plotly.newPlot(gd, [
754754
{x: ['2018-01-01', '2019-01-01', '2020-01-01'], y: [1, 2, 3]},
755755
{x: ['a', 'b', 'c'], y: [1, 2, 3], xaxis: 'x2', yaxis: 'y2'}
756756
], {
@@ -816,7 +816,7 @@ describe('Animating multiple axes', function() {
816816
};
817817
}
818818

819-
Plotly.plot(gd, [{
819+
Plotly.newPlot(gd, [{
820820
x: [0.1, 0.2, 0.3],
821821
y: [0.4, 0.5, 0.6],
822822
}, {
@@ -879,7 +879,7 @@ describe('non-animatable fallback', function() {
879879
});
880880

881881
it('falls back to a simple update for bar graphs', function(done) {
882-
Plotly.plot(gd, [{
882+
Plotly.newPlot(gd, [{
883883
x: [1, 2, 3],
884884
y: [4, 5, 6],
885885
type: 'bar'
@@ -910,7 +910,7 @@ describe('animating scatter traces', function() {
910910

911911
it('animates trace opacity', function(done) {
912912
var trace;
913-
Plotly.plot(gd, [{
913+
Plotly.newPlot(gd, [{
914914
x: [1, 2, 3],
915915
y: [4, 5, 6],
916916
opacity: 1
@@ -928,7 +928,7 @@ describe('animating scatter traces', function() {
928928
});
929929

930930
it('computes calcdata correctly when transforms are present', function(done) {
931-
Plotly.plot(gd, {
931+
Plotly.newPlot(gd, {
932932
data: [{
933933
x: [1, 2, 3],
934934
y: [1, 2, 3],
@@ -968,7 +968,7 @@ describe('animating scatter traces', function() {
968968
.map(Number);
969969
}
970970

971-
Plotly.plot(gd, [{
971+
Plotly.newPlot(gd, [{
972972
y: [1, 2, 1]
973973
}, {
974974
type: 'bar',

‎test/jasmine/tests/annotations_test.js‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ describe('annotations relayout', function() {
187187
expect(typeof MathJax).toBe('undefined');
188188
mockLayout.annotations[14].text = '$x+y+z$';
189189

190-
Plotly.plot(gd, mockData, mockLayout)
190+
Plotly.newPlot(gd, mockData, mockLayout)
191191
.then(function() {
192192
spyOn(Loggers, 'warn');
193193

@@ -506,7 +506,7 @@ describe('annotations log/linear axis changes', function() {
506506
var mockData = Lib.extendDeep([], mock.data);
507507
var mockLayout = Lib.extendDeep({}, mock.layout);
508508

509-
Plotly.plot(gd, mockData, mockLayout).then(done);
509+
Plotly.newPlot(gd, mockData, mockLayout).then(done);
510510
});
511511

512512
afterEach(destroyGraphDiv);
@@ -659,7 +659,7 @@ describe('annotations autorange', function() {
659659
}
660660

661661
it('should adapt to relayout calls', function(done) {
662-
Plotly.plot(gd, mock).then(function() {
662+
Plotly.newPlot(gd, mock).then(function() {
663663
assertRanges(
664664
[0.91, 2.09], [0.91, 2.09],
665665
['2000-11-13', '2001-04-21'], [-0.069, 3.917],
@@ -747,7 +747,7 @@ describe('annotations autorange', function() {
747747
});
748748

749749
it('catches bad xref/yref', function(done) {
750-
Plotly.plot(gd, mock).then(function() {
750+
Plotly.newPlot(gd, mock).then(function() {
751751
return Plotly.relayout(gd, {'annotations[1]': {
752752
text: 'LT',
753753
x: -1,
@@ -777,7 +777,7 @@ describe('annotations autorange', function() {
777777
expect(fullLayout.yaxis.range).toBeCloseToArray(yrng, 1, msg + ' yrng');
778778
}
779779

780-
Plotly.plot(gd, [{y: [1, 2]}], {
780+
Plotly.newPlot(gd, [{y: [1, 2]}], {
781781
xaxis: {range: [0, 2]},
782782
yaxis: {range: [0, 2]},
783783
annotations: [{
@@ -807,7 +807,7 @@ describe('annotations autorange', function() {
807807
});
808808

809809
it('should not error out on subplots w/o visible traces', function(done) {
810-
Plotly.plot(gd, [{}], {
810+
Plotly.newPlot(gd, [{}], {
811811
annotations: [{
812812
x: 0.1,
813813
y: 0.1,
@@ -919,7 +919,7 @@ describe('annotation clicktoshow', function() {
919919

920920
it('should select only clicktoshow annotations matching x, y, and axes of any point', function(done) {
921921
// first try to select without adding clicktoshow, both visible and invisible
922-
Plotly.plot(gd, data, layout())
922+
Plotly.newPlot(gd, data, layout())
923923
// clicktoshow is off initially, so it doesn't *expect* clicking will
924924
// do anything, and it doesn't *actually* do anything.
925925
.then(clickAndCheck({newPts: [[1, 2]], newCTS: false, on: allIndices, step: 1}))
@@ -955,7 +955,7 @@ describe('annotation clicktoshow', function() {
955955
});
956956

957957
it('works on date and log axes', function(done) {
958-
Plotly.plot(gd, [{
958+
Plotly.newPlot(gd, [{
959959
x: ['2016-01-01', '2016-01-02', '2016-01-03'],
960960
y: [1, 1, 3]
961961
}], {
@@ -978,7 +978,7 @@ describe('annotation clicktoshow', function() {
978978
});
979979

980980
it('works on category axes', function(done) {
981-
Plotly.plot(gd, [{
981+
Plotly.newPlot(gd, [{
982982
x: ['a', 'b', 'c'],
983983
y: [1, 2, 3]
984984
}], {
@@ -1024,7 +1024,7 @@ describe('annotation effects', function() {
10241024
// we've already tested autorange with relayout, so fix the geometry
10251025
// completely so we know exactly what we're dealing with
10261026
// plot area is 300x300, and covers data range 100x100
1027-
return Plotly.plot(gd,
1027+
return Plotly.newPlot(gd,
10281028
[{x: [0, 100], y: [0, 100], mode: 'markers'}],
10291029
{
10301030
xaxis: {range: [0, 100]},
@@ -1608,7 +1608,7 @@ describe('annotation effects', function() {
16081608
};
16091609
}
16101610

1611-
Plotly.plot(gd, [{
1611+
Plotly.newPlot(gd, [{
16121612
x: [0, 1, 2, 3, 4, 5, 6, 7, 8],
16131613
y: [0, 4, 5, 1, 2, 2, 3, 4, 2],
16141614
}], {
@@ -1691,7 +1691,7 @@ describe('animating annotations', function() {
16911691
});
16921692
}
16931693

1694-
Plotly.plot(gd,
1694+
Plotly.newPlot(gd,
16951695
[{y: [1, 2, 3]}],
16961696
{
16971697
annotations: [{text: 'hello'}],

0 commit comments

Comments
 (0)