From 08443503081b6b6ae5c3bdafb22df477d2c2f044 Mon Sep 17 00:00:00 2001 From: Sam Date: Wed, 25 Nov 2015 13:57:10 +1100 Subject: [PATCH] correct production mode due to ember loading changes --- config/application.rb | 2 +- test/javascripts/test_helper.js | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/config/application.rb b/config/application.rb index f1df9881c..a806a952c 100644 --- a/config/application.rb +++ b/config/application.rb @@ -69,7 +69,7 @@ module Discourse path =~ /assets\/images/ && !%w(.js .css).include?(File.extname(filename)) end] - config.assets.precompile += ['vendor.js', 'common.css', 'desktop.css', 'mobile.css', 'admin.js', 'admin.css', 'shiny/shiny.css', 'preload_store.js', 'browser-update.js', 'embed.css', 'break_string.js'] + config.assets.precompile += ['vendor.js', 'common.css', 'desktop.css', 'mobile.css', 'admin.js', 'admin.css', 'shiny/shiny.css', 'preload_store.js', 'browser-update.js', 'embed.css', 'break_string.js', 'ember_jquery.js'] # Precompile all defer Dir.glob("#{config.root}/app/assets/javascripts/defer/*.js").each do |file| diff --git a/test/javascripts/test_helper.js b/test/javascripts/test_helper.js index 4e0e1c51b..08f9256f6 100644 --- a/test/javascripts/test_helper.js +++ b/test/javascripts/test_helper.js @@ -1,17 +1,13 @@ /*global document, sinon, QUnit, Logster */ //= require env - //= require ../../app/assets/javascripts/preload_store - -// probe framework first //= require probes - -// Externals we need to load first //= require jquery.debug //= require jquery.ui.widget //= require handlebars //= require ember.debug +//= require ember-template-compiler //= require message-bus //= require ember-qunit //= require fake_xml_http_request