keithrob
diff --git a/‎test/jasmine/tests/gl3daxes_test.js
Copy file name to clipboardExpand all lines: test/jasmine/tests/gl3daxes_test.js
-110Lines changed: 0 additions & 110 deletions b/‎test/jasmine/tests/gl3daxes_test.js
Copy file name to clipboardExpand all lines: test/jasmine/tests/gl3daxes_test.js
-110Lines changed: 0 additions & 110 deletions
diff --git a/‎test/jasmine/tests/gl3dlayout_test.js
Copy file name to clipboardExpand all lines: test/jasmine/tests/gl3dlayout_test.js
+109Lines changed: 109 additions & 0 deletions b/‎test/jasmine/tests/gl3dlayout_test.js
Copy file name to clipboardExpand all lines: test/jasmine/tests/gl3dlayout_test.js
+109Lines changed: 109 additions & 0 deletions
@@ -8,6 +8,115 @@ var createGraphDiv = require('../assets/create_graph_div');
 var destroyGraphDiv = require('../assets/destroy_graph_div');
 var failTest = require('../assets/fail_test');
 
+describe('Test gl3d axes defaults', function() {
+    'use strict';
+
+    var supplyLayoutDefaults = require('@src/plots/gl3d/layout/axis_defaults');
+
+    describe('supplyLayoutDefaults supplies defaults', function() {
+        var layoutIn,
+            layoutOut;
+
+        var options = {
+            font: 'Open Sans',
+            scene: {id: 'scene'},
+            data: [{x: [], y: []}],
+            bgColor: '#fff',
+            fullLayout: {_dfltTitle: {x: 'xxx', y: 'yyy', colorbar: 'cbbb'}}
+        };
+
+        beforeEach(function() {
+            layoutOut = {};
+        });
+
+        it('should define specific default set with empty initial layout', function() {
+            layoutIn = {};
+
+            var expected = {
+                'xaxis': {
+                    'showline': false,
+                    'showgrid': true,
+                    'gridcolor': 'rgb(204, 204, 204)',
+                    'gridwidth': 1,
+                    'showspikes': true,
+                    'spikesides': true,
+                    'spikethickness': 2,
+                    'spikecolor': '#444',
+                    'showbackground': false,
+                    'showaxeslabels': true
+                },
+                'yaxis': {
+                    'showline': false,
+                    'showgrid': true,
+                    'gridcolor': 'rgb(204, 204, 204)',
+                    'gridwidth': 1,
+                    'showspikes': true,
+                    'spikesides': true,
+                    'spikethickness': 2,
+                    'spikecolor': '#444',
+                    'showbackground': false,
+                    'showaxeslabels': true
+                },
+                'zaxis': {
+                    'showline': false,
+                    'showgrid': true,
+                    'gridcolor': 'rgb(204, 204, 204)',
+                    'gridwidth': 1,
+                    'showspikes': true,
+                    'spikesides': true,
+                    'spikethickness': 2,
+                    'spikecolor': '#444',
+                    'showbackground': false,
+                    'showaxeslabels': true
+                }
+            };
+
+            function checkKeys(validObject, testObject) {
+                var keys = Object.keys(validObject);
+                for(var i = 0; i < keys.length; i++) {
+                    var k = keys[i];
+                    expect(validObject[k]).toBe(testObject[k]);
+                }
+                return true;
+            }
+
+            supplyLayoutDefaults(layoutIn, layoutOut, options);
+            ['xaxis', 'yaxis', 'zaxis'].forEach(function(axis) {
+                checkKeys(expected[axis], layoutOut[axis]);
+            });
+        });
+
+        it('should inherit layout.calendar', function() {
+            layoutIn = {
+                xaxis: {type: 'date'},
+                yaxis: {type: 'date'},
+                zaxis: {type: 'date'}
+            };
+            options.calendar = 'taiwan';
+
+            supplyLayoutDefaults(layoutIn, layoutOut, options);
+
+            expect(layoutOut.xaxis.calendar).toBe('taiwan');
+            expect(layoutOut.yaxis.calendar).toBe('taiwan');
+            expect(layoutOut.zaxis.calendar).toBe('taiwan');
+        });
+
+        it('should accept its own calendar', function() {
+            layoutIn = {
+                xaxis: {type: 'date', calendar: 'hebrew'},
+                yaxis: {type: 'date', calendar: 'ummalqura'},
+                zaxis: {type: 'date', calendar: 'discworld'}
+            };
+            options.calendar = 'taiwan';
+
+            supplyLayoutDefaults(layoutIn, layoutOut, options);
+
+            expect(layoutOut.xaxis.calendar).toBe('hebrew');
+            expect(layoutOut.yaxis.calendar).toBe('ummalqura');
+            expect(layoutOut.zaxis.calendar).toBe('discworld');
+        });
+    });
+});
 
 describe('Test Gl3d layout defaults', function() {
     'use strict';