write promise sequence as promise chains

Author: etpinard

test/jasmine/tests/geo_interact_test.js

@@ -201,11 +201,12 @@ describe('Test geo interactions', function() {
                     expect(countTraces('scattergeo')).toBe(0);
                     expect(countTraces('choropleth')).toBe(1);
 
-                    Plotly.restyle(gd, 'visible', true, [0]).then(function() {
-                        expect(countTraces('scattergeo')).toBe(1);
-                        expect(countTraces('choropleth')).toBe(1);
-                        done();
-                    });
+                    return Plotly.restyle(gd, 'visible', true, [0]);
+                }).then(function() {
+                    expect(countTraces('scattergeo')).toBe(1);
+                    expect(countTraces('choropleth')).toBe(1);
+
+                    done();
                 });
             });
 
@@ -217,11 +218,12 @@ describe('Test geo interactions', function() {
                     expect(countTraces('scattergeo')).toBe(1);
                     expect(countTraces('choropleth')).toBe(0);
 
-                    Plotly.restyle(gd, 'visible', true, [1]).then(function() {
-                        expect(countTraces('scattergeo')).toBe(1);
-                        expect(countTraces('choropleth')).toBe(1);
-                        done();
-                    });
+                    return Plotly.restyle(gd, 'visible', true, [1]);
+                }).then(function() {
+                    expect(countTraces('scattergeo')).toBe(1);
+                    expect(countTraces('choropleth')).toBe(1);
+
+                    done();
                 });
             });
 
@@ -240,20 +242,21 @@ describe('Test geo interactions', function() {
                     expect(countGeos()).toBe(1);
                     expect(countColorBars()).toBe(1);
 
-                    Plotly.deleteTraces(gd, [0]).then(function() {
-                        expect(countTraces('scattergeo')).toBe(0);
-                        expect(countTraces('choropleth')).toBe(0);
-                        expect(countGeos()).toBe(1);
-                        expect(countColorBars()).toBe(0);
-
-                        Plotly.relayout(gd, 'geo', null).then(function() {
-                            expect(countTraces('scattergeo')).toBe(0);
-                            expect(countTraces('choropleth')).toBe(0);
-                            expect(countGeos()).toBe(0);
-                            expect(countColorBars()).toBe(0);
-                            done();
-                        });
-                    });
+                    return Plotly.deleteTraces(gd, [0]);
+                }).then(function() {
+                    expect(countTraces('scattergeo')).toBe(0);
+                    expect(countTraces('choropleth')).toBe(0);
+                    expect(countGeos()).toBe(1);
+                    expect(countColorBars()).toBe(0);
+
+                    return Plotly.relayout(gd, 'geo', null);
+                }).then(function() {
+                    expect(countTraces('scattergeo')).toBe(0);
+                    expect(countTraces('choropleth')).toBe(0);
+                    expect(countGeos()).toBe(0);
+                    expect(countColorBars()).toBe(0);
+
+                    done();
                 });
             });
         });

test/jasmine/tests/plot_interact_test.js

@@ -206,27 +206,28 @@ describe('Test plot structure', function() {
                         assertContourNodes(2);
                         expect(countColorBars()).toEqual(0);
 
-                        Plotly.deleteTraces(gd, [0]).then(function() {
-                            expect(countSubplots()).toEqual(4);
-                            assertHeatmapNodes(2);
-                            assertContourNodes(2);
-                            expect(countColorBars()).toEqual(0);
-
-                            Plotly.deleteTraces(gd, [0]).then(function() {
-                                expect(countSubplots()).toEqual(4);
-                                assertHeatmapNodes(1);
-                                assertContourNodes(1);
-                                expect(countColorBars()).toEqual(0);
-
-                                Plotly.deleteTraces(gd, [0]).then(function() {
-                                    expect(countSubplots()).toEqual(4);
-                                    assertHeatmapNodes(0);
-                                    assertContourNodes(0);
-                                    expect(countColorBars()).toEqual(0);
-                                    done();
-                                });
-                            });
-                        });
+                        return Plotly.deleteTraces(gd, [0]);
+                    }).then(function() {
+                        expect(countSubplots()).toEqual(4);
+                        assertHeatmapNodes(2);
+                        assertContourNodes(2);
+                        expect(countColorBars()).toEqual(0);
+
+                        return Plotly.deleteTraces(gd, [0]);
+                    }).then(function() {
+                        expect(countSubplots()).toEqual(4);
+                        assertHeatmapNodes(1);
+                        assertContourNodes(1);
+                        expect(countColorBars()).toEqual(0);
+
+                        return Plotly.deleteTraces(gd, [0]);
+                    }).then(function() {
+                        expect(countSubplots()).toEqual(4);
+                        assertHeatmapNodes(0);
+                        assertContourNodes(0);
+                        expect(countColorBars()).toEqual(0);
+
+                        done();
                     });
                 });