From e6c1fc996c9bc7c5e50b48be9c0bda33d038a396 Mon Sep 17 00:00:00 2001 From: sadick Date: Sat, 27 Apr 2019 07:56:34 +0300 Subject: [PATCH 1/4] Fail gracefully when brand svg is not provided --- .../components/psammead-brand/src/index.jsx | 30 ++++++++++--------- .../psammead-brand/src/index.stories.jsx | 5 +++- 2 files changed, 20 insertions(+), 15 deletions(-) diff --git a/packages/components/psammead-brand/src/index.jsx b/packages/components/psammead-brand/src/index.jsx index 3d0baf0390..a4111798f9 100644 --- a/packages/components/psammead-brand/src/index.jsx +++ b/packages/components/psammead-brand/src/index.jsx @@ -76,20 +76,22 @@ const BrandSvg = styled.svg` const Brand = ({ brandName, svg }) => ( - - - - {brandName} - - + {svg && ( + + + + {brandName} + + + )} ); diff --git a/packages/components/psammead-brand/src/index.stories.jsx b/packages/components/psammead-brand/src/index.stories.jsx index b9751fb3ad..5d4c044714 100644 --- a/packages/components/psammead-brand/src/index.stories.jsx +++ b/packages/components/psammead-brand/src/index.stories.jsx @@ -19,4 +19,7 @@ storiesOf('Brand', module) return ; }, { notes }, - ); + ) + .add('without brand svg', () => , { + notes, + }); From 1210828d831d25490c70fb49b4cfde13f8b1b10f Mon Sep 17 00:00:00 2001 From: sadick Date: Sat, 27 Apr 2019 08:01:50 +0300 Subject: [PATCH 2/4] Update test --- .../src/__snapshots__/index.test.jsx.snap | 39 +++++++++++++++++++ .../psammead-brand/src/index.test.jsx | 4 ++ 2 files changed, 43 insertions(+) diff --git a/packages/components/psammead-brand/src/__snapshots__/index.test.jsx.snap b/packages/components/psammead-brand/src/__snapshots__/index.test.jsx.snap index ab4b922ded..57fd7eb2e2 100644 --- a/packages/components/psammead-brand/src/__snapshots__/index.test.jsx.snap +++ b/packages/components/psammead-brand/src/__snapshots__/index.test.jsx.snap @@ -110,3 +110,42 @@ exports[`Brand should render correctly 1`] = ` `; + +exports[`Brand should render correctly with svg not provided 1`] = ` +.c0 { + background-color: #B80000; + height: 5rem; + width: 100%; +} + +.c1 { + max-width: 80rem; + margin: 0 auto; +} + +@media (max-width:25rem) { + .c0 { + padding: 0 0.5rem; + } +} + +@media (min-width:25rem) { + .c0 { + padding: 0 1rem; + } +} + +@media (min-width:62.9375rem) { + .c0 { + padding: 0 1rem; + } +} + +
+
+
+`; diff --git a/packages/components/psammead-brand/src/index.test.jsx b/packages/components/psammead-brand/src/index.test.jsx index d4eab87af5..aa6653bfd1 100644 --- a/packages/components/psammead-brand/src/index.test.jsx +++ b/packages/components/psammead-brand/src/index.test.jsx @@ -20,4 +20,8 @@ describe('Brand', () => { 'should render correctly', , ); + shouldMatchSnapshot( + 'should render correctly with svg not provided', + , + ); }); From 7dab3ef9ea32c796c649b13f6560730ccf6bd1c3 Mon Sep 17 00:00:00 2001 From: sadick Date: Mon, 29 Apr 2019 09:15:35 +0300 Subject: [PATCH 3/4] Bump version number --- packages/components/psammead-brand/CHANGELOG.md | 1 + packages/components/psammead-brand/package-lock.json | 2 +- packages/components/psammead-brand/package.json | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/packages/components/psammead-brand/CHANGELOG.md b/packages/components/psammead-brand/CHANGELOG.md index 12e9cae57c..d90655a8a2 100644 --- a/packages/components/psammead-brand/CHANGELOG.md +++ b/packages/components/psammead-brand/CHANGELOG.md @@ -3,6 +3,7 @@ | Version | Description | | ------- | ----------- | +| 1.0.1 | [PR#???](https://github.com/bbc/psammead/pull/???) Fail gracefully if brand svg is not provided | | 1.0.0 | [PR#457](https://github.com/bbc/psammead/pull/457) Enable passing of different svgs | | 0.3.4 | [PR#424](https://github.com/bbc/psammead/pull/424) Add Snyk badge to readme | | 0.3.3 | [PR#407](https://github.com/bbc/psammead/pull/407) Organise dependencies properly | diff --git a/packages/components/psammead-brand/package-lock.json b/packages/components/psammead-brand/package-lock.json index 13a3b3efa1..e0bb624d99 100644 --- a/packages/components/psammead-brand/package-lock.json +++ b/packages/components/psammead-brand/package-lock.json @@ -1,6 +1,6 @@ { "name": "@bbc/psammead-brand", - "version": "1.0.0", + "version": "1.0.1", "lockfileVersion": 1, "requires": true, "dependencies": { diff --git a/packages/components/psammead-brand/package.json b/packages/components/psammead-brand/package.json index 44b5515702..63d428f4af 100644 --- a/packages/components/psammead-brand/package.json +++ b/packages/components/psammead-brand/package.json @@ -1,6 +1,6 @@ { "name": "@bbc/psammead-brand", - "version": "1.0.0", + "version": "1.0.1", "main": "dist/index.js", "description": "Provides the BBC News logo (as SVG), nested a hardcoded link to https://www.bbc.co.uk/news", "repository": { From bf0ead1df09e01cd34074cc710393ac3394e57fa Mon Sep 17 00:00:00 2001 From: sadick Date: Mon, 29 Apr 2019 09:32:05 +0300 Subject: [PATCH 4/4] Update CHANGELOG.md --- packages/components/psammead-brand/CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/components/psammead-brand/CHANGELOG.md b/packages/components/psammead-brand/CHANGELOG.md index d90655a8a2..be6a54ab76 100644 --- a/packages/components/psammead-brand/CHANGELOG.md +++ b/packages/components/psammead-brand/CHANGELOG.md @@ -3,7 +3,7 @@ | Version | Description | | ------- | ----------- | -| 1.0.1 | [PR#???](https://github.com/bbc/psammead/pull/???) Fail gracefully if brand svg is not provided | +| 1.0.1 | [PR#476](https://github.com/bbc/psammead/pull/476) Fail gracefully if brand svg is not provided | | 1.0.0 | [PR#457](https://github.com/bbc/psammead/pull/457) Enable passing of different svgs | | 0.3.4 | [PR#424](https://github.com/bbc/psammead/pull/424) Add Snyk badge to readme | | 0.3.3 | [PR#407](https://github.com/bbc/psammead/pull/407) Organise dependencies properly |