Просмотр исходного кода

update tests for dayMaxEventRows

Adam Shaw 5 лет назад
Родитель
Сommit
7516df2b35

+ 3 - 3
packages/__tests__/src/legacy/eventLimit-popover.js

@@ -2,7 +2,7 @@ import DayGridViewWrapper from "../lib/wrappers/DayGridViewWrapper"
 import TimeGridViewWrapper from '../lib/wrappers/TimeGridViewWrapper'
 import TimeGridViewWrapper from '../lib/wrappers/TimeGridViewWrapper'
 import CalendarWrapper from '../lib/wrappers/CalendarWrapper'
 import CalendarWrapper from '../lib/wrappers/CalendarWrapper'
 
 
-xdescribe('eventLimit popover', function() {
+describe('more-link popover', function() { // TODO: rename file
 
 
   /** @type {any} */
   /** @type {any} */
   var testEvents = [
   var testEvents = [
@@ -15,7 +15,7 @@ xdescribe('eventLimit popover', function() {
   pushOptions({
   pushOptions({
     defaultView: 'dayGridMonth',
     defaultView: 'dayGridMonth',
     defaultDate: '2014-08-01',
     defaultDate: '2014-08-01',
-    eventLimit: 3,
+    dayMaxEventRows: 3,
     events: testEvents,
     events: testEvents,
     dragScroll: false, // don't do autoscrolling while dragging. close quarters in PhantomJS
     dragScroll: false, // don't do autoscrolling while dragging. close quarters in PhantomJS
     popoverViewportConstrain: false, // because PhantomJS window is small, don't do smart repositioning
     popoverViewportConstrain: false, // because PhantomJS window is small, don't do smart repositioning
@@ -124,7 +124,7 @@ xdescribe('eventLimit popover', function() {
     it('orders events correctly regardless of ID', function(done) {
     it('orders events correctly regardless of ID', function(done) {
       let calendar = initCalendar({
       let calendar = initCalendar({
         defaultDate: '2012-03-22',
         defaultDate: '2012-03-22',
-        eventLimit: 3,
+        dayMaxEventRows: 3,
         events: [
         events: [
           {
           {
             id: '39957',
             id: '39957',

+ 2 - 2
packages/__tests__/src/legacy/eventLimit-popoverDestroy.js

@@ -1,10 +1,10 @@
 import DayGridViewWrapper from "../lib/wrappers/DayGridViewWrapper"
 import DayGridViewWrapper from "../lib/wrappers/DayGridViewWrapper"
 
 
-describe('eventLimit popover', function() {
+describe('more-link popover', function() { // TODO: rename file
   pushOptions({
   pushOptions({
     defaultView: 'dayGridMonth',
     defaultView: 'dayGridMonth',
     defaultDate: '2014-08-01',
     defaultDate: '2014-08-01',
-    eventLimit: 3,
+    dayMaxEventRows: 3,
     events: [
     events: [
       { title: 'event1', start: '2014-07-28', end: '2014-07-30', className: 'event1' },
       { title: 'event1', start: '2014-07-28', end: '2014-07-30', className: 'event1' },
       { title: 'event2', start: '2014-07-29', end: '2014-07-31', className: 'event2' },
       { title: 'event2', start: '2014-07-29', end: '2014-07-31', className: 'event2' },

+ 11 - 11
packages/__tests__/src/legacy/eventLimit.js

@@ -2,10 +2,10 @@ import DayGridViewWrapper from "../lib/wrappers/DayGridViewWrapper"
 import TimeGridViewWrapper from '../lib/wrappers/TimeGridViewWrapper'
 import TimeGridViewWrapper from '../lib/wrappers/TimeGridViewWrapper'
 import { filterVisibleEls } from '../lib/dom-misc'
 import { filterVisibleEls } from '../lib/dom-misc'
 
 
-xdescribe('eventLimit', function() {
+describe('dayMaxEventRows', function() { // TODO: rename file
   pushOptions({
   pushOptions({
     defaultDate: '2014-08-01', // important that it is the first week, so works w/ month + week views
     defaultDate: '2014-08-01', // important that it is the first week, so works w/ month + week views
-    eventLimit: 3
+    dayMaxEventRows: 3
   })
   })
 
 
   describe('as a number', function() {
   describe('as a number', function() {
@@ -102,8 +102,8 @@ xdescribe('eventLimit', function() {
           events: [
           events: [
             { title: 'event1', start: '2014-07-28', end: '2014-07-30' },
             { title: 'event1', start: '2014-07-28', end: '2014-07-30' },
             { title: 'event2', start: '2014-07-28', end: '2014-07-30' },
             { title: 'event2', start: '2014-07-28', end: '2014-07-30' },
-            { title: 'event2', start: '2014-07-28', end: '2014-07-30' },
-            { title: 'event2', start: '2014-07-29', end: '2014-07-31' }
+            { title: 'event3', start: '2014-07-28', end: '2014-07-30' },
+            { title: 'event4', start: '2014-07-29', end: '2014-07-31' }
           ]
           ]
         })
         })
         let dayGridWrapper = new ViewWrapper(calendar).dayGrid
         let dayGridWrapper = new ViewWrapper(calendar).dayGrid
@@ -111,7 +111,7 @@ xdescribe('eventLimit', function() {
         let cells = dayGridWrapper.getDayElsInRow(0)
         let cells = dayGridWrapper.getDayElsInRow(0)
         expect(moreEls.length).toBe(3)
         expect(moreEls.length).toBe(3)
         expect(moreEls[0]).toHaveText('+1 more')
         expect(moreEls[0]).toHaveText('+1 more')
-        expect(moreEls[0]).toBeBoundedBy(cells[3])
+        expect(moreEls[0]).toBeBoundedBy(cells[1])
       })
       })
 
 
       it('will render a link in place of a hidden single day event, if covered by a multi-day', function() {
       it('will render a link in place of a hidden single day event, if covered by a multi-day', function() {
@@ -119,8 +119,8 @@ xdescribe('eventLimit', function() {
           events: [
           events: [
             { title: 'event1', start: '2014-07-28', end: '2014-07-30' },
             { title: 'event1', start: '2014-07-28', end: '2014-07-30' },
             { title: 'event2', start: '2014-07-28', end: '2014-07-30' },
             { title: 'event2', start: '2014-07-28', end: '2014-07-30' },
-            { title: 'event2', start: '2014-07-28' },
-            { title: 'event2', start: '2014-07-28' }
+            { title: 'event3', start: '2014-07-28' },
+            { title: 'event4', start: '2014-07-28' }
           ]
           ]
         })
         })
         let dayGridWrapper = new ViewWrapper(calendar).dayGrid
         let dayGridWrapper = new ViewWrapper(calendar).dayGrid
@@ -138,8 +138,8 @@ xdescribe('eventLimit', function() {
           events: [
           events: [
             { title: 'event1', start: '2014-07-28', end: '2014-07-30' },
             { title: 'event1', start: '2014-07-28', end: '2014-07-30' },
             { title: 'event2', start: '2014-07-28', end: '2014-07-30' },
             { title: 'event2', start: '2014-07-28', end: '2014-07-30' },
-            { title: 'event2', start: '2014-07-29' },
-            { title: 'event2', start: '2014-07-29' }
+            { title: 'event3', start: '2014-07-29' },
+            { title: 'event4', start: '2014-07-29' }
           ]
           ]
         })
         })
         let dayGridWrapper = new ViewWrapper(calendar).dayGrid
         let dayGridWrapper = new ViewWrapper(calendar).dayGrid
@@ -154,7 +154,7 @@ xdescribe('eventLimit', function() {
 
 
   describe('when auto', function() {
   describe('when auto', function() {
     pushOptions({
     pushOptions({
-      eventLimit: true
+      dayMaxEvents: true
     })
     })
 
 
     describe('in month view', function() {
     describe('in month view', function() {
@@ -190,7 +190,7 @@ xdescribe('eventLimit', function() {
 
 
         rowHeights.forEach((rowHeight) => {
         rowHeights.forEach((rowHeight) => {
           let diff = Math.abs(rowHeight - aveHeight)
           let diff = Math.abs(rowHeight - aveHeight)
-          expect(diff).toBeLessThan(1)
+          expect(diff).toBeLessThan(2)
         })
         })
       })
       })
 
 

+ 2 - 2
packages/__tests__/src/legacy/eventLimitClick.js

@@ -5,7 +5,7 @@ xdescribe('eventLimitClick', function() { // simulate a click
   pushOptions({
   pushOptions({
     defaultDate: '2014-08-01', // important that it is the first week, so works w/ month + week views
     defaultDate: '2014-08-01', // important that it is the first week, so works w/ month + week views
     defaultView: 'dayGridMonth',
     defaultView: 'dayGridMonth',
-    eventLimit: 3,
+    dayMaxEventRows: 3,
     events: [
     events: [
       { title: 'event1', start: '2014-07-29' },
       { title: 'event1', start: '2014-07-29' },
       { title: 'event2', start: '2014-07-29' },
       { title: 'event2', start: '2014-07-29' },
@@ -31,7 +31,7 @@ xdescribe('eventLimitClick', function() { // simulate a click
       })
       })
     })
     })
 
 
-    // more popover tests are done in eventLimit-popover
+    // more popover tests are done in *-popover.js
   })
   })
 
 
   describe('when set to "week"', function() {
   describe('when set to "week"', function() {

+ 2 - 2
packages/__tests__/src/legacy/eventLimitText.js

@@ -1,11 +1,11 @@
 import frLocale from '@fullcalendar/core/locales/fr'
 import frLocale from '@fullcalendar/core/locales/fr'
 import DayGridViewWrapper from '../lib/wrappers/DayGridViewWrapper'
 import DayGridViewWrapper from '../lib/wrappers/DayGridViewWrapper'
 
 
-xdescribe('moreLinkText', function() { // TODO: rename file
+describe('moreLinkText', function() { // TODO: rename file
   pushOptions({
   pushOptions({
     defaultDate: '2014-08-01', // important that it is the first week, so works w/ month + week views
     defaultDate: '2014-08-01', // important that it is the first week, so works w/ month + week views
     defaultView: 'dayGridMonth',
     defaultView: 'dayGridMonth',
-    eventLimit: 3,
+    dayMaxEventRows: 3,
     events: [
     events: [
       { title: 'event1', start: '2014-07-29' },
       { title: 'event1', start: '2014-07-29' },
       { title: 'event2', start: '2014-07-29' },
       { title: 'event2', start: '2014-07-29' },

+ 1 - 1
packages/__tests__/src/view-render/rerender.js

@@ -6,7 +6,7 @@ describe('rerendering a calendar', function() {
     let calendar = initCalendar({
     let calendar = initCalendar({
       defaultView: 'dayGridMonth',
       defaultView: 'dayGridMonth',
       defaultDate: '2019-08-08',
       defaultDate: '2019-08-08',
-      eventLimit: 3,
+      dayMaxEventRows: 3,
       events: [
       events: [
         { date: '2019-08-08', title: 'event' },
         { date: '2019-08-08', title: 'event' },
         { date: '2019-08-08', title: 'event' },
         { date: '2019-08-08', title: 'event' },