Ver Fonte

update hard refs to lang in automated tests

Adam Shaw há 9 anos atrás
pai
commit
e3604be5a0
80 ficheiros alterados com 122 adições e 122 exclusões
  1. 1 1
      tests/automated/Agenda-render.js
  2. 1 1
      tests/automated/DayGrid-events.js
  3. 1 1
      tests/automated/TimeGrid-events.js
  4. 1 1
      tests/automated/View.js
  5. 1 1
      tests/automated/addEventSource.js
  6. 1 1
      tests/automated/agenda-view.js
  7. 1 1
      tests/automated/allDaySlot.js
  8. 3 3
      tests/automated/allDayText.js
  9. 1 1
      tests/automated/aspectRatio.js
  10. 2 2
      tests/automated/axisFormat.js
  11. 1 1
      tests/automated/background-events.js
  12. 1 1
      tests/automated/basic-view.js
  13. 1 1
      tests/automated/businessHours.js
  14. 1 1
      tests/automated/buttonText.js
  15. 3 3
      tests/automated/columnFormat.js
  16. 1 1
      tests/automated/constraint.js
  17. 1 1
      tests/automated/constructor.js
  18. 1 1
      tests/automated/custom-view-class.js
  19. 4 4
      tests/automated/custom-view-duration.js
  20. 1 1
      tests/automated/dayClick.js
  21. 4 4
      tests/automated/dayNames.js
  22. 5 5
      tests/automated/dayNamesShort.js
  23. 2 2
      tests/automated/dayPopoverFormat.js
  24. 1 1
      tests/automated/dayRender.js
  25. 1 1
      tests/automated/defaultAllDayEventDuration.js
  26. 1 1
      tests/automated/defaultTimedEventDuration.js
  27. 1 1
      tests/automated/destroy.js
  28. 1 1
      tests/automated/displayEventEnd.js
  29. 1 1
      tests/automated/event-coloring.js
  30. 1 1
      tests/automated/event-feed-param.js
  31. 1 1
      tests/automated/event-obj.js
  32. 1 1
      tests/automated/event-resize.js
  33. 1 1
      tests/automated/eventDestroy.js
  34. 2 2
      tests/automated/eventLimitText.js
  35. 1 1
      tests/automated/eventMouseover.js
  36. 1 1
      tests/automated/eventRender.js
  37. 1 1
      tests/automated/events-gcal.js
  38. 1 1
      tests/automated/external-dnd-advanced.js
  39. 1 1
      tests/automated/external-dnd.js
  40. 2 2
      tests/automated/firstDay.js
  41. 1 1
      tests/automated/fixedWeekCount.js
  42. 1 1
      tests/automated/forceEventDuration.js
  43. 1 1
      tests/automated/formatRange.js
  44. 1 1
      tests/automated/getEventSourceById.js
  45. 1 1
      tests/automated/getEventSources.js
  46. 1 1
      tests/automated/handleWindowResize.js
  47. 1 1
      tests/automated/header-navigation.js
  48. 1 1
      tests/automated/header-rendering.js
  49. 1 1
      tests/automated/height-and-contentHeight.js
  50. 1 1
      tests/automated/hiddenDays.js
  51. 2 2
      tests/automated/isRTL.js
  52. 12 12
      tests/automated/lang.js
  53. 1 1
      tests/automated/maxTime.js
  54. 1 1
      tests/automated/minTime.js
  55. 1 1
      tests/automated/moment-construct.js
  56. 5 5
      tests/automated/monthNames.js
  57. 5 5
      tests/automated/monthNamesShort.js
  58. 1 1
      tests/automated/nextDayThreshold.js
  59. 1 1
      tests/automated/now.js
  60. 1 1
      tests/automated/refetchEventSources.js
  61. 1 1
      tests/automated/removeEvents.js
  62. 1 1
      tests/automated/scroll-state.js
  63. 1 1
      tests/automated/scrollTime.js
  64. 1 1
      tests/automated/select-callback.js
  65. 1 1
      tests/automated/select-method.js
  66. 1 1
      tests/automated/selectHelper.js
  67. 1 1
      tests/automated/slotDuration.js
  68. 1 1
      tests/automated/themeButtonIcons.js
  69. 3 3
      tests/automated/timeFormat.js
  70. 1 1
      tests/automated/titleFormat.js
  71. 1 1
      tests/automated/unselectAuto.js
  72. 1 1
      tests/automated/updateEvent.js
  73. 1 1
      tests/automated/viewDestroy.js
  74. 1 1
      tests/automated/viewRender.js
  75. 1 1
      tests/automated/views-specific-options.js
  76. 1 1
      tests/automated/weekMode.js
  77. 2 2
      tests/automated/weekNumberCalculation.js
  78. 2 2
      tests/automated/weekNumberTitle.js
  79. 1 1
      tests/automated/weekNumbers.js
  80. 1 1
      tests/automated/weekends.js

+ 1 - 1
tests/automated/Agenda-render.js

@@ -40,4 +40,4 @@ describe('Agenda view rendering', function() {
 			expect(firstSlat.find('.fc-axis')).toBeRightOf(firstSlat.find('td:not(.fc-axis)'));
 		});
 	});
-});
+});

+ 1 - 1
tests/automated/DayGrid-events.js

@@ -269,4 +269,4 @@ describe('DayGrid event rendering', function() {
 		}
 	}
 
-});
+});

+ 1 - 1
tests/automated/TimeGrid-events.js

@@ -67,4 +67,4 @@ describe('TimeGrid event rendering', function() {
 		expect(seg).toHaveAttr('href');
 	});
 
-});
+});

+ 1 - 1
tests/automated/View.js

@@ -30,4 +30,4 @@ describe('View object', function() {
 			expect(options.viewRender).toHaveBeenCalled();
 		});
 	});
-});
+});

+ 1 - 1
tests/automated/addEventSource.js

@@ -105,4 +105,4 @@ describe('addEventSource', function() {
 		expect($('.fc-event').length).toEqual(3);
 	}
 
-});
+});

+ 1 - 1
tests/automated/agenda-view.js

@@ -49,4 +49,4 @@ describe('agenda view rendering', function() {
 		});
 	});
 
-});
+});

+ 1 - 1
tests/automated/allDaySlot.js

@@ -77,4 +77,4 @@ describe('allDaySlots', function() {
 			});
 		});
 	});
-});
+});

+ 3 - 3
tests/automated/allDayText.js

@@ -59,7 +59,7 @@ describe('allDayText', function() {
 				var options = {
 					defaultView: 'agendaWeek',
 					allDaySlot: true,
-					lang: 'pt-br'
+					locale: 'pt-br'
 				};
 				$('#cal').fullCalendar(options);
 				var allDayText = $('.fc-day-grid > .fc-row > .fc-bg .fc-axis').text();
@@ -71,7 +71,7 @@ describe('allDayText', function() {
 				var options = {
 					defaultView: 'agendaDay',
 					allDaySlot: true,
-					lang: 'pt-br'
+					locale: 'pt-br'
 				};
 				$('#cal').fullCalendar(options);
 				var allDayText = $('.fc-day-grid > .fc-row > .fc-bg .fc-axis').text();
@@ -105,4 +105,4 @@ describe('allDayText', function() {
 			});
 		});
 	});
-});
+});

+ 1 - 1
tests/automated/aspectRatio.js

@@ -136,4 +136,4 @@ describe('aspectRatio', function() {
 			});
 		});
 	});
-});
+});

+ 2 - 2
tests/automated/axisFormat.js

@@ -20,7 +20,7 @@ describe('axisFormat', function() {
 	});
 
 	it('renders correctly when default and the language is customized', function() {
-		options.lang = 'en-gb';
+		options.locale = 'en-gb';
 		$('#cal').fullCalendar(options);
 		expect(getAxisText()).toBe('00');
 	});
@@ -30,4 +30,4 @@ describe('axisFormat', function() {
 		$('#cal').fullCalendar(options);
 		expect(getAxisText()).toBe('0:00:00!');
 	});
-});
+});

+ 1 - 1
tests/automated/background-events.js

@@ -750,4 +750,4 @@ describe('background events', function() {
 		return $('.fc-time-grid .fc-content-skeleton td:not(.fc-axis):eq(' + col + ') .fc-nonbusiness');
 	}
 
-});
+});

+ 1 - 1
tests/automated/basic-view.js

@@ -47,4 +47,4 @@ describe('basic view rendering', function() {
 		});
 	});
 
-});
+});

+ 1 - 1
tests/automated/businessHours.js

@@ -277,4 +277,4 @@ describe('businessHours', function() {
 		}
 	}
 
-});
+});

+ 1 - 1
tests/automated/buttonText.js

@@ -118,7 +118,7 @@ describe('button text', function() {
   describe('when lang is not default', function() {
 
     beforeEach(function() {
-      settings.lang = 'fr';
+      settings.locale = 'fr';
     });
 
     describe('with default buttonIcons', function() {

+ 3 - 3
tests/automated/columnFormat.js

@@ -72,7 +72,7 @@ describe('columnFormat', function() {
         beforeEach(function() {
             $('#cal').fullCalendar({
                 defaultDate: '2014-05-11',
-                lang: 'fr'
+                locale: 'fr'
             });
         });
 
@@ -98,7 +98,7 @@ describe('columnFormat', function() {
         beforeEach(function() {
             $('#cal').fullCalendar({
                 defaultDate: '2014-05-11',
-                lang: 'en-gb'
+                locale: 'en-gb'
             });
         });
 
@@ -124,7 +124,7 @@ describe('columnFormat', function() {
         beforeEach(function() {
             $('#cal').fullCalendar({
                 defaultDate: '2014-05-11',
-                lang: 'ko'
+                locale: 'ko'
             });
         });
 

+ 1 - 1
tests/automated/constraint.js

@@ -794,4 +794,4 @@ describe('selectConstraint', function() {
 			});
 		});
 	});
-});
+});

+ 1 - 1
tests/automated/constructor.js

@@ -84,4 +84,4 @@ describe('constructor', function() {
 			});
 		});
 	});
-});
+});

+ 1 - 1
tests/automated/custom-view-class.js

@@ -77,4 +77,4 @@ describe('custom view class', function() {
 		delete FC.views.custom;
 	});
 
-});
+});

+ 4 - 4
tests/automated/custom-view-duration.js

@@ -241,7 +241,7 @@ describe('custom view', function() {
 		});
 
 		it('accepts lang\'s single-unit-match override', function() {
-			options.lang = 'fr';
+			options.locale = 'fr';
 			options.views.custom = {
 				type: 'basic',
 				duration: { days: 1 }
@@ -255,7 +255,7 @@ describe('custom view', function() {
 		});
 
 		it('accepts explicit View-Specific buttonText, overriding lang\'s single-unit-match override', function() {
-			options.lang = 'fr';
+			options.locale = 'fr';
 			options.views.custom = {
 				type: 'basic',
 				duration: { days: 1 },
@@ -311,7 +311,7 @@ describe('custom view', function() {
 		});
 
 		it('falls back to humanized duration and respects language', function() {
-			options.lang = 'fr';
+			options.locale = 'fr';
 			options.views.custom = {
 				type: 'basic',
 				duration: { days: 4 }
@@ -336,4 +336,4 @@ describe('custom view', function() {
 			delete $.fullCalendar.views.crazy;
 		});
 	});
-});
+});

+ 1 - 1
tests/automated/dayClick.js

@@ -185,4 +185,4 @@ describe('dayClick', function() {
 		});
 	});
 
-});
+});

+ 4 - 4
tests/automated/dayNames.js

@@ -24,7 +24,7 @@ describe('day names', function() {
   });
 
   afterEach(function() {
-    moment.lang('en'); // reset moment's global language
+    moment.locale('en'); // reset moment's global language
   });
 
   testableClasses.forEach(function(viewClass, index, viewClasses) {
@@ -35,7 +35,7 @@ describe('day names', function() {
 
       describe('when lang is default', function() {
         beforeEach(function() {
-          settings.lang = 'en';
+          settings.locale = 'en';
         });
 
         dayClasses.forEach(function(cls, index, classes) {
@@ -52,12 +52,12 @@ describe('day names', function() {
       $.each(languages, function(index, language) {
         describe('when lang is ' + language, function() {
           beforeEach(function() {
-            moment.lang(language);
+            moment.locale(language);
           });
 
           dayClasses.forEach(function(cls, index, classes) {
             it('should be the translation for ' + moment.weekdays()[index], function() {
-              settings.lang = language;
+              settings.locale = language;
               settings.now = moment(referenceDate).add(index, 'days');
               $('#cal').fullCalendar(settings);
 

+ 5 - 5
tests/automated/dayNamesShort.js

@@ -22,7 +22,7 @@ describe('short day names', function() {
   });
 
   afterEach(function() {
-    moment.lang('en'); // reset moment's global language
+    moment.locale('en'); // reset moment's global language
   });
 
   testableClasses.forEach(function(viewClass, index, viewClasses) {
@@ -33,7 +33,7 @@ describe('short day names', function() {
 
       describe('when lang is default', function() {
         it('should be in English', function() {
-          moment.lang('en');
+          moment.locale('en');
           $('#cal').fullCalendar(settings);
           var weekdays = moment.weekdaysShort();
 
@@ -46,11 +46,11 @@ describe('short day names', function() {
       describe('when lang is not default', function() {
         languages.forEach(function(language, index, languages) {
           it('should be in the selected language', function() {
-            settings.lang = language;
+            settings.locale = language;
             $('#cal').fullCalendar(settings);
 
-            moment.lang(language);
-            var dow = moment.langData(language)._week.dow;
+            moment.locale(language);
+            var dow = moment.localeData(language)._week.dow;
             var weekdays = moment.weekdaysShort();
 
             dayClasses.forEach(function(cls, index, classes) {

+ 2 - 2
tests/automated/dayPopoverFormat.js

@@ -29,13 +29,13 @@ describe('dayPopoverFormat', function() {
 	});
 
 	it('is affected by the current locale when the value is default', function() {
-		options.lang = 'fr';
+		options.locale = 'fr';
 		init();
 		expect($('.fc-more-popover > .fc-header .fc-title')).toHaveText('29 juillet 2014');
 	});
 
 	it('still maintains the same format when explicitly set, and there is a lang', function() {
-		options.lang = 'fr';
+		options.locale = 'fr';
 		options.dayPopoverFormat = 'YYYY';
 		init();
 		expect($('.fc-more-popover > .fc-header .fc-title')).toHaveText('2014');

+ 1 - 1
tests/automated/dayRender.js

@@ -83,4 +83,4 @@ describe('dayRender', function() {
 		expect($('#cal td[data-date="2014-05-01"]')).toHaveClass('mycustomclass');
 	});
 
-});
+});

+ 1 - 1
tests/automated/defaultAllDayEventDuration.js

@@ -84,4 +84,4 @@ describe('defaultAllDayEventDuration', function() {
 			});
 		});
 	});
-});
+});

+ 1 - 1
tests/automated/defaultTimedEventDuration.js

@@ -114,4 +114,4 @@ describe('defaultTimedEventDuration', function() {
 			});
 		});
 	});
-});
+});

+ 1 - 1
tests/automated/destroy.js

@@ -80,4 +80,4 @@ describe('destroy', function() {
 		});
 	});
 
-});
+});

+ 1 - 1
tests/automated/displayEventEnd.js

@@ -157,4 +157,4 @@ describe('displayEventEnd', function() {
 			});
 		});
 	});
-});
+});

+ 1 - 1
tests/automated/event-coloring.js

@@ -202,4 +202,4 @@ describe('event coloring', function() {
 		return el.css(prop);
 	}
 
-});
+});

+ 1 - 1
tests/automated/event-feed-param.js

@@ -69,4 +69,4 @@ describe('event feed params', function() {
 		expect(request.data.feedctz).toEqual('America/Los_Angeles');
 	});
 
-});
+});

+ 1 - 1
tests/automated/event-obj.js

@@ -165,4 +165,4 @@ describe('event object creation', function() {
 		expect(event.prop2).toEqual([ 'a', 'b' ]);
 	});
 
-});
+});

+ 1 - 1
tests/automated/event-resize.js

@@ -504,4 +504,4 @@ describe('eventResize', function() {
 			$('#cal').fullCalendar(options);
 		}, 0);
 	}
-});
+});

+ 1 - 1
tests/automated/eventDestroy.js

@@ -56,4 +56,4 @@ describe('eventDestroy', function() {
 		});
 	});
 
-});
+});

+ 2 - 2
tests/automated/eventLimitText.js

@@ -34,13 +34,13 @@ describe('eventLimitText', function() {
 	});
 
 	it('has a default value that is affected by the custom locale', function() {
-		options.lang = 'fr';
+		options.locale = 'fr';
 		$('#cal').fullCalendar(options);
 		expect($('.fc-more')).toHaveText('+2 en plus');
 	});
 
 	it('is not affected by a custom locale when the value is explicitly specified', function() {
-		options.lang = 'fr';
+		options.locale = 'fr';
 		options.eventLimitText = 'extra';
 		$('#cal').fullCalendar(options);
 		expect($('.fc-more')).toHaveText('+2 extra');

+ 1 - 1
tests/automated/eventMouseover.js

@@ -37,4 +37,4 @@ describe('eventMouseover', function() {
 			});
 		});
 	});
-});
+});

+ 1 - 1
tests/automated/eventRender.js

@@ -290,4 +290,4 @@ describe('eventRender', function() {
 			});
 		});
 	});
-});
+});

+ 1 - 1
tests/automated/events-gcal.js

@@ -353,4 +353,4 @@ describe('Google Calendar plugin', function() {
 		});
 	});
 
-});
+});

+ 1 - 1
tests/automated/external-dnd-advanced.js

@@ -388,4 +388,4 @@ describe('advanced external dnd', function() {
 		}, 'drag'); // .drag className
 	}
 
-});
+});

+ 1 - 1
tests/automated/external-dnd.js

@@ -346,4 +346,4 @@ describe('external drag and drop', function() {
 			});
 		});
 	});
-});
+});

+ 2 - 2
tests/automated/firstDay.js

@@ -185,7 +185,7 @@ describe('First Day', function() {
 
 	it('should have a different default value based on the language', function() {
 		$('#cal').fullCalendar({
-			lang: 'en-gb'
+			locale: 'en-gb'
 		});
 		// firstDay will be 1 (Monday) in Great Britain
 		var daysOfWeek = $('.fc-day-header');
@@ -198,4 +198,4 @@ describe('First Day', function() {
 		expect(daysOfWeek[6]).toHaveClass('fc-sun');
 	});
 
-});
+});

+ 1 - 1
tests/automated/fixedWeekCount.js

@@ -45,4 +45,4 @@ describe('fixedWeekCount', function() {
 			});
 		});
 	});
-});
+});

+ 1 - 1
tests/automated/forceEventDuration.js

@@ -61,4 +61,4 @@ describe('forceEventDuration', function() {
 	// (using defaultTimedEventDuration and defaultAllDayEventDuration)
 	// is done in those test files.
 
-});
+});

+ 1 - 1
tests/automated/formatRange.js

@@ -129,7 +129,7 @@ describe('formatRange', function() {
 			$('#cal').fullCalendar({
 				defaultView: 'basicWeek',
 				defaultDate: '2014-05-20',
-				lang: 'fr',
+				locale: 'fr',
 				titleFormat: 'dddd MMMM D YYYY',
 				titleRangeSeparator: ' - '
 			});

+ 1 - 1
tests/automated/getEventSourceById.js

@@ -45,4 +45,4 @@ describe('getEventSource', function() {
 
 		done();
 	});
-});
+});

+ 1 - 1
tests/automated/getEventSources.js

@@ -42,4 +42,4 @@ describe('getEventSources', function() {
 
 		done();
 	});
-});
+});

+ 1 - 1
tests/automated/handleWindowResize.js

@@ -19,4 +19,4 @@ describe('handleWindowResize', function() {
 		});
 	});
 	*/
-});
+});

+ 1 - 1
tests/automated/header-navigation.js

@@ -58,4 +58,4 @@ describe('header navigation', function() {
 			expect(newDate).toEqualNow();
 		});
 	});
-});
+});

+ 1 - 1
tests/automated/header-rendering.js

@@ -140,4 +140,4 @@ describe('header rendering', function() {
 			}, 100);
 		});
 	});
-});
+});

+ 1 - 1
tests/automated/height-and-contentHeight.js

@@ -298,4 +298,4 @@ function repeatClone(srcObj, times) {
 	return a;
 }
 
-})();
+})();

+ 1 - 1
tests/automated/hiddenDays.js

@@ -85,4 +85,4 @@ describe('hiddenDays', function() {
 			}).toThrow('invalid hiddenDays');
 		});
 	});
-});
+});

+ 2 - 2
tests/automated/isRTL.js

@@ -3,7 +3,7 @@ describe('isRTL', function() {
 	it('has it\'s default value computed differently based off of the language', function() {
 		affix('#cal');
 		$('#cal').fullCalendar({
-			lang: 'ar' // Arabic is RTL
+			locale: 'ar' // Arabic is RTL
 		});
 		var isRTL = $('#cal').fullCalendar('option', 'isRTL');
 		expect(isRTL).toEqual(true);
@@ -25,4 +25,4 @@ describe('isRTL', function() {
 		expect($('#cal')).not.toHaveClass('fc-ltr');
 	});
 
-});
+});

+ 12 - 12
tests/automated/lang.js

@@ -2,11 +2,11 @@
 describe('lang', function() {
 
 	afterEach(function() {
-		moment.lang('en');
+		moment.locale('en');
 	});
 
 	it('is not affected by global moment lang when unset', function() {
-		moment.lang('fr');
+		moment.locale('fr');
 		affix('#cal');
 		$('#cal').fullCalendar();
 		var calendar = $('#cal').fullCalendar('getCalendar');
@@ -16,10 +16,10 @@ describe('lang', function() {
 	});
 
 	it('is not affected by global moment lang when unset', function() {
-		moment.lang('fr');
+		moment.locale('fr');
 		affix('#cal');
 		$('#cal').fullCalendar({
-			lang: 'es'
+			locale: 'es'
 		});
 		var calendar = $('#cal').fullCalendar('getCalendar');
 		var mom = calendar.moment('2014-05-01');
@@ -28,15 +28,15 @@ describe('lang', function() {
 	});
 
 	it('doesn\'t side-effect the global moment lang when customized', function() {
-		moment.lang('fr');
+		moment.locale('fr');
 		affix('#cal');
 		$('#cal').fullCalendar({
-			lang: 'es'
+			locale: 'es'
 		});
 		var mom = moment.utc('2014-05-01');
 		var s = mom.format('dddd MMMM Do YYYY');
 		expect(s).toEqual('jeudi mai 1er 2014');
-		expect(moment.lang()).toEqual('fr');
+		expect(moment.locale()).toEqual('fr');
 	});
 
 	// the most recent version of moment will actually throw a cryptic exception,
@@ -46,7 +46,7 @@ describe('lang', function() {
 	xit('defaults to English when configured to language that isn\'t loaded', function() {
 		affix('#cal');
 		$('#cal').fullCalendar({
-			lang: 'zz'
+			locale: 'zz'
 		});
 		var calendar = $('#cal').fullCalendar('getCalendar');
 		var mom = calendar.moment('2014-05-01');
@@ -58,7 +58,7 @@ describe('lang', function() {
 	it('works when certain language has no FC settings defined', function() {
 		affix('#cal');
 		$('#cal').fullCalendar({
-			lang: 'en-ca',
+			locale: 'en-ca',
 			defaultView: 'agendaWeek',
 			defaultDate: '2014-12-25',
 			events: [
@@ -72,16 +72,16 @@ describe('lang', function() {
 	it('allows dynamic setting', function() {
 		affix('#cal');
 		$('#cal').fullCalendar({
-			lang: 'es',
+			locale: 'es',
 			defaultDate: '2016-07-10',
 			defaultView: 'month'
 		});
 		expect($('.fc h2')).toHaveText('julio 2016');
 		expect($('.fc')).not.toHaveClass('fc-rtl');
 
-		$('#cal').fullCalendar('option', 'lang', 'ar');
+		$('#cal').fullCalendar('option', 'locale', 'ar');
 		expect($('.fc h2')).toHaveText('تموز يوليو ٢٠١٦');
 		expect($('.fc')).toHaveClass('fc-rtl');
 	});
 
-});
+});

+ 1 - 1
tests/automated/maxTime.js

@@ -121,4 +121,4 @@ describe('maxTime', function() {
 			});
 		});
 	});
-});
+});

+ 1 - 1
tests/automated/minTime.js

@@ -123,4 +123,4 @@ describe('minTime', function() {
 			});
 		});
 	});
-});
+});

+ 1 - 1
tests/automated/moment-construct.js

@@ -660,4 +660,4 @@ function testLiteralProcessing(construct) {
 	});
 }
 
-})();
+})();

+ 5 - 5
tests/automated/monthNames.js

@@ -11,7 +11,7 @@ describe('month name', function() {
   });
 
   afterEach(function() {
-    moment.lang('en'); // reset moment's global language
+    moment.locale('en'); // reset moment's global language
   });
 
   [ 'month', 'agendaDay', 'basicDay' ].forEach(function(viewClass, index, viewClasses) {
@@ -22,8 +22,8 @@ describe('month name', function() {
 
       describe('when lang is default', function() {
         beforeEach(function() {
-          settings.lang = 'en';
-          moment.lang('en');
+          settings.locale = 'en';
+          moment.locale('en');
         });
 
         moment.months().forEach(function(month, index, months) {
@@ -42,8 +42,8 @@ describe('month name', function() {
       languages.forEach(function(language, index, languages) {
         describe('when lang is ' + language, function() {
           beforeEach(function() {
-            settings.lang = language;
-            moment.lang(language);
+            settings.locale = language;
+            moment.locale(language);
           });
 
           moment.months().forEach(function(month, index, months) { // `month` will always be English

+ 5 - 5
tests/automated/monthNamesShort.js

@@ -11,7 +11,7 @@ describe('short month name', function() {
   });
 
   afterEach(function() {
-    moment.lang('en'); // reset moment's global language
+    moment.locale('en'); // reset moment's global language
   });
 
   [ 'agendaWeek', 'basicWeek' ].forEach(function(viewClass, index, viewClasses) {
@@ -22,8 +22,8 @@ describe('short month name', function() {
 
       describe('when lang is default', function() {
         beforeEach(function() {
-          settings.lang = 'en';
-          moment.lang('en');
+          settings.locale = 'en';
+          moment.locale('en');
         });
 
         moment.monthsShort().forEach(function(monthShort, index) {
@@ -42,8 +42,8 @@ describe('short month name', function() {
       languages.forEach(function(language, index, languages) {
         describe('when lang is ' + language, function() {
           beforeEach(function() {
-            settings.lang = language;
-            moment.lang(language);
+            settings.locale = language;
+            moment.locale(language);
           });
 
           moment.monthsShort().forEach(function(monthShort, index) { // `monthShort` will always be English

+ 1 - 1
tests/automated/nextDayThreshold.js

@@ -67,4 +67,4 @@ describe('nextDayThreshold', function() {
 		return Math.round(totalWidth / cellWidth);
 	}
 
-});
+});

+ 1 - 1
tests/automated/now.js

@@ -56,4 +56,4 @@ describe('now', function() {
 		expect(todayDate).toEqual('2014-05-01');
 	});
 
-});
+});

+ 1 - 1
tests/automated/refetchEventSources.js

@@ -217,4 +217,4 @@ describe('refetchEventSources', function() {
 			}
 		};
 	}
-});
+});

+ 1 - 1
tests/automated/removeEvents.js

@@ -147,4 +147,4 @@ describe('removeEvents', function() {
 		expect($('.fc-event').length).toEqual(3);
 	}
 
-});
+});

+ 1 - 1
tests/automated/scroll-state.js

@@ -83,4 +83,4 @@ describe('scroll state', function() {
 			scrollEl = $('#cal .fc-scroller');
 		});
 	}
-});
+});

+ 1 - 1
tests/automated/scrollTime.js

@@ -37,4 +37,4 @@ describe('scrollTime', function() {
 		expect(diff).toBeLessThan(3);
 	});
 
-});
+});

+ 1 - 1
tests/automated/select-callback.js

@@ -231,4 +231,4 @@ describe('select callback', function() {
 			});
 		});
 	});
-});
+});

+ 1 - 1
tests/automated/select-method.js

@@ -195,4 +195,4 @@ describe('select method', function() {
 			});
 		});
 	});
-});
+});

+ 1 - 1
tests/automated/selectHelper.js

@@ -19,4 +19,4 @@ describe('selectHelper', function() {
 		$('#cal').fullCalendar('select', '2014-08-04T01:00:00', '2014-08-04T04:00:00');
 		expect($('.fc-helper')).toHaveClass('didEventRender');
 	});
-});
+});

+ 1 - 1
tests/automated/slotDuration.js

@@ -93,4 +93,4 @@ describe('slotDuration', function() {
 			});
 		});
 	});
-});
+});

+ 1 - 1
tests/automated/themeButtonIcons.js

@@ -62,4 +62,4 @@ describe('themeButtonIcons', function() {
 		});
 	});
 
-});
+});

+ 3 - 3
tests/automated/timeFormat.js

@@ -30,7 +30,7 @@ describe('timeFormat', function() {
 		});
 
 		it('renders correctly when default and the language is customized', function() {
-			options.lang = 'en-gb';
+			options.locale = 'en-gb';
 			$('#cal').fullCalendar(options);
 			expect(getRenderedEventTime()).toBe('15');
 		});
@@ -54,7 +54,7 @@ describe('timeFormat', function() {
 		});
 
 		it('renders correctly when default and the language is customized', function() {
-			options.lang = 'en-gb';
+			options.locale = 'en-gb';
 			$('#cal').fullCalendar(options);
 			expect(getRenderedEventTime()).toBe('15:00 - 17:00');
 		});
@@ -95,4 +95,4 @@ describe('timeFormat', function() {
 			expect(getRenderedEventTime()).toBe('3p - 5p');
 		});
 	});
-});
+});

+ 1 - 1
tests/automated/titleFormat.js

@@ -83,7 +83,7 @@ describe('titleFormat', function() {
             $('#cal').fullCalendar({
                 defaultDate: '2014-06-12',
                 titleRangeSeparator: ' - ',
-                lang: 'fr'
+                locale: 'fr'
             });
         });
 

+ 1 - 1
tests/automated/unselectAuto.js

@@ -53,4 +53,4 @@ describe('unselectAuto', function() {
 			expect($('.fc-highlight').length).toBeGreaterThan(0);
 		});
 	});
-});
+});

+ 1 - 1
tests/automated/updateEvent.js

@@ -522,4 +522,4 @@ describe('updateEvent', function() {
 		whenMovingToTimed(shouldBeAmbiguouslyZoned);
 	});
 
-});
+});

+ 1 - 1
tests/automated/viewDestroy.js

@@ -57,4 +57,4 @@ describe('viewDestroy', function() {
 			$('#cal').fullCalendar('next'); // will trigger a viewDestroy/viewRender
 		});
 	}
-});
+});

+ 1 - 1
tests/automated/viewRender.js

@@ -42,4 +42,4 @@ describe('viewRender', function() {
 			$('#cal').fullCalendar(options);
 		});
 	}
-});
+});

+ 1 - 1
tests/automated/views-specific-options.js

@@ -100,4 +100,4 @@ describe('view-specific options', function() {
 			agendaDay: 'special!!!'
 		});
 	});
-});
+});

+ 1 - 1
tests/automated/weekMode.js

@@ -166,4 +166,4 @@ describe('weekMode', function() {
 		});
 		expect($('.fc-week').length).toBe(4);
 	});
-});
+});

+ 2 - 2
tests/automated/weekNumberCalculation.js

@@ -39,7 +39,7 @@ describe('weekNumberCalculation', function() {
 
 			it('should display a language-specific local week number', function() {
 				options.defaultDate = '2013-11-23'; // a Saturday
-				options.lang = 'ar';
+				options.locale = 'ar';
 				options.weekNumberCalculation = 'local';
 				$('#cal').fullCalendar(options);
 				expect(getRenderedWeekText()).toMatch(/٤٨|48/);
@@ -69,4 +69,4 @@ describe('weekNumberCalculation', function() {
 			});
 		});
 	});
-});
+});

+ 2 - 2
tests/automated/weekNumberTitle.js

@@ -28,7 +28,7 @@ describe('weekNumberTitle', function() {
 			});
 
 			it('renders correctly when unspecified and when language is customized', function() {
-				options.lang = 'es';
+				options.locale = 'es';
 				$('#cal').fullCalendar(options);
 				expect(getRenderedWeekNumberTitle()).toBe('Sm');
 			});
@@ -48,4 +48,4 @@ describe('weekNumberTitle', function() {
 			});
 		});
 	});
-});
+});

+ 1 - 1
tests/automated/weekNumbers.js

@@ -115,4 +115,4 @@ describe('weekNumbers', function() {
 
 	});
 
-});
+});

+ 1 - 1
tests/automated/weekends.js

@@ -27,4 +27,4 @@ describe('when weekends option is set', function() {
 		expect(sat).not.toBeDefined();
 	});
 
-});
+});