fix: [no-issue] fix unit tests

src/app/datapoints-graph/charts/custom-measurements.service.spec.ts

@@ -1,6 +1,7 @@
 import { fakeAsync, TestBed, tick } from '@angular/core/testing';
 import { FetchClient, ISeries, Realtime } from '@c8y/client';
 import { ApiService } from '@c8y/ngx-components/api';
+import { firstValueFrom } from 'rxjs';
 import { CustomMeasurementService } from './custom-measurements.service';
 
 describe('CustomMeasurementService', () => {
@@ -26,17 +27,20 @@ describe('CustomMeasurementService', () => {
  .mockName('getFetchOptions')
  .mockReturnValue(options),
  getUrl: jest.fn().mockName('getFetchOptions').mockReturnValue(fullUrl),
- fetch: jest.fn().mockName('fetch').mockImplementation(),
+ fetch: jest
+ .fn()
+ .mockName('fetch')
+ .mockImplementation(() => Promise.resolve(response)),
  } as any as FetchClient;
  TestBed.configureTestingModule({
  providers: [
- CustomMeasurementService,
  { provide: FetchClient, useValue: client },
  { provide: Realtime, useValue: {} },
  {
  provide: ApiService,
  useValue: apiService,
  },
+ CustomMeasurementService,
  ],
  });
  service = TestBed.inject(CustomMeasurementService);
@@ -61,36 +65,29 @@ describe('CustomMeasurementService', () => {
  });
  }));
 
- it('should call onFinish to trigger header loading bar', fakeAsync(() => {
- // when
- (global as any).fetch = jest
- .fn()
- .mockImplementationOnce(() => Promise.resolve(response));
- service.listSeries$({} as any).subscribe();
- tick();
- // then
+ it('should call onFinish to trigger header loading bar', async () => {
+ (global as any).fetch = jest.fn().mockResolvedValueOnce(response);
+
+ await firstValueFrom(service.listSeries$({} as any));
  expect(apiService.onFinish).toHaveBeenCalledWith({
- options,
  method: 'GET',
- url: '/measurement/measurements/series',
+ options,
  response,
+ url: '/measurement/measurements/series',
  });
- }));
+ });
 
- it('should return resolved data', fakeAsync(() => {
+ it('should return resolved data', (done) => {
  // when
  const values = { [new Date().toString()]: [{ min: 0, max: 1 }] };
  (global as any).fetch = jest.fn().mockImplementationOnce(() =>
  Promise.resolve({
  json: () => ({ values } as ISeries),
  })
  );
- let resolvedData;
- service
- .listSeries$({} as any)
- .subscribe((val) => (resolvedData = val.data));
- tick();
- // then
- expect(resolvedData.values).toEqual(values);
- }));
+ service.listSeries$({} as any).subscribe((val) => {
+ expect(val.data.values).toEqual(values);
+ done();
+ });
+ });
 });

src/app/datapoints-graph/charts/custom-measurements.service.ts

@@ -17,10 +17,12 @@ import { cloneDeep } from 'lodash-es';
 
 @Injectable()
 export class CustomMeasurementService extends MeasurementService {
- apiService: ApiService;
- constructor(client: FetchClient, realtime: Realtime, apiService: ApiService) {
+ constructor(
+ client: FetchClient,
+ realtime: Realtime,
+ private apiService: ApiService
+ ) {
  super(client, realtime);
- this.apiService = apiService;
  }
 
  listSeries$(params: ISeriesFilter): Observable<IResult<ISeries>> {
@@ -50,6 +52,7 @@ export class CustomMeasurementService extends MeasurementService {
  switchMap(async (res) => {
  callOnFinish.response = res;
  const data = await res.json();
+
  return { res: res as IFetchResponse, data };
  }),
  finalize(() => {