From 6d7e8bd68b5e6ebf75c8c7a5783395fd10f5d568 Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Tue, 5 Jul 2016 11:03:10 -0400
Subject: [PATCH] FIX: Customizations were broken

---
 app/assets/javascripts/admin/components/ace-editor.js.es6 | 2 +-
 test/javascripts/components/ace-editor-test.js.es6        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/assets/javascripts/admin/components/ace-editor.js.es6 b/app/assets/javascripts/admin/components/ace-editor.js.es6
index 7e592e9d80..f9be641640 100644
--- a/app/assets/javascripts/admin/components/ace-editor.js.es6
+++ b/app/assets/javascripts/admin/components/ace-editor.js.es6
@@ -1,6 +1,6 @@
 /* global ace:true */
 import loadScript from 'discourse/lib/load-script';
-import escapeExpression from 'discourse/lib/utilities';
+import { escapeExpression } from 'discourse/lib/utilities';
 
 export default Ember.Component.extend({
   mode: 'css',
diff --git a/test/javascripts/components/ace-editor-test.js.es6 b/test/javascripts/components/ace-editor-test.js.es6
index 58dedbb19f..6fa9a533d4 100644
--- a/test/javascripts/components/ace-editor-test.js.es6
+++ b/test/javascripts/components/ace-editor-test.js.es6
@@ -10,7 +10,7 @@ componentTest('css editor', {
 });
 
 componentTest('html editor', {
-  template: '{{ace-editor mode="html"}}',
+  template: '{{ace-editor mode="html" content="<b>wat</b>"}}',
   test(assert) {
     assert.ok(this.$('.ace_editor').length, 'it renders the ace editor');
   }