@financial-times/n-conversion-forms 45.0.0 → 45.2.0

package/.toolkitstate/ci.json

@@ -1,7 +1,7 @@
 {
   "branch": "",
   "repo": "n-conversion-forms",
-  "version": "af67cefb78210e23aab60a7c27b2a97b79880e2e",
-  "tag": "v45.0.0",
-  "buildNumber": "17972"
+  "version": "7cb3814b5ef6dccca5d29636c4cf6cf98eb37b52",
+  "tag": "v45.2.0",
+  "buildNumber": "18122"
 }

package/components/__snapshots__/confirmation.spec.js.snap

@@ -1,5 +1,102 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
+exports[`Confirmation renders appropriately if a confirmation email has been sent 1`] = `
+<div class="ncf ncf__wrapper">
+  <div class="ncf__center">
+    <div class="ncf__icon ncf__icon--tick ncf__icon--large">
+    </div>
+    <p class="ncf__paragraph--reduced-padding ncf__paragraph--subscription-confirmation">
+      You are now subscribed to:
+    </p>
+    <h1 class="ncf__header ncf__header--confirmation">
+    </h1>
+  </div>
+  <p class="ncf__paragraph">
+    We’ve sent confirmation to your email. Make sure you check your spam folder if you don’t receive it.
+  </p>
+  <p class="ncf__paragraph">
+    Here’s a summary of your  subscription:
+  </p>
+  <div class="ncf__headed-paragraph">
+    <h3 class="ncf__header">
+      Something not right?
+    </h3>
+    <p class="ncf__paragraph o3-type-body-base">
+      Go to your
+      <a href="https://www.ft.com/myaccount/personal-details"
+         target="_blank"
+         rel="noopener noreferrer"
+         data-trackable="yourAccount"
+      >
+        account settings
+      </a>
+      to view or edit your account. If you need to get in touch call us on
+      <a href="tel:+442077556248">
+        +44 (0) 207 755 6248
+      </a>
+      . Or contact us for additional support.
+    </p>
+  </div>
+  <p class="ncf__paragraph o3-type-body-base">
+    We will automatically renew your subscription using the payment method provided unless you cancel before your renewal date. See our
+    <a href="http://help.ft.com/help/legal-privacy/terms-conditions/"
+       target="_top"
+       rel="noopener"
+    >
+      Terms &amp; Conditions
+    </a>
+    for details on how to cancel.
+  </p>
+</div>
+`;
+
+exports[`Confirmation renders appropriately if a confirmation email has not been sent 1`] = `
+<div class="ncf ncf__wrapper">
+  <div class="ncf__center">
+    <div class="ncf__icon ncf__icon--tick ncf__icon--large">
+    </div>
+    <p class="ncf__paragraph--reduced-padding ncf__paragraph--subscription-confirmation">
+      You are now subscribed to:
+    </p>
+    <h1 class="ncf__header ncf__header--confirmation">
+    </h1>
+  </div>
+  <p class="ncf__paragraph">
+    Here’s a summary of your  subscription:
+  </p>
+  <div class="ncf__headed-paragraph">
+    <h3 class="ncf__header">
+      Something not right?
+    </h3>
+    <p class="ncf__paragraph o3-type-body-base">
+      Go to your
+      <a href="https://www.ft.com/myaccount/personal-details"
+         target="_blank"
+         rel="noopener noreferrer"
+         data-trackable="yourAccount"
+      >
+        account settings
+      </a>
+      to view or edit your account. If you need to get in touch call us on
+      <a href="tel:+442077556248">
+        +44 (0) 207 755 6248
+      </a>
+      . Or contact us for additional support.
+    </p>
+  </div>
+  <p class="ncf__paragraph o3-type-body-base">
+    We will automatically renew your subscription using the payment method provided unless you cancel before your renewal date. See our
+    <a href="http://help.ft.com/help/legal-privacy/terms-conditions/"
+       target="_top"
+       rel="noopener"
+    >
+      Terms &amp; Conditions
+    </a>
+    for details on how to cancel.
+  </p>
+</div>
+`;
+
 exports[`Confirmation renders appropriately if is 'Evergreen' subscription term type 1`] = `
 <div class="ncf ncf__wrapper">
   <div class="ncf__center">

package/components/__snapshots__/delivery-start-date.spec.js.snap

@@ -13,7 +13,7 @@ exports[`DeliveryStartDate renders with a custom date 1`] = `
       Start date
     </span>
     <span class="o-forms-title__prompt">
-      Earliest available delivery date: 5th November 2019
+      Earliest available start date: 5th November 2019
     </span>
   </span>
   <span class="o-forms-input o-forms-input--text">
@@ -51,7 +51,7 @@ exports[`DeliveryStartDate renders with a custom input max value 1`] = `
       Start date
     </span>
     <span class="o-forms-title__prompt">
-      Earliest available delivery date: 2
+      Earliest available start date: 2
     </span>
   </span>
   <span class="o-forms-input o-forms-input--text">
@@ -89,7 +89,7 @@ exports[`DeliveryStartDate renders with a custom input min value 1`] = `
       Start date
     </span>
     <span class="o-forms-title__prompt">
-      Earliest available delivery date:
+      Earliest available start date:
     </span>
   </span>
   <span class="o-forms-input o-forms-input--text">
@@ -127,7 +127,7 @@ exports[`DeliveryStartDate renders with a custom input value 1`] = `
       Start date
     </span>
     <span class="o-forms-title__prompt">
-      Earliest available delivery date:
+      Earliest available start date:
     </span>
   </span>
   <span class="o-forms-input o-forms-input--text">
@@ -164,7 +164,7 @@ exports[`DeliveryStartDate renders with a disabled input 1`] = `
       Start date
     </span>
     <span class="o-forms-title__prompt">
-      Earliest available delivery date:
+      Earliest available start date:
     </span>
   </span>
   <span class="o-forms-input o-forms-input--text">
@@ -202,7 +202,7 @@ exports[`DeliveryStartDate renders with an error 1`] = `
       Start date
     </span>
     <span class="o-forms-title__prompt">
-      Earliest available delivery date:
+      Earliest available start date:
     </span>
   </span>
   <span class="o-forms-input o-forms-input--text o-forms-input--invalid">
@@ -239,7 +239,7 @@ exports[`DeliveryStartDate renders with appropriate start message when isAddress
       Start date
     </span>
     <span class="o-forms-title__prompt">
-      Earliest available delivery date:
+      Earliest available start date:
     </span>
   </span>
   <span class="o-forms-input o-forms-input--text">
@@ -263,6 +263,43 @@ exports[`DeliveryStartDate renders with appropriate start message when isAddress
 </label>
 `;
 
+exports[`DeliveryStartDate renders with appropriate start message when isPaperVoucherDeliveryOptionOnly 1`] = `
+<label id="deliveryStartDateField"
+       class="o-forms-field ncf__validation-error"
+       data-validate="required"
+       for="deliveryStartDate"
+>
+  <span class="o-forms-title">
+    <span class="o-forms-title__main"
+          id="start-date-picker-title-span"
+    >
+      Start date
+    </span>
+    <span class="o-forms-title__prompt">
+      Earliest available start date:
+    </span>
+  </span>
+  <span class="o-forms-input o-forms-input--text">
+    <input type="date"
+           id="deliveryStartDate"
+           name="deliveryStartDate"
+           data-trackable="field-deliveryStartDate"
+           aria-required="true"
+           required
+           value
+    >
+    <span class="o-forms-input__error">
+      Please select a valid start date
+    </span>
+  </span>
+  <p>
+    Your vouchers will be valid from:
+    <strong class="js-start-date-text">
+    </strong>
+  </p>
+</label>
+`;
+
 exports[`DeliveryStartDate renders with country different than default 1`] = `
 <label id="deliveryStartDateField"
        class="o-forms-field ncf__validation-error"
@@ -276,7 +313,7 @@ exports[`DeliveryStartDate renders with country different than default 1`] = `
       Start date
     </span>
     <span class="o-forms-title__prompt">
-      Earliest available delivery date:
+      Earliest available start date:
     </span>
   </span>
   <span class="o-forms-input o-forms-input--text">
@@ -313,7 +350,7 @@ exports[`DeliveryStartDate renders with default props 1`] = `
       Start date
     </span>
     <span class="o-forms-title__prompt">
-      Earliest available delivery date:
+      Earliest available start date:
     </span>
   </span>
   <span class="o-forms-input o-forms-input--text">

package/components/confirmation.jsx

@@ -8,6 +8,7 @@ export function Confirmation({
 	isTrial = false,
 	isB2cPartnership = false,
 	b2cPartnershipCopy = [],
+	sendConfirmationEmail = true,
 	isEvergreenSubscriptionTermType = true,
 	offer = '',
 	email = EMAIL_DEFAULT_TEXT,
@@ -69,7 +70,7 @@ export function Confirmation({
 			</div>
 
 			{nextActionTop}
-			{!isB2cPartnershipCopyAvailable && (
+			{sendConfirmationEmail && !isB2cPartnershipCopyAvailable && (
 				<p className="ncf__paragraph">
 					We’ve sent confirmation to {email}. Make sure you check your spam
 					folder if you don’t receive it.
@@ -136,6 +137,7 @@ Confirmation.propTypes = {
 	isTrial: PropTypes.bool,
 	isB2cPartnership: PropTypes.bool,
 	b2cPartnershipCopy: PropTypes.array,
+	sendConfirmationEmail: PropTypes.bool,
 	isEvergreenSubscriptionTermType: PropTypes.bool,
 	offer: PropTypes.string.isRequired,
 	email: PropTypes.string,

package/components/confirmation.spec.js

@@ -41,7 +41,23 @@ describe('Confirmation', () => {
 	it("renders appropriately if is 'Termed' subscription term type", () => {
 		const props = {
 			isEvergreenSubscriptionTermType: false,
-			isTermedSubscriptionTermType: true,
+			isTermedSubscriptionTermType: false,
+		};
+
+		expect(Confirmation).toRenderCorrectly(props);
+	});
+
+	it('renders appropriately if a confirmation email has been sent', () => {
+		const props = {
+			sendConfirmationEmail: true,
+		};
+
+		expect(Confirmation).toRenderCorrectly(props);
+	});
+
+	it('renders appropriately if a confirmation email has not been sent', () => {
+		const props = {
+			sendConfirmationEmail: false,
 		};
 
 		expect(Confirmation).toRenderCorrectly(props);

package/components/confirmation.stories.js

@@ -65,6 +65,7 @@ Basic.args = {
 
 export const TermedSubscriptionTermType = (args) => <Confirmation {...args} />;
 TermedSubscriptionTermType.args = {
+	sendConfirmationEmail: false,
 	isTermedSubscriptionTermType: true,
 	offer: 'Single-term subscription',
 	details: [

package/components/delivery-option.jsx

@@ -10,6 +10,8 @@ export function DeliveryOption({
 	productCode = undefined,
 	options = [],
 	isSingle = false,
+	isEvergreenSubscriptionTermType = true,
+	isTermedSubscriptionTermType = false,
 }) {
 	const divClassName = classNames([
 		'o-forms-field',
@@ -34,6 +36,8 @@ export function DeliveryOption({
 						option,
 						shippingZone,
 						countryCode,
+						isEvergreenSubscriptionTermType,
+						isTermedSubscriptionTermType,
 					});
 
 					if (!isValidDeliveryOption || !deliveryOptionValue) {
@@ -96,4 +100,6 @@ DeliveryOption.propTypes = {
 		})
 	),
 	isSingle: PropTypes.bool,
+	isEvergreenSubscriptionTermType: PropTypes.bool,
+	isTermedSubscriptionTermType: PropTypes.bool,
 };

package/components/delivery-option.stories.js

@@ -34,6 +34,40 @@ Basic.args = {
 	],
 };
 
+export const UKPaperVoucherEvergreenDeliveryOptions = (args) => (
+	<div className="ncf">
+		<DeliveryOption {...args} />
+	</div>
+);
+UKPaperVoucherEvergreenDeliveryOptions.args = {
+	country: 'GBR',
+	options: [
+		{
+			value: 'PV',
+			isValidDeliveryOption: true,
+		},
+	],
+	isEvergreenSubscriptionTermType: true,
+	isTermedSubscriptionTermType: false,
+};
+
+export const UKPaperVoucherTermedDeliveryOptions = (args) => (
+	<div className="ncf">
+		<DeliveryOption {...args} />
+	</div>
+);
+UKPaperVoucherTermedDeliveryOptions.args = {
+	country: 'GBR',
+	options: [
+		{
+			value: 'PV',
+			isValidDeliveryOption: true,
+		},
+	],
+	isEvergreenSubscriptionTermType: false,
+	isTermedSubscriptionTermType: true,
+};
+
 export const UnitedStates5or6DaysWeekDeliveryOptions = (args) => (
 	<div className="ncf">
 		<DeliveryOption {...args} />

package/components/delivery-start-date.jsx

@@ -10,6 +10,7 @@ export function DeliveryStartDate({
 	max = null,
 	isDisabled = false,
 	isAddressUpdate = false,
+	isPaperVoucherDeliveryOptionOnly = false,
 }) {
 	const inputWrapperClassNames = classNames([
 		'o-forms-input',
@@ -30,9 +31,11 @@ export function DeliveryStartDate({
 		defaultValue: value,
 	};
 
-	const startMessage = isAddressUpdate
-		? 'We’ll start delivering to this address from:'
-		: 'The first print edition you will receive is:';
+	const startMessage = isPaperVoucherDeliveryOptionOnly
+		? 'Your vouchers will be valid from:'
+		: isAddressUpdate
+			? 'We’ll start delivering to this address from:'
+			: 'The first print edition you will receive is:';
 
 	return (
 		<label
@@ -46,7 +49,7 @@ export function DeliveryStartDate({
 					Start date
 				</span>
 				<span className="o-forms-title__prompt">
-					Earliest available delivery date: {date}
+					Earliest available start date: {date}
 				</span>
 			</span>
 
@@ -72,4 +75,5 @@ DeliveryStartDate.propTypes = {
 	max: PropTypes.string,
 	isDisabled: PropTypes.bool,
 	isAddressUpdate: PropTypes.bool,
+	isPaperVoucherDeliveryOptionOnly: PropTypes.bool,
 };

package/components/delivery-start-date.spec.js

@@ -52,6 +52,12 @@ describe('DeliveryStartDate', () => {
 		expect(DeliveryStartDate).toRenderCorrectly(props);
 	});
 
+	it('renders with appropriate start message when isPaperVoucherDeliveryOptionOnly', () => {
+		const props = { isPaperVoucherDeliveryOptionOnly: true };
+
+		expect(DeliveryStartDate).toRenderCorrectly(props);
+	});
+
 	it('renders with country different than default', () => {
 		const props = { country: 'USA' };
 

package/dist/confirmation.jsx

@@ -18,6 +18,8 @@ function Confirmation(_ref) {
     isB2cPartnership = _ref$isB2cPartnership === void 0 ? false : _ref$isB2cPartnership,
     _ref$b2cPartnershipCo = _ref.b2cPartnershipCopy,
     b2cPartnershipCopy = _ref$b2cPartnershipCo === void 0 ? [] : _ref$b2cPartnershipCo,
+    _ref$sendConfirmation = _ref.sendConfirmationEmail,
+    sendConfirmationEmail = _ref$sendConfirmation === void 0 ? true : _ref$sendConfirmation,
     _ref$isEvergreenSubsc = _ref.isEvergreenSubscriptionTermType,
     isEvergreenSubscriptionTermType = _ref$isEvergreenSubsc === void 0 ? true : _ref$isEvergreenSubsc,
     _ref$offer = _ref.offer,
@@ -72,7 +74,7 @@ function Confirmation(_ref) {
     className: "ncf__paragraph--reduced-padding ncf__paragraph--subscription-confirmation"
   }, "You are now subscribed to:"), /*#__PURE__*/_react["default"].createElement("h1", {
     className: "ncf__header ncf__header--confirmation"
-  }, offer)), nextActionTop, !isB2cPartnershipCopyAvailable && /*#__PURE__*/_react["default"].createElement("p", {
+  }, offer)), nextActionTop, sendConfirmationEmail && !isB2cPartnershipCopyAvailable && /*#__PURE__*/_react["default"].createElement("p", {
     className: "ncf__paragraph"
   }, "We\u2019ve sent confirmation to ", email, ". Make sure you check your spam folder if you don\u2019t receive it."), isB2cPartnershipCopyAvailable ? /*#__PURE__*/_react["default"].createElement("p", {
     className: "ncf__paragraph"
@@ -105,6 +107,7 @@ Confirmation.propTypes = {
   isTrial: _propTypes["default"].bool,
   isB2cPartnership: _propTypes["default"].bool,
   b2cPartnershipCopy: _propTypes["default"].array,
+  sendConfirmationEmail: _propTypes["default"].bool,
   isEvergreenSubscriptionTermType: _propTypes["default"].bool,
   offer: _propTypes["default"].string.isRequired,
   email: _propTypes["default"].string,

package/dist/delivery-option.jsx

@@ -19,7 +19,11 @@ function DeliveryOption(_ref) {
     _ref$options = _ref.options,
     options = _ref$options === void 0 ? [] : _ref$options,
     _ref$isSingle = _ref.isSingle,
-    isSingle = _ref$isSingle === void 0 ? false : _ref$isSingle;
+    isSingle = _ref$isSingle === void 0 ? false : _ref$isSingle,
+    _ref$isEvergreenSubsc = _ref.isEvergreenSubscriptionTermType,
+    isEvergreenSubscriptionTermType = _ref$isEvergreenSubsc === void 0 ? true : _ref$isEvergreenSubsc,
+    _ref$isTermedSubscrip = _ref.isTermedSubscriptionTermType,
+    isTermedSubscriptionTermType = _ref$isTermedSubscrip === void 0 ? false : _ref$isTermedSubscrip;
   var divClassName = (0, _classnames["default"])(['o-forms-field', 'ncf__delivery-option', {
     'ncf__delivery-option--single': isSingle
   }]);
@@ -39,7 +43,9 @@ function DeliveryOption(_ref) {
       productCode: productCode,
       option: option,
       shippingZone: shippingZone,
-      countryCode: countryCode
+      countryCode: countryCode,
+      isEvergreenSubscriptionTermType: isEvergreenSubscriptionTermType,
+      isTermedSubscriptionTermType: isTermedSubscriptionTermType
     });
     if (!isValidDeliveryOption || !deliveryOptionValue) {
       return null;
@@ -81,5 +87,7 @@ DeliveryOption.propTypes = {
     flightMarket: _propTypes["default"].bool,
     mailDelivery: _propTypes["default"].bool
   })),
-  isSingle: _propTypes["default"].bool
+  isSingle: _propTypes["default"].bool,
+  isEvergreenSubscriptionTermType: _propTypes["default"].bool,
+  isTermedSubscriptionTermType: _propTypes["default"].bool
 };

package/dist/delivery-start-date.jsx

@@ -25,7 +25,9 @@ function DeliveryStartDate(_ref) {
     _ref$isDisabled = _ref.isDisabled,
     isDisabled = _ref$isDisabled === void 0 ? false : _ref$isDisabled,
     _ref$isAddressUpdate = _ref.isAddressUpdate,
-    isAddressUpdate = _ref$isAddressUpdate === void 0 ? false : _ref$isAddressUpdate;
+    isAddressUpdate = _ref$isAddressUpdate === void 0 ? false : _ref$isAddressUpdate,
+    _ref$isPaperVoucherDe = _ref.isPaperVoucherDeliveryOptionOnly,
+    isPaperVoucherDeliveryOptionOnly = _ref$isPaperVoucherDe === void 0 ? false : _ref$isPaperVoucherDe;
   var inputWrapperClassNames = (0, _classnames["default"])(['o-forms-input', 'o-forms-input--text', {
     'o-forms-input--invalid': hasError
   }]);
@@ -44,7 +46,7 @@ function DeliveryStartDate(_ref) {
     disabled: isDisabled,
     defaultValue: value
   });
-  var startMessage = isAddressUpdate ? 'We’ll start delivering to this address from:' : 'The first print edition you will receive is:';
+  var startMessage = isPaperVoucherDeliveryOptionOnly ? 'Your vouchers will be valid from:' : isAddressUpdate ? 'We’ll start delivering to this address from:' : 'The first print edition you will receive is:';
   return /*#__PURE__*/_react["default"].createElement("label", {
     id: "deliveryStartDateField",
     className: "o-forms-field ncf__validation-error",
@@ -57,7 +59,7 @@ function DeliveryStartDate(_ref) {
     id: "start-date-picker-title-span"
   }, "Start date"), /*#__PURE__*/_react["default"].createElement("span", {
     className: "o-forms-title__prompt"
-  }, "Earliest available delivery date: ", date)), /*#__PURE__*/_react["default"].createElement("span", {
+  }, "Earliest available start date: ", date)), /*#__PURE__*/_react["default"].createElement("span", {
     className: inputWrapperClassNames
   }, /*#__PURE__*/_react["default"].createElement("input", inputProps), /*#__PURE__*/_react["default"].createElement("span", {
     className: "o-forms-input__error"
@@ -73,5 +75,6 @@ DeliveryStartDate.propTypes = {
   min: _propTypes["default"].string,
   max: _propTypes["default"].string,
   isDisabled: _propTypes["default"].bool,
-  isAddressUpdate: _propTypes["default"].bool
+  isAddressUpdate: _propTypes["default"].bool,
+  isPaperVoucherDeliveryOptionOnly: _propTypes["default"].bool
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@financial-times/n-conversion-forms",
-  "version": "45.0.0",
+  "version": "45.2.0",
   "description": "Containing jsx components and styles for forms included on Accounts and Acquisition apps (next-signup, next-profile, next-retention, etc).",
   "main": "./dist/index.js",
   "scripts": {

package/utils/delivery-option-messages.js

@@ -28,27 +28,44 @@ const USA_COUNTRY_CODE = 'USA';
 const countryCodeToCustomDeliveryOptionsMap = {
 	[JAPAN_COUNTRY_CODE]: {
 		HD: {
-			description:
+			description: () =>
 				'Enjoy delivery of the newspaper to your home or office address.',
 		},
 		ML: {
-			description:
+			description: () =>
 				'Enjoy delivery of the newspaper to your home or office address.',
 		},
 	},
 	[UK_COUNTRY_CODE]: {
 		PV: {
 			title: 'Paper vouchers',
-			description:
-				'13-week voucher pack delivered quarterly and redeemable at retailers nationwide.',
+			description: ({
+				isEvergreenSubscriptionTermType,
+				isTermedSubscriptionTermType,
+			}) => {
+				if (isEvergreenSubscriptionTermType) {
+					return '13-week voucher pack delivered quarterly and redeemable at retailers nationwide.';
+				}
+
+				if (isTermedSubscriptionTermType) {
+					// Note: This wording relates to a specific offer: UK Retail Sampling
+					// • Production environment offer ID: f9f6383d-98fd-4655-9bc8-2b22bfda8bab
+					// • Test environment offer ID: 83fd2c19-2899-4e59-8929-aeb1e0cae096
+					// Should in the future there be additional offers for
+					// Termed subscriptions then this approach will need to be revised.
+					return '6 flexible vouchers that can be exchanged for a copy of FT Weekend over a 13-week period at retailers nationwide.';
+				}
+
+				return '';
+			},
 		},
 		HD: {
 			title: 'Hand delivery',
-			description: 'Free delivery to your home or office before 7am.',
+			description: () => 'Free delivery to your home or office before 7am.',
 		},
 		EV: {
 			title: 'Electronic vouchers',
-			description:
+			description: () =>
 				'Delivered via email and card, redeemable at retailers nationwide.',
 		},
 	},
@@ -309,12 +326,33 @@ function findCustomDeliveryOption(productCode, option, shippingZone) {
 	return deliveryOption;
 }
 
-function getDeliveryOption({ productCode, option, shippingZone, countryCode }) {
+function getDeliveryOption({
+	productCode,
+	option,
+	shippingZone,
+	countryCode,
+	isEvergreenSubscriptionTermType,
+	isTermedSubscriptionTermType,
+}) {
+	let deliveryOption;
+
 	// Custom delivery messages are displayed for certain countries
 	if (
 		Object.keys(countryCodeToCustomDeliveryOptionsMap).includes(countryCode)
 	) {
-		return countryCodeToCustomDeliveryOptionsMap[countryCode][option.value];
+		deliveryOption =
+			countryCodeToCustomDeliveryOptionsMap[countryCode][option.value];
+
+		const normalisedDeliveryOption = {
+			...deliveryOption,
+			// Set `description` value as string returned from function.
+			description: deliveryOption?.description({
+				isEvergreenSubscriptionTermType,
+				isTermedSubscriptionTermType,
+			}),
+		};
+
+		return normalisedDeliveryOption;
 	}
 
 	return (

package/utils/delivery-option-messages.spec.js

@@ -141,8 +141,70 @@ describe('Find Custom Delivery Option', () => {
 		});
 	});
 
-	describe('Find UK Delivery Option', () => {
-		it('returns UK EV delivery option', () => {
+	describe('find UK Paper Vouchers delivery option', () => {
+		describe('Evergreen (i.e. recurring) subscription term type', () => {
+			it('returns UK Paper Vouchers delivery option for Evergreen subscription term type', () => {
+				const expected = {
+					title: 'Paper vouchers',
+					description:
+						'13-week voucher pack delivered quarterly and redeemable at retailers nationwide.',
+				};
+
+				const deliveryOption = getDeliveryOption({
+					productCode: sixDaysProductCode,
+					option: { value: 'PV' },
+					shippingZone: 'GBR',
+					countryCode: 'GBR',
+					isEvergreenSubscriptionTermType: true,
+					isTermedSubscriptionTermType: false,
+				});
+
+				expect(deliveryOption).toEqual(expected);
+			});
+		});
+
+		describe('Termed (i.e. single-term) subscription term type', () => {
+			it('returns UK Paper Vouchers delivery option for Termed subscription term type', () => {
+				const expected = {
+					title: 'Paper vouchers',
+					description:
+						'6 flexible vouchers that can be exchanged for a copy of FT Weekend over a 13-week period at retailers nationwide.',
+				};
+
+				const deliveryOption = getDeliveryOption({
+					productCode: sixDaysProductCode,
+					option: { value: 'PV' },
+					shippingZone: 'GBR',
+					countryCode: 'GBR',
+					isEvergreenSubscriptionTermType: false,
+					isTermedSubscriptionTermType: true,
+				});
+
+				expect(deliveryOption).toEqual(expected);
+			});
+		});
+	});
+
+	describe('find UK Hand delivery option', () => {
+		it('returns UK Hand delivery option', () => {
+			const expected = {
+				title: 'Hand delivery',
+				description: 'Free delivery to your home or office before 7am.',
+			};
+
+			const deliveryOption = getDeliveryOption({
+				productCode: sixDaysProductCode,
+				option: { value: 'HD' },
+				shippingZone: 'GBR',
+				countryCode: 'GBR',
+			});
+
+			expect(deliveryOption).toEqual(expected);
+		});
+	});
+
+	describe('find UK Electronic Vouchers delivery option', () => {
+		it('returns UK Electronic Vouchers delivery option', () => {
 			const expected = {
 				title: 'Electronic vouchers',
 				description: