test(changeLanguage): fix a failing test case + better deprecation me…

…ssage

angular-moment.js

@@ -271,21 +271,18 @@
 					}
 					return result;
 				};
-				
+
 				/**
 				 * @ngdoc function
 				 * @name angularMoment.service.amMoment#changeLanguage
 				 * @methodOf angularMoment.service.amMoment
+				 * @deprecated Please use changeLocale() instead.
 				 *
 				 * @description
-				 * Deprecated. Please use changeLocale()
-				 * Changes the language for moment.js and updates all the am-time-ago directive instances
-				 * with the new language.
-				 *
-				 * @param {string} lang 2-letter language code (e.g. en, es, ru, etc.)
+				 * Deprecated. Please use changeLocale() instead.
 				 */
 				this.changeLanguage = function (lang) {
-					$log.warn('angular-moment: Usage of angular-moment.changeLanguage() is deprecated. Please use changeLocale()');
+					$log.warn('angular-moment: Usage of amMoment.changeLanguage() is deprecated. Please use changeLocale()');
 					return that.changeLocale(lang);
 				};
 

tests.js

@@ -25,7 +25,7 @@ describe('module angularMoment', function () {
 		originalAngularMomentConfig = angular.copy(angularMomentConfig);
 
 		// Ensure the locale of moment.js is set to en by default
-		moment.lang('en');
+		(moment.locale || moment.lang)('en');
 		// Add a sample timezone for tests
 		moment.tz.add('Pacific/Tahiti|LMT TAHT|9W.g a0|01|-2joe1.I');
 	}));
@@ -499,16 +499,14 @@ describe('module angularMoment', function () {
 				expect(eventBroadcasted).toBe(false);
 			});
 		});
-
-
+
 		describe('#changeLanguage', function () {
 			it('should issue a warning about changeLanguage() deprecation', inject(function ($log) {
-				amMoment.changeLocale('fr');
 				spyOn($log, 'warn');
-				expect($log.warn).toHaveBeenCalledWith('angular-moment: Usage of changeLanguage() is deprecated. Please use changeLocale()');
+				amMoment.changeLanguage('fr');
+				expect($log.warn).toHaveBeenCalledWith('angular-moment: Usage of amMoment.changeLanguage() is deprecated. Please use changeLocale()');
 			}));
 		});
-
 
 		describe('#preprocessDate', function () {
 			it('should call a custom preprocessor that was registered on amMoment.preprocessors', function () {