start using test wrappers

packages/__tests__/src/lib/ToolbarUtils.js

@@ -1,11 +0,0 @@
-
-export function expectButtonEnabled(name, bool) {
-  var el = $('.fc-' + name + '-button')
-  expect(el.length).toBe(1)
-  expect(el.prop('disabled')).toBe(!bool)
-}
-
-
-export function getTitleText() {
-  return $.trim($('.fc-toolbar h2').text())
-}

packages/__tests__/src/lib/globals.js

@@ -77,13 +77,15 @@ function initCalendar(moreOptions, el) {
     newCalendar = window['currentCalendar'] = this
   }
 
-  new Calendar($el[0], options)
+  var cool = new Calendar($el[0], options)
 
   if (newCalendar === window['currentCalendar']) {
     newCalendar.render()
   } else {
     newCalendar.destroy()
   }
+
+  return cool
 }
 
 function getCurrentOptions() {

packages/__tests__/src/toolbar/next-button.js

@@ -6,7 +6,7 @@ SEE ALSO:
 - visibleRange, dateAlignment, dateIncrement
 */
 
-import { expectButtonEnabled } from '../lib/ToolbarUtils'
+import CalendarWrapper from '../lib/wrappers/CalendarWrapper'
 
 describe('next button', function() {
   pushOptions({
@@ -16,8 +16,7 @@ describe('next button', function() {
 
   describe('when there is no validRange', function() {
     it('is enabled', function() {
-      initCalendar()
-      expectButtonEnabled('next', true)
+      expectEnabled(initCalendar(), true)
     })
   })
 
@@ -27,8 +26,7 @@ describe('next button', function() {
       dateIncrement: { years: 1 } // next range is 2018-06-03 - 2018-06-10
     })
     it('is enabled', function() {
-      initCalendar()
-      expectButtonEnabled('next', true)
+      expectEnabled(initCalendar(), true)
     })
   })
 
@@ -38,8 +36,7 @@ describe('next button', function() {
       dateIncrement: { years: 1 } // next range is 2018-06-03 - 2018-06-10
     })
     it('is enabled', function() {
-      initCalendar()
-      expectButtonEnabled('next', true)
+      expectEnabled(initCalendar(), true)
     })
   })
 
@@ -49,8 +46,7 @@ describe('next button', function() {
       dateIncrement: { years: 1 } // next range is 2018-06-03 - 2018-06-10
     })
     it('is disabled', function() {
-      initCalendar()
-      expectButtonEnabled('next', false)
+      expectEnabled(initCalendar(), false)
     })
   })
 
@@ -62,8 +58,7 @@ describe('next button', function() {
       dateIncrement: { years: 1 } // next range is 2018-06-03 - 2018-06-10
     })
     it('is enabled', function() {
-      initCalendar()
-      expectButtonEnabled('next', true)
+      expectEnabled(initCalendar(), true)
     })
   })
 
@@ -74,8 +69,13 @@ describe('next button', function() {
       validRange: { start: '2036-05-03', end: '2036-06-01' }
     })
     it('is enabled', function() {
-      initCalendar()
-      expectButtonEnabled('next', true)
+      expectEnabled(initCalendar(), true)
     })
   })
+
+  function expectEnabled(calendar, bool) {
+    let toolbarWrapper = new CalendarWrapper(calendar).toolbar
+    expect(toolbarWrapper.getButtonEnabled('next')).toBe(bool)
+  }
+
 })

packages/__tests__/src/toolbar/prev-button.js

@@ -6,7 +6,7 @@ SEE ALSO:
 - other range intersection tests handled by next-button
 */
 
-import { expectButtonEnabled } from '../lib/ToolbarUtils'
+import CalendarWrapper from '../lib/wrappers/CalendarWrapper'
 
 describe('prev button', function() {
   pushOptions({
@@ -16,8 +16,7 @@ describe('prev button', function() {
 
   describe('when there is no specified validRange', function() {
     it('is enabled', function() {
-      initCalendar()
-      expectButtonEnabled('prev', true)
+      expectEnabled(initCalendar(), true)
     })
   })
 
@@ -27,8 +26,7 @@ describe('prev button', function() {
       dateIncrement: { years: 1 } // prev range is 2016-06-05 - 2016-06-12
     })
     it('is disabled', function() {
-      initCalendar()
-      expectButtonEnabled('prev', false)
+      expectEnabled(initCalendar(), false)
     })
   })
 
@@ -41,8 +39,7 @@ describe('prev button', function() {
     })
 
     it('when prev date range is partially before validRange', function() {
-      initCalendar()
-      expectButtonEnabled('prev', false)
+      expectEnabled(initCalendar(), false)
     })
   })
 
@@ -54,8 +51,7 @@ describe('prev button', function() {
       dateIncrement: { years: 1 } // prev range is 2016-06-05 - 2016-06-12
     })
     it('is enabled', function() {
-      initCalendar()
-      expectButtonEnabled('prev', true)
+      expectEnabled(initCalendar(), true)
     })
   })
 
@@ -66,8 +62,13 @@ describe('prev button', function() {
       validRange: { start: '2017-03-20', end: '2017-03-30' }
     })
     it('is enabled', function() {
-      initCalendar()
-      expectButtonEnabled('prev', true)
+      expectEnabled(initCalendar(), true)
     })
   })
+
+  function expectEnabled(calendar, bool) {
+    let toolbarWrapper = new CalendarWrapper(calendar).toolbar
+    expect(toolbarWrapper.getButtonEnabled('prev')).toBe(bool)
+  }
+
 })

packages/__tests__/src/toolbar/title.js

@@ -1,4 +1,4 @@
-import { getTitleText } from '../lib/ToolbarUtils'
+import CalendarWrapper from '../lib/wrappers/CalendarWrapper'
 
 describe('calendar title', function() {
   pushOptions({
@@ -7,14 +7,16 @@ describe('calendar title', function() {
 
   describe('when switching to and from a view', function() {
     it('updates the title at each switch', function() {
-      initCalendar({
+      let calendar = initCalendar({
         defaultView: 'dayGridMonth'
       })
-      expect(getTitleText()).toBe('March 2017')
+      let toolbarWrapper = new CalendarWrapper(calendar).toolbar
+
+      expect(toolbarWrapper.getTitleText()).toBe('March 2017')
       currentCalendar.changeView('timeGridWeek')
-      expect(getTitleText()).toBe('Mar 26 – Apr 1, 2017')
+      expect(toolbarWrapper.getTitleText()).toBe('Mar 26 – Apr 1, 2017')
       currentCalendar.changeView('dayGridMonth')
-      expect(getTitleText()).toBe('March 2017')
+      expect(toolbarWrapper.getTitleText()).toBe('March 2017')
     })
   })
 })

packages/__tests__/src/toolbar/today-button.js

@@ -6,7 +6,7 @@ SEE ALSO:
 - other range intersection tests handled by next-button
 */
 
-import { expectButtonEnabled } from '../lib/ToolbarUtils'
+import CalendarWrapper from '../lib/wrappers/CalendarWrapper'
 
 describe('today button', function() {
   pushOptions({
@@ -19,8 +19,7 @@ describe('today button', function() {
       defaultDate: '2017-06-01'
     })
     it('is disabled', function() {
-      initCalendar()
-      expectButtonEnabled('today', false)
+      expectEnabled(initCalendar(), false)
     })
   })
 
@@ -29,8 +28,7 @@ describe('today button', function() {
       defaultDate: '2017-07-01'
     })
     it('is enabled', function() {
-      initCalendar()
-      expectButtonEnabled('today', true)
+      expectEnabled(initCalendar(), true)
     })
   })
 
@@ -41,8 +39,7 @@ describe('today button', function() {
 
     describe('when no specified validRange', function() {
       it('is enabled', function() {
-        initCalendar()
-        expectButtonEnabled('today', true)
+        expectEnabled(initCalendar(), true)
       })
     })
 
@@ -51,9 +48,14 @@ describe('today button', function() {
         validRange: { start: '2017-07-02' } // previous day is visible in the June
       })
       it('is disabled', function() {
-        initCalendar()
-        expectButtonEnabled('today', false)
+        expectEnabled(initCalendar(), false)
       })
     })
   })
+
+  function expectEnabled(calendar, bool) {
+    let toolbarWrapper = new CalendarWrapper(calendar).toolbar
+    expect(toolbarWrapper.getButtonEnabled('today')).toBe(bool)
+  }
+
 })