Update legacy tests

package-lock.json

@@ -6734,9 +6734,9 @@
       }
     },
     "moment": {
-      "version": "2.21.0",
-      "resolved": "https://registry.npmjs.org/moment/-/moment-2.21.0.tgz",
-      "integrity": "sha512-TCZ36BjURTeFTM/CwRcViQlfkMvL1/vFISuNLO5GkcVm1+QHfbSiNqZuWeMFjj1/3+uAjXswgRk30j1kkLYJBQ=="
+      "version": "2.22.0",
+      "resolved": "https://registry.npmjs.org/moment/-/moment-2.22.0.tgz",
+      "integrity": "sha512-1muXCh8jb1N/gHRbn9VDUBr0GYb8A/aVcHlII9QSB68a50spqEVLIGN6KVmCOnSvJrUhC0edGgKU5ofnGXdYdg=="
     },
     "moment-timezone": {
       "version": "0.5.14",
@@ -6744,7 +6744,7 @@
       "integrity": "sha1-TrOP+VOLgBCLpGekWPPtQmjM/LE=",
       "dev": true,
       "requires": {
-        "moment": "2.21.0"
+        "moment": "2.22.0"
       }
     },
     "ms": {

tests/automated/legacy/dayNames.js

@@ -1,5 +1,4 @@
 describe('day names', function() {
-  var settings = {}
   var testableClasses = [
     'basicDay',
     'agendaDay'
@@ -16,11 +15,8 @@ describe('day names', function() {
   var referenceDate = '2014-05-25 06:00' // A sunday
   var locales = [ 'es', 'fr', 'de', 'zh-cn', 'nl' ]
 
-  beforeEach(function() {
-    affix('#cal')
-    settings = {
-      now: moment(referenceDate).toISOString()
-    }
+  pushOptions({
+    now: moment(referenceDate).toISOString()
   })
 
   afterEach(function() {
@@ -29,21 +25,19 @@ describe('day names', function() {
 
   testableClasses.forEach(function(viewClass, index, viewClasses) {
     describe('when view is basicDay', function() {
-      beforeEach(function() {
-        settings.defaultView = 'basicDay'
+      pushOptions({
+        defaultView: 'basicDay'
       })
-
       describe('when locale is default', function() {
-        beforeEach(function() {
-          settings.locale = 'en'
+        pushOptions({
+          locale: 'en'
         })
-
         dayClasses.forEach(function(cls, index, classes) {
           var weekdays = moment.weekdays()
           it('should be ' + weekdays[index], function() {
-            settings.now = moment(referenceDate).add(index, 'days')
-            $('#cal').fullCalendar(settings)
-
+            initCalendar({
+              now: moment(referenceDate).add(index, 'days')
+            })
             expect($('.fc-view thead ' + dayClasses[index])).toHaveText(weekdays[index])
           })
         })
@@ -57,9 +51,10 @@ describe('day names', function() {
 
           dayClasses.forEach(function(cls, index, classes) {
             it('should be the translation for ' + moment.weekdays()[index], function() {
-              settings.locale = locale
-              settings.now = moment(referenceDate).add(index, 'days')
-              $('#cal').fullCalendar(settings)
+              initCalendar({
+                locale: locale,
+                now: moment(referenceDate).add(index, 'days')
+              })
 
               expect($('.fc-view thead ' + dayClasses[index])).toHaveText(moment.weekdays()[index])
             })
@@ -80,11 +75,10 @@ describe('day names', function() {
 
         dayClasses.forEach(function(cls, idx, classes) {
           it('should be ' + weekdays[idx], function() {
-            settings.dayNames = [].slice.call(weekdays) // copy. in case there is a mutation
-            settings.now = moment(referenceDate).add(idx, 'days')
-
-            $('#cal').fullCalendar(settings)
-
+            initCalendar({
+              dayNames: [].slice.call(weekdays), // copy. in case there is a mutation
+              now: moment(referenceDate).add(idx, 'days')
+            })
             expect($('.fc-view thead ' + cls)).toHaveText(weekdays[idx])
           })
         })

tests/automated/legacy/dayNamesShort.js

@@ -1,5 +1,4 @@
 describe('short day names', function() {
-  var settings = {}
   var testableClasses = [
     'month',
     'agendaWeek',
@@ -16,27 +15,21 @@ describe('short day names', function() {
   ]
   var locales = [ 'es', 'fr', 'de', 'zh-cn', 'es' ]
 
-  beforeEach(function() {
-    affix('#cal')
-    settings = { }
-  })
-
   afterEach(function() {
     moment.locale('en') // reset moment's global locale
   })
 
   testableClasses.forEach(function(viewClass, index, viewClasses) {
     describe('when view is ' + viewClass, function() {
-      beforeEach(function() {
-        settings.defaultView = viewClass
+      pushOptions({
+        defaultView: viewClass
       })
-
       describe('when locale is default', function() {
         it('should be in English', function() {
           moment.locale('en')
-          $('#cal').fullCalendar(settings)
-          var weekdays = moment.weekdaysShort()
+          initCalendar()
 
+          var weekdays = moment.weekdaysShort()
           dayClasses.forEach(function(cls, index, classes) {
             expect($('.fc-view thead ' + cls)[0]).toContainText(weekdays[index])
           })
@@ -46,8 +39,9 @@ describe('short day names', function() {
       describe('when locale is not default', function() {
         locales.forEach(function(locale, index, locales) {
           it('should be in the selected locale', function() {
-            settings.locale = locale
-            $('#cal').fullCalendar(settings)
+            initCalendar({
+              locale: locale
+            })
 
             moment.locale(locale)
             var weekdays = moment.weekdaysShort()
@@ -64,8 +58,9 @@ describe('short day names', function() {
           var days = [
             'Hov.', 'maS.', 'veS.', 'mech.', 'parmaq.', 'HoS.'
           ]
-          settings.dayNamesShort = days
-          $('#cal').fullCalendar(settings)
+          initCalendar({
+            dayNamesShort: days
+          })
 
           dayClasses.forEach(function(cls, index, classes) {
             expect($('.fc-view thead ' + cls)[0]).toContainText(days[index])

tests/automated/legacy/event-dnd.js

@@ -8,11 +8,10 @@ describe('eventDrop', function() {
       dragScroll: false,
       longPressDelay: 100
     }
-    affix('#cal')
   })
 
   afterEach(function() {
-    $('#cal').fullCalendar('destroy')
+    currentCalendar.destroy()
   })
 
   describe('when in month view', function() {
@@ -54,7 +53,7 @@ describe('eventDrop', function() {
                 expect(event.end).toBeNull()
 
                 revertFunc()
-                event = $('#cal').fullCalendar('clientEvents')[0]
+                event = currentCalendar.clientEvents()[0]
 
                 expect(event.start).toEqualMoment('2014-06-11')
                 expect(event.end).toBeNull()
@@ -93,7 +92,7 @@ describe('eventDrop', function() {
             expect(event.end).toBeNull()
 
             revertFunc()
-            event = $('#cal').fullCalendar('clientEvents')[0]
+            event = currentCalendar.clientEvents()[0]
 
             expect(event.start).toEqualMoment('2014-06-11T06:00:00')
             expect(event.end).toBeNull()
@@ -189,7 +188,7 @@ describe('eventDrop', function() {
                 expect(event.end).toBeNull()
 
                 revertFunc()
-                event = $('#cal').fullCalendar('clientEvents')[0]
+                event = currentCalendar.clientEvents()[0]
 
                 expect(event.start).toEqualMoment('2014-06-11T06:00:00')
                 expect(event.end).toBeNull()
@@ -227,7 +226,7 @@ describe('eventDrop', function() {
             expect(event.end).toBeNull()
 
             revertFunc()
-            event = $('#cal').fullCalendar('clientEvents')[0]
+            event = currentCalendar.clientEvents()[0]
 
             expect(event.start).toEqualMoment('2014-06-11')
             expect(event.end).toBeNull()
@@ -269,7 +268,7 @@ describe('eventDrop', function() {
             expect(event.allDay).toBe(false)
 
             revertFunc()
-            event = $('#cal').fullCalendar('clientEvents')[0]
+            event = currentCalendar.clientEvents()[0]
 
             expect(event.start).toEqualMoment('2014-06-11')
             expect(event.end).toBeNull()
@@ -325,7 +324,7 @@ describe('eventDrop', function() {
             expect(event.allDay).toBe(true)
 
             revertFunc()
-            event = $('#cal').fullCalendar('clientEvents')[0]
+            event = currentCalendar.clientEvents()[0]
 
             expect(event.start).toEqualMoment('2014-06-11T01:00:00')
             expect(event.end).toBeNull()
@@ -447,7 +446,7 @@ describe('eventDrop', function() {
     spyOn(options, 'eventDragStop').and.callThrough()
 
     setTimeout(function() { // hack. agenda view scroll state would get messed up between tests
-      $('#cal').fullCalendar(options)
+      initCalendar(options)
     }, 0)
   }
 })