Move generated coffee defaults file location to test directory

abdulrahman305 · Jan 26, 2016 · 5efb829 · 5efb829
1 parent 4304c6a
commit 5efb829
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/.gitignore b/.gitignore
@@ -108,5 +108,5 @@ win-64
 .cache/
 
 # generated coffeescript
-/bokehjs/src/coffee/models/widgets/defaults.coffee
-/bokehjs/src/coffee/common/defaults.coffee
+/bokehjs/test/test_common/defaults/models_defaults.coffee
+/bokehjs/test/test_common/defaults/widgets_defaults.coffee
diff --git a/bokehjs/gulp/tasks/generate_defaults.py b/bokehjs/gulp/tasks/generate_defaults.py
@@ -102,7 +102,7 @@ def output_defaults_module(filename, defaults):
     print("Wrote %s with %d model classes" % (filename, len(defaults)))
 
 
-output_defaults_module(filename = os.path.join(dest_dir, 'common/defaults.coffee'),
+output_defaults_module(filename = os.path.join(dest_dir, 'test_common/defaults/models_defaults.coffee'),
                        defaults = all_json)
-output_defaults_module(filename = os.path.join(dest_dir, 'models/widgets/defaults.coffee'),
+output_defaults_module(filename = os.path.join(dest_dir, 'test_common/defaults/widgets_defaults.coffee'),
                        defaults = widgets_json)
diff --git a/bokehjs/gulp/tasks/scripts.coffee b/bokehjs/gulp/tasks/scripts.coffee
@@ -56,7 +56,7 @@ gulp.task "scripts:generate", (cb) ->
     else
       pypath = basedir
     env = _.extend({}, process.env, { PYTHONPATH: pypath })
-    handle = child_process.spawn("python", ['./gulp/tasks/generate_defaults.py', paths.buildDir.coffee], {
+    handle = child_process.spawn("python", ['./gulp/tasks/generate_defaults.py', './test/'], {
       env: env,
       cwd: bokehjsdir
     })

diff --git a/bokehjs/test/test_common/test_defaults.coffee b/bokehjs/test/test_common/test_defaults.coffee
@@ -2,8 +2,8 @@ _ = require "underscore"
 {expect} = require "chai"
 utils = require "../utils"
 
-core_defaults = utils.require "common/defaults"
-widget_defaults = utils.require "models/widgets/defaults"
+core_defaults = require "./defaults/models_defaults"
+widget_defaults = require "./defaults/widgets_defaults"
 
 {Collections} = utils.require "common/base"
 HasProperties = utils.require "common/has_properties"