Merge branch 'master' into backend

2020-01-16 12:21:22 +03:00
parent 3581a818fc 5b211d80a9
commit f7adf0e379
9 changed files with 486 additions and 425 deletions
--- a/src/test-setup/jest-setup.js
+++ b/src/test-setup/jest-setup.js
@@ -82,6 +82,10 @@ jest.mock('grafana/app/core/config', () => {

 jest.mock('jquery', () => 'module not found', {virtual: true});

+// jest.mock('@grafana/ui', () => {
+//   return {};
+// }, {virtual: true});
+
 // Required for loading angularjs
 let dom = new JSDOM('<html><head><script></script></head><body></body></html>');
 // Setup jsdom