fixup streamtube after merge master

Author: etpinard

src/traces/streamtube/index.js

@@ -16,7 +16,10 @@ module.exports = {
 
     attributes: require('./attributes'),
     supplyDefaults: require('./defaults'),
-    colorbar: require('../cone/colorbar'),
+    colorbar: {
+        min: 'cmin',
+        max: 'cmax'
+    },
     calc: require('./calc'),
     plot: require('./convert'),
     eventData: function(out, pt) {

test/image/baselines/gl3d_cone-with-streamtube.png

@@ -198,20 +198,20 @@ describe('@gl Test streamtube interactions', function() {
         }
 
         Plotly.plot(gd, fig).then(function() {
-            _assert('base cone', {objTypes: ['cone', 'cone']});
+            _assert('base cone', {objTypes: ['cone']});
             return Plotly.restyle(gd, 'type', 'streamtube');
         })
         .then(function() {
             _assert('restyled to streamtube', {objTypes: ['streamtube']});
             return Plotly.restyle(gd, 'type', 'cone');
         })
         .then(function() {
-            _assert('back to cone', {objTypes: ['cone', 'cone']});
+            _assert('back to cone', {objTypes: ['cone']});
             return Plotly.addTraces(gd, [trace1]);
         })
         .then(function() {
             _assert('add streamtube on top of cone', {
-                objTypes: ['cone', 'cone', 'streamtube']
+                objTypes: ['cone', 'streamtube']
             });
         })
         .catch(failTest)