Browse Source

get prev/next toolbar tests working

Adam Shaw 9 years ago
parent
commit
12e2748cd8

+ 2 - 1
tests/automated-better/toolbar/ToolbarUtils.js

@@ -4,7 +4,8 @@ var ToolbarUtils = {
 	expectButtonEnabled: function(name, bool) {
 		var el = $('.fc-' + name + '-button');
 		expect(el.length).toBe(1);
-		expect(el.hasClass('fc-enabled')).toBe(bool);
+		expect(el.prop('disabled')).toBe(!bool);
+		expect(el.hasClass('fc-state-disabled')).toBe(!bool);
 	}
 
 };

+ 10 - 11
tests/automated-better/toolbar/next-button.js

@@ -7,16 +7,15 @@ SEE ALSO:
 */
 describe('next button', function() {
 	pushOptions({
-		header: { left: 'next' },
-		defaultView: 'week',
+		defaultView: 'agendaWeek',
 		defaultDate: '2017-06-08',
 		dateIncrement: { years: 1 } // next range is 2018-06-03 - 2018-06-10
 	});
 
 	describe('when there is no validRange', function() {
-		xit('is enabled', function() {
+		it('is enabled', function() {
 			initCalendar();
-			ToolbarUtils.expecButtonEnabled('next', true);
+			ToolbarUtils.expectButtonEnabled('next', true);
 		});
 	});
 
@@ -24,19 +23,19 @@ describe('next button', function() {
 		pushOptions({
 			validRange: { end: '2018-06-10' }
 		});
-		xit('is enabled', function() {
+		it('is enabled', function() {
 			initCalendar();
-			ToolbarUtils.expecButtonEnabled('next', true);
+			ToolbarUtils.expectButtonEnabled('next', true);
 		});
 	});
 
 	describe('when next date range is partially outside validRange', function() {
 		pushOptions({
 			validRange: { end: '2018-06-05' }
-		})
-		xit('is enabled', function() {
+		});
+		it('is enabled', function() {
 			initCalendar();
-			ToolbarUtils.expecButtonEnabled('next', true);
+			ToolbarUtils.expectButtonEnabled('next', true);
 		});
 	});
 
@@ -44,9 +43,9 @@ describe('next button', function() {
 		pushOptions({
 			validRange: { end: '2018-06-03' }
 		});
-		xit('is enabled', function() {
+		it('is disabled', function() {
 			initCalendar();
-			ToolbarUtils.expecButtonEnabled('next', false);
+			ToolbarUtils.expectButtonEnabled('next', false);
 		});
 	});
 });

+ 3 - 3
tests/automated-better/toolbar/prev-button.js

@@ -8,13 +8,13 @@ SEE ALSO:
 describe('prev button', function() {
 	pushOptions({
 		header: { left: 'prev' },
-		defaultView: 'week',
+		defaultView: 'agendaWeek',
 		defaultDate: '2017-06-08',
 		dateIncrement: { years: 1 } // prev range is 2016-06-05 - 2016-06-12
 	});
 
 	describe('when there is no specified validRange', function() {
-		xit('is enabled', function() {
+		it('is enabled', function() {
 			initCalendar();
 			ToolbarUtils.expectButtonEnabled('next', true);
 		});
@@ -24,7 +24,7 @@ describe('prev button', function() {
 		pushOptions({
 			validRange: { start: '2018-06-12' }
 		});
-		xit('is disabled', function() {
+		it('is disabled', function() {
 			initCalendar();
 			ToolbarUtils.expectButtonEnabled('next', false);
 		});