fix: calendar tests

nocodb · May 14, 2024 · 5ffc28c · 5ffc28c · github-actions · May 14, 2024
1 parent 03280aa
commit 5ffc28c
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 11 deletions.
diff --git a/packages/nc-gui/components/nc/DateWeekSelector.vue b/packages/nc-gui/components/nc/DateWeekSelector.vue
@@ -160,7 +160,7 @@ const emitDblClick = (date: dayjs.Dayjs) => {
       class="flex justify-between border-b-1 px-3 py-0.5 nc-date-week-header items-center"
     >
       <NcTooltip v-if="!disablePagination">
-        <NcButton class="!border-0" data-testid="nc-calendar-prev-btn" size="small" type="secondary" @click="paginate('prev')">
+        <NcButton class="!border-0" size="small" type="secondary" @click="paginate('prev')">
           <component :is="iconMap.arrowLeft" class="h-4 w-4" />
         </NcButton>
         <template #title>

diff --git a/packages/nc-gui/components/nc/MonthYearSelector.vue b/packages/nc-gui/components/nc/MonthYearSelector.vue
@@ -93,7 +93,7 @@ const compareYear = (date1: dayjs.Dayjs, date2: dayjs.Dayjs) => {
     <div v-if="!hideHeader" class="flex px-2 border-b-1 py-0.5 justify-between items-center">
       <div class="flex">
         <NcTooltip>
-          <NcButton class="!border-0" data-testid="nc-calendar-prev-btn" size="small" type="secondary" @click="paginate('prev')">
+          <NcButton class="!border-0" size="small" type="secondary" @click="paginate('prev')">
             <component :is="iconMap.arrowLeft" class="h-4 w-4" />
           </NcButton>
           <template #title>
@@ -107,7 +107,7 @@ const compareYear = (date1: dayjs.Dayjs, date2: dayjs.Dayjs) => {
       }}</span>
       <div class="flex">
         <NcTooltip>
-          <NcButton class="!border-0" data-testid="nc-calendar-next-btn" size="small" type="secondary" @click="paginate('next')">
+          <NcButton class="!border-0" size="small" type="secondary" @click="paginate('next')">
             <component :is="iconMap.arrowRight" class="h-4 w-4" />
           </NcButton>
           <template #title>

diff --git a/tests/playwright/pages/Dashboard/Calendar/CalendarSideMenu.ts b/tests/playwright/pages/Dashboard/Calendar/CalendarSideMenu.ts
@@ -16,8 +16,8 @@ export class CalendarSideMenuPage extends BasePage {
 
     this.new_record_btn = this.get().getByTestId('nc-calendar-side-menu-new-btn');
 
-    this.next_btn = this.get().getByTestId('nc-calendar-next-btn');
-    this.prev_btn = this.get().getByTestId('nc-calendar-prev-btn');
+    this.next_btn = this.parent.toolbar.get().getByTestId('nc-calendar-next-btn');
+    this.prev_btn = this.parent.toolbar.get().getByTestId('nc-calendar-prev-btn');
 
     this.searchToggleBtn = this.get().getByTestId('nc-calendar-sidebar-search-btn');
   }
@@ -49,6 +49,7 @@ export class CalendarSideMenuPage extends BasePage {
   }
 
   async moveToDate({ date, action }: { date: string; action: 'prev' | 'next' }) {
+    console.log(await this.parent.toolbar.getActiveDate());
     while ((await this.parent.toolbar.getActiveDate()) !== date) {
       if (action === 'prev') {
         await this.clickPrev();

diff --git a/tests/playwright/pages/Dashboard/Calendar/CalendarWeekDateTime.ts b/tests/playwright/pages/Dashboard/Calendar/CalendarWeekDateTime.ts
@@ -42,7 +42,10 @@ export class CalendarWeekDateTimePage extends BasePage {
     await this.rootPage.mouse.down();
     await this.rootPage.waitForTimeout(500);
 
-    await this.rootPage.mouse.move(cord.x + cord.width / 2, cord.y + cord.height / 2);
+    await this.rootPage.mouse.move(cord.x + Math.ceil(cord.width / 2), cord.y + Math.ceil(cord.height / 2));
+    // await toDay.scrollIntoViewIfNeeded();
+    await this.rootPage.waitForTimeout(500);
+
     await this.rootPage.mouse.up();
   }
 
@@ -56,8 +59,8 @@ export class CalendarWeekDateTimePage extends BasePage {
         hour.click({
           force: true,
           position: {
-            x: -1,
-            y: -1,
+            x: 1,
+            y: 1,
           },
         }),
       requestUrlPathToMatch: '/api/v1/db/data/noco',

diff --git a/tests/playwright/tests/db/views/viewCalendar.spec.ts b/tests/playwright/tests/db/views/viewCalendar.spec.ts
@@ -36,7 +36,7 @@ const dateRecords = [
   {
     Id: 1,
     Title: 'Team Catchup',
-    StartDate: '2024-01-01 09:00',
+    StartDate: '2024-01-01 08:00',
     EndDate: '2024-01-01 10:00',
   },
   {
@@ -337,13 +337,13 @@ test.describe('Calendar View', () => {
       record: 'Team Catchup',
       to: {
         dayIndex: 0,
-        hourIndex: 5,
+        hourIndex: 7,
       },
     });
 
     await calendar.sideMenu.updateFilter({ filter: 'In selected hours' });
 
-    await calendar.calendarWeekDateTime.selectHour({ dayIndex: 0, hourIndex: 5 });
+    await calendar.calendarWeekDateTime.selectHour({ dayIndex: 0, hourIndex: 7 });
 
     await calendar.sideMenu.verifySideBarRecords({ records: ['Team Catchup'] });