kyle roux пре 7 година
родитељ
комит
128cdfc19a

+ 2 - 2
tests/automated/date-render/dayNumbers.js

@@ -1,4 +1,4 @@
-import { getDayTdEls } from '../view-render/DayGridRenderUtils'
+import { getDayElTopElText } from '../view-render/DayGridRenderUtils'
 
 describe('dayNumbers', function() {
   pushOptions({
@@ -10,7 +10,7 @@ describe('dayNumbers', function() {
       defaultView: 'month',
       locale: 'ar'
     })
-    expect(getDayTdEls('2018-01-01')).toContainText('١') // an Arabic 1
+    expect(getDayElTopElText('2018-01-01')).toEqual('١') // an Arabic 1
   })
 
 })

+ 10 - 6
tests/automated/event-render/EventRenderUtils.js

@@ -31,16 +31,16 @@ export function getVisibleEventEls() {
   return $(`.${EVENT_CLASS}:visible`)
 }
 
-export function getEventEls(eventClassName = EVENT_CLASS) {
-  return $(`.${eventClassName}`)
+export function getEventEls() {
+  return $(`.${EVENT_CLASS}`)
 }
 
-export function getFirstEventEl(eventClassName) {
-  return getEventEls(eventClassName).first()
+export function getFirstEventEl() {
+  return getEventEls().first()
 }
 
-export function getLastEventEl(eventClassName) {
-  return getEventEls(eventClassName).last()
+export function getLastEventEl() {
+  return getEventEls().last()
 }
 
 export function getEventElTitleEl(eventEl) {
@@ -56,3 +56,7 @@ export function getSingleEl() {
   expect(els).toHaveLength(1)
   return els
 }
+
+export function getEventElTimeEl(el) {
+  return el.find('.fc-time')
+}

+ 4 - 3
tests/automated/lib/dnd-resize-utils.js

@@ -1,9 +1,10 @@
 // this function has been mangled to work with external jqui draggables as well
-import { getEventElTimeEl, getTimeGridDayEls, getSlotElByIndex } from './time-grid'
+import { getTimeGridDayEls, getSlotElByIndex } from './time-grid'
 import { getDayEl } from '../view-render/DayGridRenderUtils'
 import {
   getEventElResizerEl,
   getEventElTitleEl,
+  getEventElTimeEl,
   getFirstEventEl,
   getLastEventEl
 } from '../event-render/EventRenderUtils'
@@ -28,7 +29,7 @@ export function testEventDrag(options, dropDate, expectSuccess, callback, eventC
     eventsRendered = true
 
     dropDate = calendar.moment(dropDate)
-    eventEl = getFirstEventEl(eventClassName)
+    eventEl = eventClassName ? $(`.${eventClassName}:first`) : getFirstEventEl()
     expect(eventEl.length).toBe(1)
 
     if (dropDate.hasTime()) {
@@ -111,7 +112,7 @@ export function testEventResize(options, resizeDate, expectSuccess, callback, ev
     eventsRendered = true
 
     resizeDate = calendar.moment(resizeDate)
-    eventEl = getLastEventEl(eventClassName)
+    eventEl = eventClassName ? $(`.${eventClassName}:first`) : getLastEventEl(eventClassName)
     dragEl = getEventElResizerEl(eventEl)
 
     if (resizeDate.hasTime()) {

+ 0 - 3
tests/automated/lib/time-grid.js

@@ -129,9 +129,6 @@ export function getTimeGridTop(targetTime) {
     Math.min(1, (targetTime - slotTime) / slotMsDuration)) // don't go past end of last slot
 }
 
-export function getEventElTimeEl(el) {
-  return el.find('.fc-time')
-}
 
 export function getTimeGridDayEls(date) {
   date = FullCalendar.moment.parseZone(date)

+ 2 - 2
tests/automated/view-render/DayGridRenderUtils.js

@@ -16,8 +16,8 @@ export function getDayEls() {
   return $('.fc-day-header')
 }
 
-export function getDayTdEls(date) {
-  return $(`td[data-date="${date}"]`)
+export function getDayElTopElText(date) {
+  return $(`td.fc-day-top[data-date="${date}"]`).text()
 }
 
 export function getHeaderEl() {