fixed monitoring tests

Author: gmmorris

x-pack/plugins/monitoring/server/alerts/cluster_state.test.ts

@@ -96,7 +96,7 @@ describe('getClusterState', () => {
   it('should alert if green -> yellow', async () => {
     const result = await setupAlert(AlertClusterStateState.Green, AlertClusterStateState.Yellow);
     expect(executeActions).toHaveBeenCalledWith(
-      undefined,
+      services.alertInstanceFactory(ALERT_TYPE_CLUSTER_STATE),
       cluster,
       AlertClusterStateState.Yellow,
       emailAddress
@@ -110,7 +110,7 @@ describe('getClusterState', () => {
   it('should alert if yellow -> green', async () => {
     const result = await setupAlert(AlertClusterStateState.Yellow, AlertClusterStateState.Green);
     expect(executeActions).toHaveBeenCalledWith(
-      undefined,
+      services.alertInstanceFactory(ALERT_TYPE_CLUSTER_STATE),
       cluster,
       AlertClusterStateState.Green,
       emailAddress,
@@ -124,7 +124,7 @@ describe('getClusterState', () => {
   it('should alert if green -> red', async () => {
     const result = await setupAlert(AlertClusterStateState.Green, AlertClusterStateState.Red);
     expect(executeActions).toHaveBeenCalledWith(
-      undefined,
+      services.alertInstanceFactory(ALERT_TYPE_CLUSTER_STATE),
       cluster,
       AlertClusterStateState.Red,
       emailAddress
@@ -138,7 +138,7 @@ describe('getClusterState', () => {
   it('should alert if red -> green', async () => {
     const result = await setupAlert(AlertClusterStateState.Red, AlertClusterStateState.Green);
     expect(executeActions).toHaveBeenCalledWith(
-      undefined,
+      services.alertInstanceFactory(ALERT_TYPE_CLUSTER_STATE),
       cluster,
       AlertClusterStateState.Green,
       emailAddress,

x-pack/plugins/monitoring/server/alerts/license_expiration.test.ts

@@ -95,6 +95,7 @@ describe('getLicenseExpiration', () => {
   }
 
   afterEach(() => {
+    jest.clearAllMocks();
     (executeActions as jest.Mock).mockClear();
     (getPreparedAlert as jest.Mock).mockClear();
   });
@@ -124,7 +125,7 @@ describe('getLicenseExpiration', () => {
     const newState = result[clusterUuid] as AlertLicensePerClusterState;
     expect(newState.expiredCheckDateMS > 0).toBe(true);
     expect(executeActions).toHaveBeenCalledWith(
-      undefined,
+      services.alertInstanceFactory(ALERT_TYPE_LICENSE_EXPIRATION),
       cluster,
       moment.utc(expiryDateMS),
       dateFormat,
@@ -146,7 +147,7 @@ describe('getLicenseExpiration', () => {
     const newState = result[clusterUuid] as AlertLicensePerClusterState;
     expect(newState.expiredCheckDateMS).toBe(0);
     expect(executeActions).toHaveBeenCalledWith(
-      undefined,
+      services.alertInstanceFactory(ALERT_TYPE_LICENSE_EXPIRATION),
       cluster,
       moment.utc(expiryDateMS),
       dateFormat,
@@ -185,7 +186,7 @@ describe('getLicenseExpiration', () => {
     const newState = result[clusterUuid] as AlertLicensePerClusterState;
     expect(newState.expiredCheckDateMS > 0).toBe(true);
     expect(executeActions).toHaveBeenCalledWith(
-      undefined,
+      services.alertInstanceFactory(ALERT_TYPE_LICENSE_EXPIRATION),
       cluster,
       moment.utc(expiryDateMS),
       dateFormat,