Merge pull request #785 from Financial-Times/chore--update-deps-feb-24

chore: update deps and fix ESlint issues
Financial-Times · Feb 9, 2024 · c7bf91f · c7bf91f
2 parents 321a6a0 + b82d55c
commit c7bf91f
Show file tree

Hide file tree

Showing 35 changed files with 8,716 additions and 8,608 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -1,7 +1,7 @@
 # CONFIG GENERATED BY DOTCOM-TOOL-KIT, DO NOT EDIT BY HAND
 version: 2.1
 orbs:
-  tool-kit: financial-times/dotcom-tool-kit@4
+  tool-kit: financial-times/dotcom-tool-kit@5
 executors:
   node:
     docker:
@@ -31,8 +31,6 @@ workflows:
           filters:
             branches:
               only: /(^renovate-.*|^nori/.*)/
-            tags:
-              only: /^v\d+\.\d+\.\d+(-.+)?/
       - tool-kit/setup:
           name: tool-kit/setup-<< matrix.executor >>
           requires:

diff --git a/.eslintrc.js b/.eslintrc.js
@@ -1,11 +1,13 @@
 module.exports = {
 	extends: [
-        "@financial-times/eslint-config-next",
-        "plugin:prettier/recommended",
-        "plugin:storybook/recommended"
+		"@financial-times/eslint-config-next",
+		"plugin:prettier/recommended",
+		"plugin:storybook/recommended",
+		"plugin:jest/recommended",
+		"plugin:jest/style"
     ],
 	rules: {
 		'prettier/prettier': 'error',
 	},
-	plugins: ['prettier'],
+	plugins: ['prettier','jest'],
 };
diff --git a/components/accept-terms-subscription.spec.js b/components/accept-terms-subscription.spec.js
@@ -81,13 +81,13 @@ describe('AcceptTermsSubscription', () => {
 		const transitionTerms2 = component.find('.terms-transition').at(1);
 		const transitionTerms3 = component.find('.terms-transition').at(2);
 
-		expect(transitionTerms1.text()).toEqual(
+		expect(transitionTerms1.text()).toBe(
 			'I give consent for the chosen payment method to be charged automatically.'
 		);
-		expect(transitionTerms2.text()).toEqual(
+		expect(transitionTerms2.text()).toBe(
 			'By placing your order subject to the Terms & Conditions (save for section 2) referred to below, you are waiving your statutory right to cancel our contract within 14 days of payment. Your payment is a one-time payment collected at the time of checkout, and unsubscribing or cancelling at any point (whether before or after the 14-day period) will not entitle you to a refund.'
 		);
-		expect(transitionTerms3.text()).toEqual(
+		expect(transitionTerms3.text()).toBe(
 			'Please see here for the complete Terms & Conditions.'
 		);
 	});

diff --git a/components/company-name.spec.js b/components/company-name.spec.js
@@ -69,17 +69,15 @@ describe('CompanyName', () => {
 
 		const component = mount(CompanyName(props));
 
-		expect(component.find('.o-forms-title__main').text()).toEqual(
-			'Company name'
-		);
+		expect(component.find('.o-forms-title__main').text()).toBe('Company name');
 	});
 
 	it('renders with custom label wording', () => {
 		const props = { fieldLabel: 'Organisation name' };
 
 		const component = mount(CompanyName(props));
 
-		expect(component.find('.o-forms-title__main').text()).toEqual(
+		expect(component.find('.o-forms-title__main').text()).toBe(
 			'Organisation name'
 		);
 	});

diff --git a/components/delivery-security-instructions.spec.js b/components/delivery-security-instructions.spec.js
@@ -10,7 +10,7 @@ describe('DeliverySecurityInstructions', () => {
 			wrapper = shallow(<DeliverySecurityInstructions />);
 		});
 
-		test('contains textAreaProps id set to default: deliverySecurityInstructionsField ', () => {
+		test('contains textAreaProps id set to default: deliverySecurityInstructionsField', () => {
 			expect(wrapper.prop('id')).toBe('deliverySecurityInstructionsField');
 		});
 
@@ -55,11 +55,11 @@ describe('DeliverySecurityInstructions', () => {
 			});
 
 			it('does not set maxLength when no value is given', () => {
-				expect(textAreaProps.maxLength).toBeUndefined;
+				expect(textAreaProps.maxLength).toBeUndefined();
 			});
 
 			it('does not set rows when no value is given', () => {
-				expect(textAreaProps.rows).toBeUndefined;
+				expect(textAreaProps.rows).toBeUndefined();
 			});
 
 			it('sets data-trackable to field-deliverySecurityInstructions', () => {
@@ -75,11 +75,11 @@ describe('DeliverySecurityInstructions', () => {
 			});
 
 			it('sets disabled to false', () => {
-				expect(textAreaProps.disabled).toBeFalse;
+				expect(textAreaProps.disabled).toBe(false);
 			});
 
 			it('does not set value when no value is given', () => {
-				expect(textAreaProps.defaultValue).toBeUndefined;
+				expect(textAreaProps.defaultValue).toBe('');
 			});
 		});
 
@@ -117,7 +117,7 @@ describe('DeliverySecurityInstructions', () => {
 			});
 
 			it('sets disabled to true', () => {
-				expect(textAreaProps.disabled).toBeTrue;
+				expect(textAreaProps.disabled).toBe(true);
 			});
 
 			it('sets value', () => {

diff --git a/components/graduation-date.spec.js b/components/graduation-date.spec.js
@@ -86,13 +86,13 @@ describe('GraduationDate', () => {
 		const wrapper = shallow(<GraduationDate value="2020-08-28" />);
 
 		it('sets the default month', () => {
-			expect(wrapper.find('#graduationDateMonth').prop('defaultValue')).toEqual(
+			expect(wrapper.find('#graduationDateMonth').prop('defaultValue')).toBe(
 				'08'
 			);
 		});
 
 		it('sets the default year', () => {
-			expect(wrapper.find('#graduationDateYear').prop('defaultValue')).toEqual(
+			expect(wrapper.find('#graduationDateYear').prop('defaultValue')).toBe(
 				'2020'
 			);
 		});

diff --git a/components/industry.spec.js b/components/industry.spec.js
@@ -71,7 +71,7 @@ describe('Industry', () => {
 
 		const component = mount(Industry(props));
 
-		expect(component.find('.o-forms-title__main').text()).toEqual(
+		expect(component.find('.o-forms-title__main').text()).toBe(
 			'In which industry do you work?'
 		);
 	});
@@ -81,15 +81,15 @@ describe('Industry', () => {
 
 		const component = mount(Industry(props));
 
-		expect(component.find('.o-forms-title__main').text()).toEqual('Industry');
+		expect(component.find('.o-forms-title__main').text()).toBe('Industry');
 	});
 
 	it('renders with optional title class, when not required', () => {
 		const props = { isRequired: false };
 		const component = mount(Industry(props));
 
 		expect(
-			component.find('.o-forms-title.o-forms-field--optional').length
-		).toEqual(1);
+			component.find('.o-forms-title.o-forms-field--optional')
+		).toHaveLength(1);
 	});
 });
diff --git a/components/job-title.spec.js b/components/job-title.spec.js
@@ -64,7 +64,7 @@ describe('JobTitle', () => {
 		const component = mount(JobTitle(props));
 
 		expect(
-			component.find('.o-forms-title.o-forms-field--optional').length
-		).toEqual(1);
+			component.find('.o-forms-title.o-forms-field--optional')
+		).toHaveLength(1);
 	});
 });
diff --git a/components/payment-term.spec.js b/components/payment-term.spec.js
@@ -331,7 +331,7 @@ describe('PaymentTerm', () => {
 				},
 			];
 			const wrapper = shallow(<PaymentTerm options={options} />);
-			expect(wrapper.find('input').prop('data-base-amount')).toEqual(100);
+			expect(wrapper.find('input').prop('data-base-amount')).toBe(100);
 		});
 
 		it('renders option.trialAmount as data-base-amount if isTrial is true', () => {
@@ -347,7 +347,7 @@ describe('PaymentTerm', () => {
 				},
 			];
 			const wrapper = shallow(<PaymentTerm options={options} />);
-			expect(wrapper.find('input').prop('data-base-amount')).toEqual(1);
+			expect(wrapper.find('input').prop('data-base-amount')).toBe(1);
 		});
 	});
 

diff --git a/components/personal-title.spec.js b/components/personal-title.spec.js
@@ -71,25 +71,23 @@ describe('PersonalTitle', () => {
 
 		const component = mount(PersonalTitle(props));
 
-		expect(component.find('.o-forms-title__main').text()).toEqual('Title');
+		expect(component.find('.o-forms-title__main').text()).toBe('Title');
 	});
 
 	it('renders with custom label wording', () => {
 		const props = { fieldLabel: 'PersonalTitle' };
 
 		const component = mount(PersonalTitle(props));
 
-		expect(component.find('.o-forms-title__main').text()).toEqual(
-			'PersonalTitle'
-		);
+		expect(component.find('.o-forms-title__main').text()).toBe('PersonalTitle');
 	});
 
 	it('renders with optional title class, when not required', () => {
 		const props = { isRequired: false };
 		const component = mount(PersonalTitle(props));
 
 		expect(
-			component.find('.o-forms-title.o-forms-field--optional').length
-		).toEqual(1);
+			component.find('.o-forms-title.o-forms-field--optional')
+		).toHaveLength(1);
 	});
 });
diff --git a/components/phone.spec.js b/components/phone.spec.js
@@ -55,7 +55,7 @@ describe('Phone', () => {
 		const component = mount(Phone(props));
 
 		expect(
-			component.find('.o-forms-title.o-forms-field--optional').length
-		).toEqual(1);
+			component.find('.o-forms-title.o-forms-field--optional')
+		).toHaveLength(1);
 	});
 });
diff --git a/components/position.spec.js b/components/position.spec.js
@@ -65,7 +65,7 @@ describe('Position', () => {
 		const component = mount(Position(props));
 
 		expect(
-			component.find('.o-forms-title.o-forms-field--optional').length
-		).toEqual(1);
+			component.find('.o-forms-title.o-forms-field--optional')
+		).toHaveLength(1);
 	});
 });
diff --git a/components/responsibility.spec.js b/components/responsibility.spec.js
@@ -71,7 +71,7 @@ describe('Responsibility', () => {
 		const component = mount(Responsibility(props));
 
 		expect(
-			component.find('.o-forms-title.o-forms-field--optional').length
-		).toEqual(1);
+			component.find('.o-forms-title.o-forms-field--optional')
+		).toHaveLength(1);
 	});
 });
diff --git a/components/text-input.spec.js b/components/text-input.spec.js
@@ -31,7 +31,7 @@ describe('Text Input', () => {
 		const errorMsg = component.find('.o-forms-input__error');
 
 		expect(element.exists()).toBe(true);
-		expect(errorMsg.text()).toEqual('Invalid value');
+		expect(errorMsg.text()).toBe('Invalid value');
 	});
 
 	it('renders a field with custom input id', () => {
@@ -59,7 +59,7 @@ describe('Text Input', () => {
 		const component = mount(TextInput(props));
 		const element = component.find('input');
 
-		expect(element.prop('defaultValue')).toEqual('foobar');
+		expect(element.prop('defaultValue')).toBe('foobar');
 	});
 
 	it('renders with disabled input', () => {
@@ -77,7 +77,7 @@ describe('Text Input', () => {
 		const component = mount(TextInput(props));
 		const label = component.find('.o-forms-title__main');
 
-		expect(label.text()).toEqual('');
+		expect(label.text()).toBe('');
 	});
 
 	it('renders with custom label wording', () => {
@@ -86,7 +86,7 @@ describe('Text Input', () => {
 		const component = mount(TextInput(props));
 		const label = component.find('.o-forms-title__main');
 
-		expect(label.text()).toEqual('Code');
+		expect(label.text()).toBe('Code');
 	});
 
 	it('renders with custom description wording', () => {
@@ -95,7 +95,7 @@ describe('Text Input', () => {
 		const component = mount(TextInput(props));
 		const description = component.find('.o-forms-title__prompt');
 
-		expect(description.text()).toEqual('Description text');
+		expect(description.text()).toBe('Description text');
 	});
 
 	it('renders as required field', () => {

diff --git a/helpers/ncf-countries.spec.js b/helpers/ncf-countries.spec.js
@@ -48,7 +48,7 @@ describe('ncf-countries', () => {
 
 			expect(
 				context.countries.find((country) => country.selected)
-			).not.toBeDefined();
+			).toBeUndefined();
 		});
 
 		it('does not mark any countries selected if incorrect value passed', () => {
@@ -57,7 +57,7 @@ describe('ncf-countries', () => {
 
 			expect(
 				context.countries.find((country) => country.selected)
-			).not.toBeDefined();
+			).toBeUndefined();
 		});
 
 		it('marks a country as selected if value matches code', () => {