Adam Shaw 8 роки тому
батько
коміт
df7c67bd2d

+ 9 - 13
tests/toolbar/ToolbarUtils.js

@@ -1,16 +1,12 @@
 
-var ToolbarUtils = {
+export function expectButtonEnabled(name, bool) {
+	var el = $('.fc-' + name + '-button');
+	expect(el.length).toBe(1);
+	expect(el.prop('disabled')).toBe(!bool);
+	expect(el.hasClass('fc-state-disabled')).toBe(!bool);
+}
 
-	expectButtonEnabled: function(name, bool) {
-		var el = $('.fc-' + name + '-button');
-		expect(el.length).toBe(1);
-		expect(el.prop('disabled')).toBe(!bool);
-		expect(el.hasClass('fc-state-disabled')).toBe(!bool);
-	},
 
-
-	getTitleText: function() {
-		return $.trim($('.fc-toolbar h2').text());
-	}
-
-};
+export function getTitleText() {
+	return $.trim($('.fc-toolbar h2').text());
+}

+ 9 - 6
tests/toolbar/next-button.js

@@ -5,6 +5,9 @@ TODO:
 SEE ALSO:
 - visibleRange, dateAlignment, dateIncrement
 */
+
+import { expectButtonEnabled } from './ToolbarUtils';
+
 describe('next button', function() {
 	pushOptions({
 		defaultView: 'agendaWeek',
@@ -14,7 +17,7 @@ describe('next button', function() {
 	describe('when there is no validRange', function() {
 		it('is enabled', function() {
 			initCalendar();
-			ToolbarUtils.expectButtonEnabled('next', true);
+			expectButtonEnabled('next', true);
 		});
 	});
 
@@ -25,7 +28,7 @@ describe('next button', function() {
 		});
 		it('is enabled', function() {
 			initCalendar();
-			ToolbarUtils.expectButtonEnabled('next', true);
+			expectButtonEnabled('next', true);
 		});
 	});
 
@@ -36,7 +39,7 @@ describe('next button', function() {
 		});
 		it('is enabled', function() {
 			initCalendar();
-			ToolbarUtils.expectButtonEnabled('next', true);
+			expectButtonEnabled('next', true);
 		});
 	});
 
@@ -47,7 +50,7 @@ describe('next button', function() {
 		});
 		it('is disabled', function() {
 			initCalendar();
-			ToolbarUtils.expectButtonEnabled('next', false);
+			expectButtonEnabled('next', false);
 		});
 	});
 
@@ -60,7 +63,7 @@ describe('next button', function() {
 		});
 		it('is enabled', function() {
 			initCalendar();
-			ToolbarUtils.expectButtonEnabled('next', true);
+			expectButtonEnabled('next', true);
 		});
 	});
 
@@ -72,7 +75,7 @@ describe('next button', function() {
 		});
 		it('is enabled', function() {
 			initCalendar();
-			ToolbarUtils.expectButtonEnabled('next', true);
+			expectButtonEnabled('next', true);
 		});
 	});
 });

+ 8 - 5
tests/toolbar/prev-button.js

@@ -5,6 +5,9 @@ TODO:
 SEE ALSO:
 - other range intersection tests handled by next-button
 */
+
+import { expectButtonEnabled } from './ToolbarUtils';
+
 describe('prev button', function() {
 	pushOptions({
 		defaultView: 'agendaWeek',
@@ -14,7 +17,7 @@ describe('prev button', function() {
 	describe('when there is no specified validRange', function() {
 		it('is enabled', function() {
 			initCalendar();
-			ToolbarUtils.expectButtonEnabled('prev', true);
+			expectButtonEnabled('prev', true);
 		});
 	});
 
@@ -25,7 +28,7 @@ describe('prev button', function() {
 		});
 		it('is disabled', function() {
 			initCalendar();
-			ToolbarUtils.expectButtonEnabled('prev', false);
+			expectButtonEnabled('prev', false);
 		});
 	});
 
@@ -39,7 +42,7 @@ describe('prev button', function() {
 
 		it('when prev date range is partially before validRange', function() {
 			initCalendar();
-			ToolbarUtils.expectButtonEnabled('prev', false);
+			expectButtonEnabled('prev', false);
 		});
 	});
 
@@ -52,7 +55,7 @@ describe('prev button', function() {
 		});
 		it('is enabled', function() {
 			initCalendar();
-			ToolbarUtils.expectButtonEnabled('prev', true);
+			expectButtonEnabled('prev', true);
 		});
 	});
 
@@ -64,7 +67,7 @@ describe('prev button', function() {
 		});
 		it('is enabled', function() {
 			initCalendar();
-			ToolbarUtils.expectButtonEnabled('prev', true);
+			expectButtonEnabled('prev', true);
 		});
 	});
 });

+ 4 - 3
tests/toolbar/title.js

@@ -1,3 +1,4 @@
+import { getTitleText } from './ToolbarUtils';
 
 describe('calendar title', function() {
 	pushOptions({
@@ -9,11 +10,11 @@ describe('calendar title', function() {
 			initCalendar({
 				defaultView: 'month'
 			});
-			expect(ToolbarUtils.getTitleText()).toBe('March 2017');
+			expect(getTitleText()).toBe('March 2017');
 			currentCalendar.changeView('agendaWeek');
-			expect(ToolbarUtils.getTitleText()).toBe('Mar 26 – Apr 1, 2017');
+			expect(getTitleText()).toBe('Mar 26 – Apr 1, 2017');
 			currentCalendar.changeView('month');
-			expect(ToolbarUtils.getTitleText()).toBe('March 2017');
+			expect(getTitleText()).toBe('March 2017');
 		});
 	});
 });

+ 7 - 4
tests/toolbar/today-button.js

@@ -5,6 +5,9 @@ TODO:
 SEE ALSO:
 - other range intersection tests handled by next-button
 */
+
+import { expectButtonEnabled } from './ToolbarUtils';
+
 describe('today button', function() {
 	pushOptions({
 		defaultView: 'month',
@@ -17,7 +20,7 @@ describe('today button', function() {
 		});
 		it('is disabled', function() {
 			initCalendar();
-			ToolbarUtils.expectButtonEnabled('today', false);
+			expectButtonEnabled('today', false);
 		});
 	})
 
@@ -27,7 +30,7 @@ describe('today button', function() {
 		});
 		it('is enabled', function() {
 			initCalendar();
-			ToolbarUtils.expectButtonEnabled('today', true);
+			expectButtonEnabled('today', true);
 		});
 	});
 
@@ -39,7 +42,7 @@ describe('today button', function() {
 		describe('when no specified validRange', function() {
 			it('is enabled', function() {
 				initCalendar();
-				ToolbarUtils.expectButtonEnabled('today', true);
+				expectButtonEnabled('today', true);
 			});
 		});
 
@@ -49,7 +52,7 @@ describe('today button', function() {
 			});
 			it('is disabled', function() {
 				initCalendar();
-				ToolbarUtils.expectButtonEnabled('today', false);
+				expectButtonEnabled('today', false);
 			});
 		});
 	});