From 38db0cc66c9725413ccc015e728eb47d14d695aa Mon Sep 17 00:00:00 2001 From: Artur Arseniev Date: Mon, 25 Sep 2017 23:17:48 +0200 Subject: [PATCH] Prepare test environment without jquery --- src/domain_abstract/ui/InputColor.js | 6 +++--- src/editor/model/Editor.js | 9 +++++++++ src/grapesjs/index.js | 10 ---------- test/helper.js | 17 +++++++++-------- 4 files changed, 21 insertions(+), 21 deletions(-) diff --git a/src/domain_abstract/ui/InputColor.js b/src/domain_abstract/ui/InputColor.js index 351584148..a0c520ec5 100644 --- a/src/domain_abstract/ui/InputColor.js +++ b/src/domain_abstract/ui/InputColor.js @@ -1,6 +1,6 @@ -var Backbone = require('backbone'); -var Input = require('./Input'); -var Spectrum = require('spectrum-colorpicker'); +const Backbone = require('backbone'); +const Input = require('./Input'); +const Spectrum = require('spectrum-colorpicker'); const $ = Backbone.$; module.exports = Input.extend({ diff --git a/src/editor/model/Editor.js b/src/editor/model/Editor.js index a99df7d40..066e09874 100644 --- a/src/editor/model/Editor.js +++ b/src/editor/model/Editor.js @@ -25,6 +25,15 @@ const UndoManager = require('backbone-undo'); const key = require('keymaster'); let timedInterval; +const cash = require('cash-dom'); +require('utils/cashAdds')(cash); +let $ = $ || ''; + +if (!$) { + $ = cash; + window.$ = $; +} + if (!Backbone.$) { Backbone.$ = $; } diff --git a/src/grapesjs/index.js b/src/grapesjs/index.js index 096cd4e8a..e856fd70f 100644 --- a/src/grapesjs/index.js +++ b/src/grapesjs/index.js @@ -1,9 +1,6 @@ import { defaults } from 'underscore'; module.exports = (() => { - const cash = require('cash-dom'); - require('utils/cashAdds')(cash); - const defaultConfig = require('./config/config'); const Editor = require('editor'); const PluginManager = require('plugin_manager'); @@ -39,13 +36,6 @@ module.exports = (() => { */ init(config = {}) { const els = config.container; - let $ = $ || ''; - - // Make a missing $ more verbose - if (!$) { - $ = cash; - window.$ = $; - } if (!els) { throw new Error("'container' is required"); diff --git a/test/helper.js b/test/helper.js index f0c589883..4eb70ff12 100644 --- a/test/helper.js +++ b/test/helper.js @@ -4,13 +4,10 @@ import sinon from 'sinon'; import Backbone from 'backbone'; import grapesjs from './../src'; import { JSDOM } from 'jsdom'; -import jquery from 'jquery'; const dom = new JSDOM(''); const window = dom.window; -const $ = jquery(window); - -//https://www.npmjs.com/package/proxyquire +//const $ = jquery(window); // Fix for the spectrum lib var Module = require('module'); @@ -18,7 +15,7 @@ var originalRequire = Module.prototype.require; Module.prototype.require = function(name) { if (name == 'jquery') { - return $; + return Backbone.$; } return originalRequire.apply(this, arguments); }; @@ -37,7 +34,6 @@ var localStorage = { global.window = window; global.document = window.document; -global.$ = $; global._ = _; global.expect = expect; global.sinon = sinon; @@ -45,8 +41,13 @@ global.grapesjs = grapesjs; global.Backbone = Backbone; global.localStorage = localStorage; global.SVGElement = global.Element; -window.$ = $; -Backbone.$ = $; +global.navigator = { + userAgent: 'node.js' +}; + +// Need this to trigger the cash generation +grapesjs.init({container: 'body', autorender: 0}); +window.$ = Backbone.$; Object.keys(window).forEach((key) => { if (!(key in global)) {