Tobias Skarhed 7 лет назад
Родитель
Сommit
2f6b302375

+ 7 - 16
public/app/core/specs/backend_srv.jest.ts

@@ -12,24 +12,15 @@ describe('backend_srv', function() {
 
   let _backendSrv = new BackendSrv(_httpBackend, {}, {}, {}, {});
 
-  //   beforeEach(angularMocks.module('grafana.core'));
-  //   beforeEach(angularMocks.module('grafana.services'));
-  //   beforeEach(
-  //     angularMocks.inject(function($httpBackend, $http, backendSrv) {
-  //       _httpBackend = $httpBackend;
-  //       _backendSrv = backendSrv;
-  //     })
-  //   );
-
   describe('when handling errors', () => {
     it('should return the http status code', async () => {
-      //   _httpBackend.whenGET('gateway-error').respond(502);
-      let res = await _backendSrv.datasourceRequest({
-        url: 'gateway-error',
-      });
-      console.log(res);
-      expect(res.status).toBe(502);
-      //   _httpBackend.flush();
+      try {
+        await _backendSrv.datasourceRequest({
+          url: 'gateway-error',
+        });
+      } catch (err) {
+        expect(err.status).toBe(502);
+      }
     });
   });
 });

+ 0 - 31
public/app/core/specs/backend_srv_specs.ts

@@ -1,31 +0,0 @@
-import { describe, beforeEach, it, expect, angularMocks } from 'test/lib/common';
-import 'app/core/services/backend_srv';
-
-describe('backend_srv', function() {
-  var _backendSrv;
-  var _httpBackend;
-
-  beforeEach(angularMocks.module('grafana.core'));
-  beforeEach(angularMocks.module('grafana.services'));
-  beforeEach(
-    angularMocks.inject(function($httpBackend, $http, backendSrv) {
-      _httpBackend = $httpBackend;
-      _backendSrv = backendSrv;
-    })
-  );
-
-  describe('when handling errors', function() {
-    it('should return the http status code', function(done) {
-      _httpBackend.whenGET('gateway-error').respond(502);
-      _backendSrv
-        .datasourceRequest({
-          url: 'gateway-error',
-        })
-        .catch(function(err) {
-          expect(err.status).to.be(502);
-          done();
-        });
-      _httpBackend.flush();
-    });
-  });
-});