Misthios/grafana-zabbix
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix dist folder after merging conflicts

Browse Source
This commit is contained in:
akotynski
2017-10-23 14:29:05 +02:00
parent 0ab31e59f8
commit d5c8dba61f
5 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
dist/datasource-zabbix/specs/test-main.js vendored
View File

@@ -2,7 +2,7 @@
/* globals global: false */
import prunk from 'prunk';
import {jsdom} from 'jsdom';
import {JSDOM} from 'jsdom';
import chai from 'chai';
// import sinon from 'sinon';
import sinonChai from 'sinon-chai';
@@ -36,11 +36,11 @@ prunk.mock('app/core/table_model', {});
prunk.mock('angular', angularMocks);
prunk.mock('jquery', 'module not found');
// Setup jsdom
// Required for loading angularjs
global.document = jsdom('<html><head><script></script></head><body></body></html>');
global.window = global.document.parentWindow;
global.navigator = window.navigator = {};
let dom = new JSDOM('<html><head><script></script></head><body></body></html>');
// Setup jsdom
global.window = dom.window;
global.document = global.window.document;
global.Node = window.Node;
// Setup Chai