fix dist folder after merging conflicts

grafana · Oct 23, 2017 · d5c8dba · d5c8dba
1 parent 0ab31e5
commit d5c8dba
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 12 deletions.
diff --git a/dist/datasource-zabbix/datasource.js b/dist/datasource-zabbix/datasource.js
diff --git a/dist/datasource-zabbix/datasource.js.map b/dist/datasource-zabbix/datasource.js.map
diff --git a/dist/datasource-zabbix/specs/test-main.js b/dist/datasource-zabbix/specs/test-main.js
@@ -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

diff --git a/dist/test/datasource-zabbix/datasource.js b/dist/test/datasource-zabbix/datasource.js
@@ -840,7 +840,7 @@ function filterEnabledTargets(targets) {
 }
 
 function getTriggerThreshold(expression) {
-  var thresholdPattern = /.*[<>]([\d\.]+)/;
+  var thresholdPattern = /.*[<>=]{1,2}([\d\.]+)/;
   var finded_thresholds = expression.match(thresholdPattern);
   if (finded_thresholds && finded_thresholds.length >= 2) {
     var threshold = finded_thresholds[1];

diff --git a/dist/test/datasource-zabbix/specs/test-main.js b/dist/test/datasource-zabbix/specs/test-main.js
@@ -53,11 +53,11 @@ _prunk2.default.mock('app/core/table_model', {});
 _prunk2.default.mock('angular', angularMocks);
 _prunk2.default.mock('jquery', 'module not found');
 
-// Setup jsdom
 // Required for loading angularjs
-global.document = (0, _jsdom.jsdom)('<html><head><script></script></head><body></body></html>');
-global.window = global.document.parentWindow;
-global.navigator = window.navigator = {};
+var dom = new _jsdom.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