From 86651c0f6b436a1bb639b7c23af8de6e956d8b5b Mon Sep 17 00:00:00 2001 From: Matthew Beale Date: Thu, 9 Jul 2015 16:14:24 -0400 Subject: [PATCH] Text fixes --- demo/demo.js | 6 +++--- server/services/embed.js | 2 +- src/js/utils/http-utils.js | 2 +- tests/unit/editor/editor-test.js | 25 +++++++++++++------------ tests/unit/renderers/mobiledoc-test.js | 2 +- 5 files changed, 19 insertions(+), 18 deletions(-) diff --git a/demo/demo.js b/demo/demo.js index 811355bf7..913c70642 100644 --- a/demo/demo.js +++ b/demo/demo.js @@ -65,7 +65,7 @@ function readMobiledoc(string) { function isValidJSON(string) { try { - JSON.parse(string); + window.JSON.parse(string); return true; } catch(e) { return false; @@ -144,7 +144,7 @@ $(function() { var mobiledoc = sampleMobiledocs.simpleMobiledoc; var textarea = $('#mobiledoc-to-load textarea'); - textarea.val(JSON.stringify(mobiledoc, false, 2)); + textarea.val(window.JSON.stringify(mobiledoc, false, 2)); textarea.on('input', function() { attemptEditorReboot(editor, textarea); @@ -153,7 +153,7 @@ $(function() { $('#select-mobiledoc').on('change', function() { var mobiledocName = $(this).val(); var mobiledoc = sampleMobiledocs[mobiledocName]; - textarea.val(JSON.stringify(mobiledoc, false, 2)); + textarea.val(window.JSON.stringify(mobiledoc, false, 2)); textarea.trigger('input'); }); diff --git a/server/services/embed.js b/server/services/embed.js index ba51acd16..bc227dc99 100644 --- a/server/services/embed.js +++ b/server/services/embed.js @@ -14,7 +14,7 @@ module.exports = function(req, res) { api.oembed({url: url}, function(err, objs) { if (err) { - var message = JSON.parse(objs).error_message; + var message = window.JSON.parse(objs).error_message; return res.status(500).json(message); } diff --git a/src/js/utils/http-utils.js b/src/js/utils/http-utils.js index 0cdb023a9..7347995b9 100644 --- a/src/js/utils/http-utils.js +++ b/src/js/utils/http-utils.js @@ -35,7 +35,7 @@ function xhrPost(options) { function responseJSON(jsonString) { if (!jsonString) { return null; } try { - return JSON.parse(jsonString); + return window.JSON.parse(jsonString); } catch(e) { return jsonString; } diff --git a/tests/unit/editor/editor-test.js b/tests/unit/editor/editor-test.js index 661f0ae39..f45b66bb0 100644 --- a/tests/unit/editor/editor-test.js +++ b/tests/unit/editor/editor-test.js @@ -5,7 +5,7 @@ editorElement.className = 'editor'; import Editor from 'content-kit-editor/editor/editor'; -const { module, test, asyncTest } = window.QUnit; +const { module, test } = window.QUnit; module('Unit: Editor', { setup: function() { @@ -16,31 +16,32 @@ module('Unit: Editor', { } }); -test('can create an editor via dom node reference', function() { +test('can create an editor via dom node reference', (assert) => { var editor = new Editor(editorElement); - equal(editor.element, editorElement); + assert.equal(editor.element, editorElement); }); -test('can create an editor via dom node reference from getElementById', function() { +test('can create an editor via dom node reference from getElementById', (assert) => { var editor = new Editor(document.getElementById('editor1')); - equal(editor.element, editorElement); + assert.equal(editor.element, editorElement); }); -test('creating an editor without a class name adds appropriate class', function() { +test('creating an editor without a class name adds appropriate class', (assert) => { editorElement.className = ''; var editor = new Editor(document.getElementById('editor1')); - equal(editor.element.className, 'ck-editor'); + assert.equal(editor.element.className, 'ck-editor'); }); -asyncTest('editor fires update event', function() { - expect(2); +test('editor fires update event', (assert) => { + assert.expect(2); + let done = assert.async(); var editor = new Editor(editorElement); editor.on('update', function(data) { - equal (this, editor); - equal (data.index, 99); - start(); + assert.equal(this, editor); + assert.equal(data.index, 99); + done(); }); editor.trigger('update', { index: 99 }); }); diff --git a/tests/unit/renderers/mobiledoc-test.js b/tests/unit/renderers/mobiledoc-test.js index e3078d9f7..12145c7f2 100644 --- a/tests/unit/renderers/mobiledoc-test.js +++ b/tests/unit/renderers/mobiledoc-test.js @@ -6,7 +6,7 @@ const render = MobiledocRenderer.render; let builder; -QUnit.module('Unit: Mobiledoc Renderer', { +module('Unit: Mobiledoc Renderer', { beforeEach() { builder = generateBuilder(); }