From c73507ef9e666c87515f55edbe75f27c4cb4b3a7 Mon Sep 17 00:00:00 2001 From: "greenkeeper[bot]" Date: Thu, 6 Sep 2018 21:00:34 +0000 Subject: [PATCH 1/3] fix(package): update @fortawesome/react-fontawesome to version 0.1.3 --- ui/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ui/package.json b/ui/package.json index fd8530e07..b28e458fd 100644 --- a/ui/package.json +++ b/ui/package.json @@ -8,7 +8,7 @@ "@fortawesome/fontawesome-svg-core": "1.2.4", "@fortawesome/free-regular-svg-icons": "5.3.1", "@fortawesome/free-solid-svg-icons": "5.3.1", - "@fortawesome/react-fontawesome": "0.1.2", + "@fortawesome/react-fontawesome": "0.1.3", "body-scroll-lock": "2.5.7", "bootstrap": "4.1.3", "bootswatch": "4.1.3", From fb0a64059e2cbe048d9137d81eea9b41182a7ed9 Mon Sep 17 00:00:00 2001 From: "greenkeeper[bot]" Date: Thu, 6 Sep 2018 21:02:41 +0000 Subject: [PATCH 2/3] chore(package): update lockfiles https://npm.im/greenkeeper-lockfile --- ui/package-lock.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ui/package-lock.json b/ui/package-lock.json index 1763f2164..9222dd98e 100644 --- a/ui/package-lock.json +++ b/ui/package-lock.json @@ -125,9 +125,9 @@ } }, "@fortawesome/react-fontawesome": { - "version": "0.1.2", - "resolved": "https://registry.npmjs.org/@fortawesome/react-fontawesome/-/react-fontawesome-0.1.2.tgz", - "integrity": "sha512-8SVkQ8tLfUYWKBEPPVUpohqOjtf5ix4yO0Z3c+vRwo9y1cM5rOBvuSQq7qUtoGwQTSvVF4NfXMYm3j0HSmV8Rg==", + "version": "0.1.3", + "resolved": "https://registry.npmjs.org/@fortawesome/react-fontawesome/-/react-fontawesome-0.1.3.tgz", + "integrity": "sha512-tc689l67rPZ7+ynZVUgOXY80rAt5KxvuH1qjPpJcbyJzJHzk5yhrD993BjsSEdPBLTtPqmvwynsO/XrAQqHbtg==", "requires": { "humps": "2.0.1", "prop-types": "15.6.2" From 6d4b3d67465b9459a54b07f9f74ac94ad1ec707d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Mierzwa?= Date: Fri, 7 Sep 2018 19:23:17 +0100 Subject: [PATCH 3/3] fix(tests): use diffable html for annotation snapshot test --- .../__snapshots__/index.test.js.snap | 55 +++++++------------ .../AlertGroup/Annotation/index.test.js | 2 +- 2 files changed, 20 insertions(+), 37 deletions(-) diff --git a/ui/src/Components/Grid/AlertGrid/AlertGroup/Annotation/__snapshots__/index.test.js.snap b/ui/src/Components/Grid/AlertGrid/AlertGroup/Annotation/__snapshots__/index.test.js.snap index dfaa05fd2..2182fcb83 100644 --- a/ui/src/Components/Grid/AlertGrid/AlertGroup/Annotation/__snapshots__/index.test.js.snap +++ b/ui/src/Components/Grid/AlertGrid/AlertGroup/Annotation/__snapshots__/index.test.js.snap @@ -1,45 +1,28 @@ // Jest Snapshot v1, https://goo.gl/fbAQLP exports[` matches snapshot 1`] = ` - - - + + + + annotation name +" `; exports[` matches snapshot when visible=false 1`] = ` diff --git a/ui/src/Components/Grid/AlertGrid/AlertGroup/Annotation/index.test.js b/ui/src/Components/Grid/AlertGrid/AlertGroup/Annotation/index.test.js index 31a3bfa67..cddd63457 100644 --- a/ui/src/Components/Grid/AlertGrid/AlertGroup/Annotation/index.test.js +++ b/ui/src/Components/Grid/AlertGrid/AlertGroup/Annotation/index.test.js @@ -22,7 +22,7 @@ const ShallowLinkAnnotation = () => { describe("", () => { it("matches snapshot", () => { const tree = ShallowLinkAnnotation(); - expect(tree).toMatchSnapshot(); + expect(toDiffableHtml(tree.html())).toMatchSnapshot(); }); it("contains a link", () => {