From 5be9feae4fb01e868c71005c97d29b0ad3d3bc97 Mon Sep 17 00:00:00 2001 From: Dennis K Date: Thu, 24 May 2018 12:51:24 +0200 Subject: [PATCH 1/4] PWA-334 wip --- libraries/common/components/Image/index.jsx | 1 + libraries/ui-shared/Availability/index.jsx | 2 +- libraries/ui-shared/FavoritesButton/index.jsx | 2 +- libraries/ui-shared/TaxDisclaimer/index.jsx | 10 ++++++---- themes/gmd | 2 +- 5 files changed, 10 insertions(+), 7 deletions(-) diff --git a/libraries/common/components/Image/index.jsx b/libraries/common/components/Image/index.jsx index 37c2848765..5c98aaa5f2 100644 --- a/libraries/common/components/Image/index.jsx +++ b/libraries/common/components/Image/index.jsx @@ -183,6 +183,7 @@ class Image extends Component { style={inlineStyles} alt={this.props.alt} role="presentation" + data-test-id="image" /> ); } diff --git a/libraries/ui-shared/Availability/index.jsx b/libraries/ui-shared/Availability/index.jsx index fea944f2f7..1a5cd93c75 100644 --- a/libraries/ui-shared/Availability/index.jsx +++ b/libraries/ui-shared/Availability/index.jsx @@ -35,7 +35,7 @@ const Availability = ({ } return ( -
+
{text}
); diff --git a/libraries/ui-shared/FavoritesButton/index.jsx b/libraries/ui-shared/FavoritesButton/index.jsx index 4c253b0cc4..8851b104e3 100644 --- a/libraries/ui-shared/FavoritesButton/index.jsx +++ b/libraries/ui-shared/FavoritesButton/index.jsx @@ -144,7 +144,7 @@ class FavoritesButton extends Component { aria-label={this.getLabel()} className={`${className} ${this.props.className}`} onClick={this.handleClick} - data-test-id="button" + data-test-id="favoriteButton" > ( showTaxDisclaimer ? ( - +
+ +
) : null ); diff --git a/themes/gmd b/themes/gmd index 9f13163847..4c95d7c128 160000 --- a/themes/gmd +++ b/themes/gmd @@ -1 +1 @@ -Subproject commit 9f131638472ca6d1ab2d4e035295b05eca53bdea +Subproject commit 4c95d7c1285b1ca96adacd7bd7b4e6ec2804779e From b00b947e7e89fc9742d97e16e1341cbcd00b3ce8 Mon Sep 17 00:00:00 2001 From: Dennis K Date: Fri, 25 May 2018 15:30:57 +0200 Subject: [PATCH 2/4] PWA-334 added test ids --- extensions/@shopgate-product-reviews | 2 +- extensions/@shopgate-tracking-ga-native | 2 +- libraries/ui-shared/PriceInfo/index.jsx | 1 + libraries/ui-shared/RatingStars/index.jsx | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/extensions/@shopgate-product-reviews b/extensions/@shopgate-product-reviews index 78da5b09f4..66db998561 160000 --- a/extensions/@shopgate-product-reviews +++ b/extensions/@shopgate-product-reviews @@ -1 +1 @@ -Subproject commit 78da5b09f493130e25f66e739eac3be79f4e0f7f +Subproject commit 66db998561ea364c5e833c92f6b41fd508a1e3e1 diff --git a/extensions/@shopgate-tracking-ga-native b/extensions/@shopgate-tracking-ga-native index 47d9081866..0fe6a14394 160000 --- a/extensions/@shopgate-tracking-ga-native +++ b/extensions/@shopgate-tracking-ga-native @@ -1 +1 @@ -Subproject commit 47d9081866cdf67eaa9c78cef728fd39468b304a +Subproject commit 0fe6a143942126398f3565bf0e22bb24e54a2de7 diff --git a/libraries/ui-shared/PriceInfo/index.jsx b/libraries/ui-shared/PriceInfo/index.jsx index 280d6aa3bf..19e79103b6 100644 --- a/libraries/ui-shared/PriceInfo/index.jsx +++ b/libraries/ui-shared/PriceInfo/index.jsx @@ -13,6 +13,7 @@ const PriceInfo = ({ className, text }) => (
); diff --git a/libraries/ui-shared/RatingStars/index.jsx b/libraries/ui-shared/RatingStars/index.jsx index 409b325cc2..56b03eb1da 100644 --- a/libraries/ui-shared/RatingStars/index.jsx +++ b/libraries/ui-shared/RatingStars/index.jsx @@ -145,7 +145,7 @@ class RatingStars extends Component { ]; return ( -
+
{emptyStars}
From 3965c3ce0b45c49138a0b16a49a2d8e8993833b6 Mon Sep 17 00:00:00 2001 From: Dennis K Date: Fri, 25 May 2018 17:47:51 +0200 Subject: [PATCH 3/4] PWA-334 updated snapshots --- .../components/Image/__snapshots__/spec.jsx.snap | 1 + .../Availability/__snapshots__/spec.jsx.snap | 3 +++ .../FavoritesButton/__snapshots__/spec.jsx.snap | 4 ++-- .../RatingStars/__snapshots__/spec.jsx.snap | 5 +++++ .../TaxDisclaimer/__snapshots__/spec.jsx.snap | 14 +++++++++----- themes/gmd | 2 +- themes/ios11 | 2 +- 7 files changed, 22 insertions(+), 9 deletions(-) diff --git a/libraries/common/components/Image/__snapshots__/spec.jsx.snap b/libraries/common/components/Image/__snapshots__/spec.jsx.snap index 7e337a7bab..cda76831ed 100644 --- a/libraries/common/components/Image/__snapshots__/spec.jsx.snap +++ b/libraries/common/components/Image/__snapshots__/spec.jsx.snap @@ -66,6 +66,7 @@ exports[` should render placeholders if src is null 1`] = ` {null} should render if state is "ok" when "showWhenAvailable >
Available
@@ -42,6 +43,7 @@ exports[` should render if state is "warning" 1`] = ` >
Only 5 left
@@ -57,6 +59,7 @@ exports[` should render if state is "warning" 2`] = ` >
Out of stock
diff --git a/libraries/ui-shared/FavoritesButton/__snapshots__/spec.jsx.snap b/libraries/ui-shared/FavoritesButton/__snapshots__/spec.jsx.snap index 240cea12ee..5d5932a3ef 100644 --- a/libraries/ui-shared/FavoritesButton/__snapshots__/spec.jsx.snap +++ b/libraries/ui-shared/FavoritesButton/__snapshots__/spec.jsx.snap @@ -32,7 +32,7 @@ exports[` should only render when no favorites set 1`] = `