fixes for tests;

fullcalendar · Jun 5, 2020 · cbcc5b7 · cbcc5b7
1 parent 6000162
commit cbcc5b7
Show file tree

Hide file tree

Showing 6 changed files with 24 additions and 24 deletions.
diff --git a/packages/__tests__/src/event-drag/repeating.js b/packages/__tests__/src/event-drag/repeating.js
@@ -2,6 +2,7 @@ import { TimeGridViewWrapper } from '../lib/wrappers/TimeGridViewWrapper'
 import { CalendarWrapper } from '../lib/wrappers/CalendarWrapper'
 import { waitEventDrag } from '../lib/wrappers/interaction-util'
 import { filterVisibleEls } from '../lib/dom-misc'
+import { DayGridViewWrapper } from '../lib/wrappers/DayGridViewWrapper'
 
 describe('event dragging on repeating events', function() {
   pushOptions({
@@ -42,25 +43,22 @@ describe('event dragging on repeating events', function() {
   })
 
   it('hides other repeating events when dragging', function(done) {
-
     let calendar = initCalendar({
-
       eventDragStart() {
         setTimeout(function() { // try go execute DURING the drag
-          let visibleEventEls = filterVisibleEls(calendarWrapper.getEventEls())
+          let visibleEventEls = filterVisibleEls(dayGridWrapper.getEventEls())
           expect(visibleEventEls.length).toBe(0)
         }, 0)
       },
-
       eventDrop() {
         setTimeout(function() {
           done()
         }, 10)
       }
     })
-    let calendarWrapper = new CalendarWrapper(calendar)
+    let dayGridWrapper = new DayGridViewWrapper(calendar).dayGrid
 
-    $(calendarWrapper.getFirstEventEl()).simulate('drag', {
+    $(dayGridWrapper.getFirstEventEl()).simulate('drag', {
       dx: 100,
       duration: 100 // ample time for separate eventDragStart/eventDrop
     })
@@ -83,7 +81,7 @@ describe('event dragging on repeating events', function() {
 
       eventDragStart() {
         setTimeout(function() { // try go execute DURING the drag
-          let visibleEventEls = filterVisibleEls(calendarWrapper.getEventEls())
+          let visibleEventEls = filterVisibleEls(dayGridWrapper.getEventEls())
           expect(visibleEventEls.length).toBe(1) // the dragging event AND the other regular event
         }, 0)
       },
@@ -94,9 +92,9 @@ describe('event dragging on repeating events', function() {
         }, 10)
       }
     })
-    let calendarWrapper = new CalendarWrapper(calendar)
+    let dayGridWrapper = new DayGridViewWrapper(calendar).dayGrid
 
-    $(calendarWrapper.getFirstEventEl()).simulate('drag', {
+    $(dayGridWrapper.getFirstEventEl()).simulate('drag', {
       dx: 100,
       duration: 100 // ample time for separate eventDragStart/eventDrop
     })

diff --git a/packages/__tests__/src/event-render/dayGrid-events.js b/packages/__tests__/src/event-render/dayGrid-events.js
@@ -3,6 +3,9 @@ import { anyElsIntersect } from '../lib/dom-geom'
 
 
 describe('dayGrid advanced event rendering', function() {
+  pushOptions({
+    initialDate: '2020-05-01'
+  })
 
   // https://github.com/fullcalendar/fullcalendar/issues/5408
   it('renders without intersecting', function() {

diff --git a/packages/__tests__/src/lib/EventResizeUtils.js b/packages/__tests__/src/lib/EventResizeUtils.js
@@ -3,14 +3,13 @@ import { CalendarWrapper } from './wrappers/CalendarWrapper'
 
 
 export function resize(point0, point1, fromStart, debug) {
-  var $eventEl = $(new CalendarWrapper(currentCalendar).getFirstEventEl())
+  var eventEl = new CalendarWrapper(currentCalendar).getFirstEventEl()
 
-  $eventEl.simulate('mouseover') // so that resize handle is revealed
-
-  var resizerEl = $eventEl.find(
+  var $resizerEl = $(eventEl).find(
     '.' + (fromStart ? CalendarWrapper.EVENT_START_RESIZER_CLASSNAME : CalendarWrapper.EVENT_END_RESIZER_CLASSNAME)
-  )
-  var resizerRect = resizerEl[0].getBoundingClientRect()
+  ).css('display', 'block') // usually only displays on hover. force display
+
+  var resizerRect = $resizerEl[0].getBoundingClientRect()
   var resizerCenter = getRectCenter(resizerRect)
 
   var vector = subtractPoints(
@@ -23,7 +22,7 @@ export function resize(point0, point1, fromStart, debug) {
   )
   var deferred = $.Deferred()
 
-  resizerEl.simulate('drag', {
+  $resizerEl.simulate('drag', {
     point: resizerCenter,
     end: endPoint,
     debug: debug

diff --git a/packages/__tests__/src/lib/dnd-resize-utils.js b/packages/__tests__/src/lib/dnd-resize-utils.js
@@ -122,7 +122,9 @@ export function testEventResize(options, resizeDate, expectSuccess, callback, ev
       let eventEls = calendarWrapper.getEventEls()
       return $(eventEls[eventEls.length - 1]) // the last one
     })()
+
     $dragEl = $eventEl.find('.' + CalendarWrapper.EVENT_RESIZER_CLASSNAME)
+      .css('display', 'block') // resizer usually only shows on hover. force-show it
 
     if (resizeDateHasTime) {
       var timeGridWrapper = new TimeGridViewWrapper(calendar).timeGrid
@@ -142,7 +144,6 @@ export function testEventResize(options, resizeDate, expectSuccess, callback, ev
     expect($dragEl.length).toBe(1)
     dx = $lastDayEl.offset().left + $lastDayEl.outerWidth() - 2 - ($eventEl.offset().left + $eventEl.outerWidth())
 
-    $dragEl.simulate('mouseover') // resizer only shows up on mouseover
     $dragEl.simulate('drag', {
       dx: dx,
       dy: dy,

diff --git a/packages/__tests__/src/lib/wrappers/DayGridWrapper.ts b/packages/__tests__/src/lib/wrappers/DayGridWrapper.ts
@@ -262,11 +262,10 @@ export class DayGridWrapper {
       let rect0 = this.getDayEl(origEndDate).getBoundingClientRect()
       let rect1 = this.getDayEl(newEndDate).getBoundingClientRect()
 
-      $(eventEl).simulate('mouseover') // so that resize handle is revealed
-
-      var resizerEl = eventEl.querySelector(
+      let resizerEl = $(eventEl).find(
         '.' + (fromStart ? CalendarWrapper.EVENT_START_RESIZER_CLASSNAME : CalendarWrapper.EVENT_END_RESIZER_CLASSNAME)
-      )
+      ).css('display', 'block')[0] // usually only displays on hover. force display
+
       var resizerRect = resizerEl.getBoundingClientRect()
       var resizerCenter = getRectCenter(resizerRect)
 

diff --git a/packages/__tests__/src/lib/wrappers/TimeGridWrapper.ts b/packages/__tests__/src/lib/wrappers/TimeGridWrapper.ts
@@ -71,7 +71,7 @@ export class TimeGridWrapper {
 
 
   getColEl(col) {
-    return this.el.querySelectorAll('.fc-timegrid-col')[col] as HTMLElement
+    return this.el.querySelectorAll('.fc-timegrid-col:not(.fc-timegrid-axis)')[col] as HTMLElement
   }
 
 
@@ -159,9 +159,9 @@ export class TimeGridWrapper {
 
   resizeEvent(eventEl: HTMLElement, origEndDate, newEndDate, onBeforeRelease?) {
     return new Promise((resolve) => {
-      $(eventEl).simulate('mouseover') // resizer only shows on hover
+      let resizerEl = $(eventEl).find('.' + CalendarWrapper.EVENT_RESIZER_CLASSNAME)
+        .css('display', 'block')[0] // usually only displays on hover. force display
 
-      let resizerEl = eventEl.querySelector('.' + CalendarWrapper.EVENT_RESIZER_CLASSNAME)
       let resizerPoint = getRectCenter(resizerEl.getBoundingClientRect())
       let origPoint = this.getPoint(origEndDate)
       let yCorrect = resizerPoint.top - origPoint.top