From 25aa847287e5fd2b7925eb897ddef6e36963524e Mon Sep 17 00:00:00 2001 From: Renovate Bot Date: Tue, 5 Feb 2019 23:36:43 +0000 Subject: [PATCH 1/3] chore(deps): update dependency enzyme-adapter-react-16 to v1.9.1 --- ui/package.json | 2 +- ui/yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/ui/package.json b/ui/package.json index 1eac36960..7bb18bc22 100644 --- a/ui/package.json +++ b/ui/package.json @@ -57,7 +57,7 @@ "@commitlint/travis-cli": "7.5.0", "diffable-html": "4.0.0", "enzyme": "3.8.0", - "enzyme-adapter-react-16": "1.8.0", + "enzyme-adapter-react-16": "1.9.1", "jest-canvas-mock": "1.1.0", "jest-date-mock": "1.0.7", "jest-fetch-mock": "2.1.0", diff --git a/ui/yarn.lock b/ui/yarn.lock index 9e303cd69..bc047d369 100644 --- a/ui/yarn.lock +++ b/ui/yarn.lock @@ -3881,10 +3881,10 @@ entities@^1.1.1, entities@~1.1.1: resolved "https://registry.yarnpkg.com/entities/-/entities-1.1.2.tgz#bdfa735299664dfafd34529ed4f8522a275fea56" integrity sha512-f2LZMYl1Fzu7YSBKg+RoROelpOaNrcGmE9AZubeDfrCEia483oW4MI4VyFd5VNHIgQ/7qm1I0wUHK1eJnn2y2w== -enzyme-adapter-react-16@1.8.0: - version "1.8.0" - resolved "https://registry.yarnpkg.com/enzyme-adapter-react-16/-/enzyme-adapter-react-16-1.8.0.tgz#7055d8e908d8d27b807cf4292244db3c815ca11d" - integrity sha512-7cVHIKutqnesGeM3CjNFHSvktpypSWBokrBO8wIW+BVx+HGxWCF87W9TpkIIYJqgCtdw9FQGFrAbLg8kSwPRuQ== +enzyme-adapter-react-16@1.9.1: + version "1.9.1" + resolved "https://registry.yarnpkg.com/enzyme-adapter-react-16/-/enzyme-adapter-react-16-1.9.1.tgz#6d49a3a31c3a0fccf527610f31b837e0f307128a" + integrity sha512-Egzogv1y77DUxdnq/CyHxLHaNxmSSKDDSDNNB/EiAXCZVFXdFibaNy2uUuRQ1n24T2m6KH/1Rw16XDRq+1yVEg== dependencies: enzyme-adapter-utils "^1.10.0" function.prototype.name "^1.1.0" From 675ec52cac43188699c0a196308032e096b7347a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Mierzwa?= Date: Wed, 6 Feb 2019 07:49:03 +0000 Subject: [PATCH 2/3] fix(tests): remove async from tests that don't need it --- .../AlertGrid/AlertGroup/Silence/DeleteSilence.test.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ui/src/Components/Grid/AlertGrid/AlertGroup/Silence/DeleteSilence.test.js b/ui/src/Components/Grid/AlertGrid/AlertGroup/Silence/DeleteSilence.test.js index 68a22b0df..c7dd7f169 100644 --- a/ui/src/Components/Grid/AlertGrid/AlertGroup/Silence/DeleteSilence.test.js +++ b/ui/src/Components/Grid/AlertGrid/AlertGroup/Silence/DeleteSilence.test.js @@ -70,13 +70,13 @@ const VerifyResponse = async response => { return tree; }; -describe("", async () => { +describe("", () => { it("label is 'Delete' by default", () => { const tree = MountedDeleteSilence(); expect(tree.text()).toBe("Delete"); }); - it("opens modal on click", async () => { + it("opens modal on click", () => { const tree = MountedDeleteSilence(); tree.simulate("click"); expect(tree.find(".modal-body")).toHaveLength(1); @@ -84,12 +84,12 @@ describe("", async () => { }); describe("", () => { - it("renders LabelSetList on mount", async () => { + it("renders LabelSetList on mount", () => { const tree = MountedDeleteSilenceModalContent(); expect(tree.find("LabelSetList")).toHaveLength(1); }); - it("fetches affected alerts on mount", async () => { + it("fetches affected alerts on mount", () => { MountedDeleteSilenceModalContent(); expect(fetch).toHaveBeenCalled(); }); From f013ec321aa2b362d033bf94e87e4bdf5c549cf9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Mierzwa?= Date: Wed, 6 Feb 2019 08:07:10 +0000 Subject: [PATCH 3/3] fix(tests): trigger click on the right element --- .../Grid/AlertGrid/AlertGroup/Silence/DeleteSilence.test.js | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/ui/src/Components/Grid/AlertGrid/AlertGroup/Silence/DeleteSilence.test.js b/ui/src/Components/Grid/AlertGrid/AlertGroup/Silence/DeleteSilence.test.js index c7dd7f169..a5e253bf9 100644 --- a/ui/src/Components/Grid/AlertGrid/AlertGroup/Silence/DeleteSilence.test.js +++ b/ui/src/Components/Grid/AlertGrid/AlertGroup/Silence/DeleteSilence.test.js @@ -78,7 +78,10 @@ describe("", () => { it("opens modal on click", () => { const tree = MountedDeleteSilence(); - tree.simulate("click"); + tree + .find(".badge") + .at(0) + .simulate("click"); expect(tree.find(".modal-body")).toHaveLength(1); }); });