test: fixing existing release date tests

sanity-io · Jan 24, 2025 · 064be01 · 064be01
1 parent 3b4cd31
commit 064be01
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 10 deletions.
diff --git a/packages/sanity/src/core/components/inputs/DateInputs/calendar/Calendar.tsx b/packages/sanity/src/core/components/inputs/DateInputs/calendar/Calendar.tsx
@@ -234,12 +234,14 @@ export const Calendar = forwardRef(function Calendar(
                   icon={ChevronLeftIcon}
                   mode="bleed"
                   onClick={() => moveFocusedDate(-1)}
+                  data-testid="calendar-prev-month"
                   tooltipProps={{content: 'Previous month'}}
                 />
                 <Button
                   icon={ChevronRightIcon}
                   mode="bleed"
                   onClick={() => moveFocusedDate(1)}
+                  data-testid="calendar-next-month"
                   tooltipProps={{content: 'Next month'}}
                 />
               </TooltipDelayGroupProvider>

diff --git a/packages/sanity/src/core/releases/components/dialog/__tests__/CreateReleaseDialog.test.tsx b/packages/sanity/src/core/releases/components/dialog/__tests__/CreateReleaseDialog.test.tsx
@@ -22,6 +22,10 @@ describe('CreateReleaseDialog', () => {
 
       const wrapper = await createTestProvider()
       render(<CreateReleaseDialog onCancel={onCancelMock} onSubmit={onSubmitMock} />, {wrapper})
+
+      await waitFor(() => {
+        expect(screen.queryByTestId('loading-block')).not.toBeInTheDocument()
+      })
     })
 
     it('should render the dialog', () => {

diff --git a/packages/sanity/src/core/releases/tool/detail/ReleaseTypePicker.tsx b/packages/sanity/src/core/releases/tool/detail/ReleaseTypePicker.tsx
@@ -1,6 +1,6 @@
 import {LockIcon} from '@sanity/icons'
 import {Card, Flex, Spinner, Stack, TabList, Text, useClickOutsideEvent} from '@sanity/ui'
-import {format, isAfter, isBefore, isValid, parse, startOfMinute} from 'date-fns'
+import {format, isBefore, isValid, parse, startOfMinute} from 'date-fns'
 import {isEqual} from 'lodash'
 import {useCallback, useEffect, useMemo, useRef, useState} from 'react'
 
@@ -62,7 +62,9 @@ export function ReleaseTypePicker(props: {release: ReleaseDocument}): React.JSX.
         metadata: {...release.metadata, intendedPublishAt: updatedDate, releaseType},
       }
 
-      if (!isEqual(newRelease, release) && inputValue && isAfter(inputValue, new Date())) {
+      if (!isEqual(newRelease, release)) {
+        if (releaseType === 'scheduled' && inputValue && isBefore(inputValue, new Date())) return
+
         setIsUpdating(true)
         updateRelease(newRelease).then(() => {
           setIsUpdating(false)
@@ -128,14 +130,14 @@ export function ReleaseTypePicker(props: {release: ReleaseDocument}): React.JSX.
     setInputValue(nextPublishAt)
   }, [])
 
-  const handleBundlePublishAtChange = useCallback((date: Date | null) => {
+  const handlePublishAtCalendarChange = useCallback((date: Date | null) => {
     if (!date) return
 
     setIsIntendedScheduleDateInPast(isBefore(date, new Date()))
     setInputValue(startOfMinute(new Date(date)))
   }, [])
 
-  const handleInputChange = useCallback((event: React.FocusEvent<HTMLInputElement>) => {
+  const handlePublishAtInputChange = useCallback((event: React.FocusEvent<HTMLInputElement>) => {
     const parsedDate = parse(event.currentTarget.value, dateInputFormat, new Date())
 
     if (isValid(parsedDate)) {
@@ -185,7 +187,7 @@ export function ReleaseTypePicker(props: {release: ReleaseDocument}): React.JSX.
             )}
             <LazyTextInput
               value={inputValue ? format(inputValue, dateInputFormat) : undefined}
-              onChange={handleInputChange}
+              onChange={handlePublishAtInputChange}
             />
             <DatePicker
               ref={datePickerRef}
@@ -194,7 +196,7 @@ export function ReleaseTypePicker(props: {release: ReleaseDocument}): React.JSX.
               selectTime
               padding={0}
               value={inputValue}
-              onChange={handleBundlePublishAtChange}
+              onChange={handlePublishAtCalendarChange}
               isPastDisabled
               showTimezone
             />

diff --git a/packages/sanity/src/core/releases/tool/detail/__tests__/ReleaseTypePicker.test.tsx b/packages/sanity/src/core/releases/tool/detail/__tests__/ReleaseTypePicker.test.tsx
@@ -146,10 +146,12 @@ describe('ReleaseTypePicker', () => {
       const scheduledTab = screen.getByText('At time')
       fireEvent.click(scheduledTab)
 
-      const Calendar = getByDataUi(document.body, 'CalendarMonth')
+      const Calendar = getByDataUi(document.body, 'Calendar')
+      const CalendarMonth = getByDataUi(document.body, 'CalendarMonth')
 
       // Select the 10th day in the calendar month
-      fireEvent.click(within(Calendar).getByText('10'))
+      fireEvent.click(within(Calendar).getByTestId('calendar-next-month'))
+      fireEvent.click(within(CalendarMonth).getByText('10'))
       fireEvent.change(screen.getByLabelText('Select hour'), {target: {value: 10}})
       fireEvent.change(screen.getByLabelText('Select minute'), {target: {value: 55}})
       expect(mockUpdateRelease).not.toHaveBeenCalled()
@@ -217,8 +219,10 @@ describe('ReleaseTypePicker', () => {
       fireEvent.click(screen.getByText('Undecided'))
       fireEvent.click(screen.getByTestId('release-type-picker'))
 
-      // Check if the spinner is displayed while updating
-      screen.getByTestId('updating-release-spinner')
+      await waitFor(() => {
+        // Check if the spinner is displayed while updating
+        screen.queryByTestId('updating-release-spinner')
+      })
     })
   })
 })