Skip to content

Commit

Permalink
Merge branch 'fix/synthetics-preserve-monitor-id-field-on-monitor-att…
Browse files Browse the repository at this point in the history
…ributes' of https://github.com/dominiqueclarke/kibana into fix/synthetics-preserve-monitor-id-field-on-monitor-attributes
  • Loading branch information
dominiqueclarke committed Oct 3, 2022
2 parents a356ebd + 99e9dd6 commit 2559bc2
Showing 1 changed file with 18 additions and 11 deletions.
29 changes: 18 additions & 11 deletions x-pack/test/api_integration/apis/uptime/rest/add_monitor_project.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1439,7 +1439,8 @@ export default function ({ getService }: FtrProviderContext) {
const packagePolicy = apiResponsePolicy.body.items.find(
(pkgPolicy: PackagePolicy) =>
pkgPolicy.id ===
`${monitorsResponse.body.monitors[0].attributes[ConfigKey.CUSTOM_HEARTBEAT_ID]
`${
monitorsResponse.body.monitors[0].attributes[ConfigKey.CUSTOM_HEARTBEAT_ID]
}-${testPolicyId}`
);
expect(packagePolicy.name).eql(
Expand Down Expand Up @@ -1497,7 +1498,8 @@ export default function ({ getService }: FtrProviderContext) {
const packagePolicy = apiResponsePolicy.body.items.find(
(pkgPolicy: PackagePolicy) =>
pkgPolicy.id ===
`${monitorsResponse.body.monitors[0].attributes[ConfigKey.CUSTOM_HEARTBEAT_ID]
`${
monitorsResponse.body.monitors[0].attributes[ConfigKey.CUSTOM_HEARTBEAT_ID]
}-${testPolicyId}`
);

Expand All @@ -1518,7 +1520,8 @@ export default function ({ getService }: FtrProviderContext) {
const packagePolicy2 = apiResponsePolicy2.body.items.find(
(pkgPolicy: PackagePolicy) =>
pkgPolicy.id ===
`${monitorsResponse.body.monitors[0].attributes[ConfigKey.CUSTOM_HEARTBEAT_ID]
`${
monitorsResponse.body.monitors[0].attributes[ConfigKey.CUSTOM_HEARTBEAT_ID]
}-${testPolicyId}`
);

Expand Down Expand Up @@ -1555,7 +1558,8 @@ export default function ({ getService }: FtrProviderContext) {
const packagePolicy = apiResponsePolicy.body.items.find(
(pkgPolicy: PackagePolicy) =>
pkgPolicy.id ===
`${monitorsResponse.body.monitors[0].attributes[ConfigKey.CUSTOM_HEARTBEAT_ID]
`${
monitorsResponse.body.monitors[0].attributes[ConfigKey.CUSTOM_HEARTBEAT_ID]
}-${testPolicyId}`
);

Expand Down Expand Up @@ -1589,7 +1593,8 @@ export default function ({ getService }: FtrProviderContext) {
const packagePolicy2 = apiResponsePolicy2.body.items.find(
(pkgPolicy: PackagePolicy) =>
pkgPolicy.id ===
`${monitorsResponse.body.monitors[0].attributes[ConfigKey.CUSTOM_HEARTBEAT_ID]
`${
monitorsResponse.body.monitors[0].attributes[ConfigKey.CUSTOM_HEARTBEAT_ID]
}-${testPolicyId}`
);

Expand Down Expand Up @@ -1633,8 +1638,8 @@ export default function ({ getService }: FtrProviderContext) {
(pkgPolicy: PackagePolicy) =>
pkgPolicy.id ===
monitorsResponse.body.monitors[0].attributes[ConfigKey.CUSTOM_HEARTBEAT_ID] +
'-' +
testPolicyId
'-' +
testPolicyId
);

expect(packagePolicy.policy_id).eql(testPolicyId);
Expand Down Expand Up @@ -1683,8 +1688,8 @@ export default function ({ getService }: FtrProviderContext) {
(pkgPolicy: PackagePolicy) =>
pkgPolicy.id ===
monitorsResponse.body.monitors[0].attributes[ConfigKey.CUSTOM_HEARTBEAT_ID] +
'-' +
testPolicyId
'-' +
testPolicyId
);

expect(packagePolicy2).eql(undefined);
Expand Down Expand Up @@ -1726,7 +1731,8 @@ export default function ({ getService }: FtrProviderContext) {
const packagePolicy = apiResponsePolicy.body.items.find(
(pkgPolicy: PackagePolicy) =>
pkgPolicy.id ===
`${monitorsResponse.body.monitors[0].attributes[ConfigKey.CUSTOM_HEARTBEAT_ID]
`${
monitorsResponse.body.monitors[0].attributes[ConfigKey.CUSTOM_HEARTBEAT_ID]
}-${testPolicyId}`
);

Expand Down Expand Up @@ -1844,7 +1850,8 @@ export default function ({ getService }: FtrProviderContext) {
const packagePolicy2 = apiResponsePolicy2.body.items.find(
(pkgPolicy: PackagePolicy) =>
pkgPolicy.id ===
`${monitorsResponse.body.monitors[0].attributes[ConfigKey.CUSTOM_HEARTBEAT_ID]
`${
monitorsResponse.body.monitors[0].attributes[ConfigKey.CUSTOM_HEARTBEAT_ID]
} - ${testPolicyId}`
);

Expand Down

0 comments on commit 2559bc2

Please sign in to comment.