import ceph quincy 17.2.1

[ceph.git] / ceph / src / pybind / mgr / dashboard / frontend / src / app / ceph / cluster / prometheus / silence-form / silence-form.component.spec.ts

diff --git a/ceph/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/prometheus/silence-form/silence-form.component.spec.ts b/ceph/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/prometheus/silence-form/silence-form.component.spec.ts
index 136375cbbbe38784b793ec7c9f75a1c0bffed944..41898315019c9e8dafe960dc0e2ebb15a4f5f6b6 100644 (file)
--- a/ceph/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/prometheus/silence-form/silence-form.component.spec.ts
+++ b/ceph/src/pybind/mgr/dashboard/frontend/src/app/ceph/cluster/prometheus/silence-form/silence-form.component.spec.ts
@@ -85,7 +85,7 @@ describe('SilenceFormComponent', () => {
   const changeAction = (action: string) => {
     const modes = {
       add: '/monitoring/silences/add',
-      alertAdd: '/monitoring/silences/add/someAlert',
+      alertAdd: '/monitoring/silences/add/alert0',
       recreate: '/monitoring/silences/recreate/someExpiredId',
       edit: '/monitoring/silences/edit/someNotExpiredId'
     };
@@ -99,9 +99,10 @@ describe('SilenceFormComponent', () => {
 
     prometheus = new PrometheusHelper();
     prometheusService = TestBed.inject(PrometheusService);
-    spyOn(prometheusService, 'getAlerts').and.callFake(() =>
-      of([prometheus.createAlert('alert0')])
-    );
+    spyOn(prometheusService, 'getAlerts').and.callFake(() => {
+      const name = _.split(router.url, '/').pop();
+      return of([prometheus.createAlert(name)]);
+    });
     ifPrometheusSpy = spyOn(prometheusService, 'ifPrometheusConfigured').and.callFake((fn) => fn());
     rulesSpy = spyOn(prometheusService, 'getRules').and.callFake(() =>
       of({
@@ -231,9 +232,10 @@ describe('SilenceFormComponent', () => {
     };
 
     beforeEach(() => {
-      spyOn(prometheusService, 'getSilences').and.callFake((p) =>
-        of([prometheus.createSilence(p.id)])
-      );
+      spyOn(prometheusService, 'getSilences').and.callFake(() => {
+        const id = _.split(router.url, '/').pop();
+        return of([prometheus.createSilence(id)]);
+      });
     });
 
     it('should have no special action activate by default', () => {
@@ -251,7 +253,7 @@ describe('SilenceFormComponent', () => {
     it('should be in edit action if route includes edit', () => {
       params = { id: 'someNotExpiredId' };
       expectMode('edit', true, false, 'Edit');
-      expect(prometheusService.getSilences).toHaveBeenCalledWith(params);
+      expect(prometheusService.getSilences).toHaveBeenCalled();
       expect(component.form.value).toEqual({
         comment: `A comment for ${params.id}`,
         createdBy: `Creator of ${params.id}`,
@@ -265,7 +267,7 @@ describe('SilenceFormComponent', () => {
     it('should be in recreation action if route includes recreate', () => {
       params = { id: 'someExpiredId' };
       expectMode('recreate', false, true, 'Recreate');
-      expect(prometheusService.getSilences).toHaveBeenCalledWith(params);
+      expect(prometheusService.getSilences).toHaveBeenCalled();
       expect(component.form.value).toEqual({
         comment: `A comment for ${params.id}`,
         createdBy: `Creator of ${params.id}`,
@@ -277,7 +279,7 @@ describe('SilenceFormComponent', () => {
     });
 
     it('adds matchers based on the label object of the alert with the given id', () => {
-      params = { id: 'someAlert' };
+      params = { id: 'alert0' };
       expectMode('alertAdd', false, false, 'Create');
       expect(prometheusService.getSilences).not.toHaveBeenCalled();
       expect(prometheusService.getAlerts).toHaveBeenCalled();