import 15.2.2 octopus source

[ceph.git] / ceph / src / pybind / mgr / dashboard / frontend / src / app / shared / services / summary.service.spec.ts

diff --git a/ceph/src/pybind/mgr/dashboard/frontend/src/app/shared/services/summary.service.spec.ts b/ceph/src/pybind/mgr/dashboard/frontend/src/app/shared/services/summary.service.spec.ts
index 9741084b2a885fb4091f0f73d75fd6991452ebc5..100beefd2fb2516bb29d905600f76e0521e6a7b0 100644 (file)
--- a/ceph/src/pybind/mgr/dashboard/frontend/src/app/shared/services/summary.service.spec.ts
+++ b/ceph/src/pybind/mgr/dashboard/frontend/src/app/shared/services/summary.service.spec.ts
@@ -2,7 +2,7 @@ import { HttpClient } from '@angular/common/http';
 import { fakeAsync, TestBed, tick } from '@angular/core/testing';
 import { RouterTestingModule } from '@angular/router/testing';
 
-import { of as observableOf, Subscriber } from 'rxjs';
+import { of as observableOf, Subscriber, Subscription } from 'rxjs';
 
 import { configureTestBed } from '../../../testing/unit-test-helper';
 import { ExecutingTask } from '../models/executing-task';
@@ -12,6 +12,7 @@ import { SummaryService } from './summary.service';
 describe('SummaryService', () => {
   let summaryService: SummaryService;
   let authStorageService: AuthStorageService;
+  let subs: Subscription;
 
   const summary: Record<string, any> = {
     executing_tasks: [],
@@ -47,20 +48,22 @@ describe('SummaryService', () => {
   });
 
   it('should call refresh', fakeAsync(() => {
-    summaryService.enablePolling();
     authStorageService.set('foobar', undefined, undefined);
     const calledWith: any[] = [];
-    summaryService.subscribe((data) => {
-      calledWith.push(data);
-    });
+    subs = new Subscription();
+    subs.add(summaryService.startPolling());
+    tick();
+    subs.add(
+      summaryService.subscribe((data) => {
+        calledWith.push(data);
+      })
+    );
     expect(calledWith).toEqual([summary]);
-    summaryService.refresh();
+    subs.add(summaryService.refresh());
     expect(calledWith).toEqual([summary, summary]);
-    tick(10000);
+    tick(summaryService.REFRESH_INTERVAL * 2);
     expect(calledWith.length).toEqual(4);
-    // In order to not trigger setInterval again,
-    // which would raise 'Error: 1 timer(s) still in the queue.'
-    window.clearInterval(summaryService.polling);
+    subs.unsubscribe();
   }));
 
   describe('Should test methods after first refresh', () => {