test fixing progress

folio-org · Jan 9, 2024 · eac65db · eac65db
1 parent 907f93c
commit eac65db
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 8 deletions.
diff --git a/src/components/package/_fields/custom-coverage/package-coverage-fields.js b/src/components/package/_fields/custom-coverage/package-coverage-fields.js
@@ -15,6 +15,7 @@ import {
   Col,
   Row,
   dayjs,
+  getLocaleDateFormat,
 } from '@folio/stripes/components';
 import {
   BACKEND_DATE_STANDARD,
@@ -44,8 +45,9 @@ class PackageCoverageFields extends Component {
 
   validateCoverageDate = (value) => {
     const { intl } = this.props;
-    dayjs.locale(intl.locale);
-    const dateFormat = dayjs.localeData().longDateFormat('L');
+    // dayjs.locale(intl.locale);
+    // const dateFormat = dayjs.localeData().longDateFormat('L');
+    const dateFormat = getLocaleDateFormat({ intl });
     let errors;
 
     if (value && !dayjs.utc(value).isValid()) {

diff --git a/src/components/resource/_fields/validate-date-range.js b/src/components/resource/_fields/validate-date-range.js
@@ -2,16 +2,16 @@ import {
   FormattedMessage,
 } from 'react-intl';
 
-import { FormattedDate, dayjs, DayRange } from '@folio/stripes/components';
+import { FormattedDate, dayjs, DayRange, getLocaleDateFormat } from '@folio/stripes/components';
 
 /**
    * Validator to ensure begin date is present and entered dates are valid
    * @param {} dateRange - coverage date range to validate
    * @returns {} - an error object if errors are found, or `undefined` otherwise
    */
 const validateDateFormat = (dateRange, locale) => {
-  dayjs.locale(locale);
-  const dateFormat = dayjs.localeData().longDateFormat('L');
+  // dayjs.locale(locale);
+  const dateFormat = getLocaleDateFormat({ intl: { locale } });
   const message = <FormattedMessage id="ui-eholdings.validate.errors.dateRange.format" values={{ dateFormat }} />;
 
   if (!dateRange.beginCoverage || !dayjs.utc(dateRange.beginCoverage).isValid()) {
@@ -49,7 +49,7 @@ const validateNoRangeOverlaps = (dateRange, customCoverages, index) => {
 
   const beginCoverageDate = dayjs.utc(dateRange.beginCoverage);
   const endCoverageDate = dateRange.endCoverage ? dayjs.utc(dateRange.endCoverage) : present;
-  const coverageRange = dayjs.range(beginCoverageDate, endCoverageDate);
+  const coverageRange = new DayRange(beginCoverageDate, endCoverageDate);
 
   for (let overlapIndex = 0, len = customCoverages.length; overlapIndex < len; overlapIndex++) {
     const overlapRange = customCoverages[overlapIndex];
@@ -61,7 +61,7 @@ const validateNoRangeOverlaps = (dateRange, customCoverages, index) => {
 
     const overlapCoverageBeginDate = dayjs.utc(overlapRange.beginCoverage);
     const overlapCoverageEndDate = overlapRange.endCoverage ? dayjs.utc(overlapRange.endCoverage) : present;
-    const overlapCoverageRange = dayjs.range(overlapCoverageBeginDate, overlapCoverageEndDate);
+    const overlapCoverageRange = new DayRange(overlapCoverageBeginDate, overlapCoverageEndDate);
 
     const startDate =
       <FormattedDate

diff --git a/test/jest/__mock__/reactIntl.mock.js b/test/jest/__mock__/reactIntl.mock.js
@@ -1,6 +1,7 @@
 jest.mock('react-intl', () => {
   const intl = {
     formatMessage: ({ id }) => id,
+    locale: 'en'
   };
 
   return {

diff --git a/test/jest/helpers/harness.js b/test/jest/helpers/harness.js
@@ -50,7 +50,7 @@ const Harness = ({
         <RouteHistoryContext.Provider value={routeHistoryCtx}>
           <Provider store={store}>
             <QueryClientProvider client={queryClient}>
-              <IntlProvider>
+              <IntlProvider locale="en">
                 {children}
               </IntlProvider>
             </QueryClientProvider>