diff --git a/config/assets_test.yml b/config/assets_test.yml deleted file mode 100644 index 821f595b5..000000000 --- a/config/assets_test.yml +++ /dev/null @@ -1,7 +0,0 @@ -package_assets: on -template_function: Handlebars.compile -template_extension: 'handlebars' - -javascripts: - app: - - public/javascripts/app/templates/* \ No newline at end of file diff --git a/spec/javascripts/support/jasmine.yml b/spec/javascripts/support/jasmine.yml index 430b53186..837d6c668 100644 --- a/spec/javascripts/support/jasmine.yml +++ b/spec/javascripts/support/jasmine.yml @@ -13,7 +13,7 @@ src_files: # load up our outputted templates, bound to window.JST - public/javascripts/vendor/handlebars-1.0.0.beta.6.js - - public/assets/app.js + - public/assets/templates.js - public/javascripts/vendor/underscore.js - public/javascripts/vendor/jquery-1.7.1.min.js diff --git a/spec/javascripts/support/jasmine_config.rb b/spec/javascripts/support/jasmine_config.rb index 3e9a8dc08..04afc4206 100644 --- a/spec/javascripts/support/jasmine_config.rb +++ b/spec/javascripts/support/jasmine_config.rb @@ -1,9 +1,7 @@ require 'jammit' module Jasmine class Config - Jammit.reload! - Jammit.package!({ :config_path => Rails.root.join("config", "assets_test.yml")}) - + Jammit.package! end end \ No newline at end of file