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

upgrade jsdom to newest version so contextify is no longer required, add travis

Browse Source
This commit is contained in:
akotynski
2017-10-23 14:05:49 +02:00
parent a15d704b86
commit eb1ef06ae7
7 changed files with 21 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.travis.yml Normal file
View File

@@ -0,0 +1,4 @@
language: node_js
node_js:
- "6"
script: npm run build

2
dist/datasource-zabbix/specs/datasource_specs.js vendored
View File

@@ -235,7 +235,7 @@ describe('ZabbixDatasource', () => {
}); });
}); });
describe('When quering alerts', () => { describe('When querying alerts', () => {
let options = {}; let options = {};
beforeEach(() => { beforeEach(() => {

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

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

2
dist/test/datasource-zabbix/specs/datasource_specs.js vendored
View File

@@ -325,7 +325,7 @@ describe('ZabbixDatasource', function () {
}); });
}); });
describe('When quering alerts', function () { describe('When querying alerts', function () {
var options = {}; var options = {};
beforeEach(function () { beforeEach(function () {

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

@@ -52,11 +52,11 @@ _prunk2.default.mock('app/core/utils/datemath', datemathMock);
_prunk2.default.mock('angular', angularMocks); _prunk2.default.mock('angular', angularMocks);
_prunk2.default.mock('jquery', 'module not found'); _prunk2.default.mock('jquery', 'module not found');
// Setup jsdom
// Required for loading angularjs // Required for loading angularjs
global.document = (0, _jsdom.jsdom)('<html><head><script></script></head><body></body></html>'); var dom = new _jsdom.JSDOM('<html><head><script></script></head><body></body></html>');
global.window = global.document.parentWindow; // Setup jsdom
global.navigator = window.navigator = {}; global.window = dom.window;
global.document = global.window.document;
global.Node = window.Node; global.Node = window.Node;
// Setup Chai // Setup Chai

2
package.json
View File

@@ -37,7 +37,7 @@
"grunt-sass": "^1.1.0", "grunt-sass": "^1.1.0",
"grunt-systemjs-builder": "^0.2.5", "grunt-systemjs-builder": "^0.2.5",
"grunt": "~0.4.5", "grunt": "~0.4.5",
"jsdom": "~3.1.2", "jsdom": "~11.3.0",
"jshint-stylish": "^2.1.0", "jshint-stylish": "^2.1.0",
"load-grunt-tasks": "~3.2.0", "load-grunt-tasks": "~3.2.0",
"mocha": "^2.4.5", "mocha": "^2.4.5",

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

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