Prepare test environment without jquery

9 years ago · 38db0cc66c
4 changed files with 21 additions and 21 deletions
--- 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({
--- 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.$ = $;
 }
--- 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");
--- 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('<!doctype html><html><body></body></html>');
 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)) {