From de5e13598a79b3876de3902f5985a3bf0bd0d6a0 Mon Sep 17 00:00:00 2001
From: Timo Tijhof <krinklemail@gmail.com>
Date: Sat, 17 May 2014 02:54:13 +0200
Subject: [PATCH] mediawiki.user: Use mw.log.deprecate to track user() and
 anonymous()

Follows-up I5970be9e859358 which deprecated these orignally.

Also remove obsolete tests now that they're linked by reference.

Change-Id: I559efa8a61de9f7b600c7b74edd5a56fb0a33b00
---
 resources/src/mediawiki/mediawiki.user.js     | 30 +++++++++----------
 .../mediawiki/mediawiki.user.test.js          |  6 +---
 2 files changed, 15 insertions(+), 21 deletions(-)

diff --git a/resources/src/mediawiki/mediawiki.user.js b/resources/src/mediawiki/mediawiki.user.js
index 0cf897a6cb..fd9690b1dc 100644
--- a/resources/src/mediawiki/mediawiki.user.js
+++ b/resources/src/mediawiki/mediawiki.user.js
@@ -88,14 +88,6 @@
 			return mw.config.get( 'wgUserName' );
 		},
 
-		/**
-		 * @inheritdoc #getName
-		 * @deprecated since 1.20 Use #getName instead
-		 */
-		name: function () {
-			return user.getName();
-		},
-
 		/**
 		 * Get date user registered, if available
 		 *
@@ -124,14 +116,6 @@
 			return user.getName() === null;
 		},
 
-		/**
-		 * @inheritdoc #isAnon
-		 * @deprecated since 1.20 Use #isAnon instead
-		 */
-		anonymous: function () {
-			return user.isAnon();
-		},
-
 		/**
 		 * Get an automatically generated random ID (stored in a session cookie)
 		 *
@@ -258,4 +242,18 @@
 		}
 	};
 
+	/**
+	 * @method name
+	 * @inheritdoc #getName
+	 * @deprecated since 1.20 Use #getName instead
+	 */
+	mw.log.deprecate( user, 'name', user.getName );
+
+	/**
+	 * @method anonymous
+	 * @inheritdoc #isAnon
+	 * @deprecated since 1.20 Use #isAnon instead
+	 */
+	mw.log.deprecate( user, 'anonymous', user.isAnon );
+
 }( mediaWiki, jQuery ) );
diff --git a/tests/qunit/suites/resources/mediawiki/mediawiki.user.test.js b/tests/qunit/suites/resources/mediawiki/mediawiki.user.test.js
index 0bfd50119d..91321a2fc9 100644
--- a/tests/qunit/suites/resources/mediawiki/mediawiki.user.test.js
+++ b/tests/qunit/suites/resources/mediawiki/mediawiki.user.test.js
@@ -9,16 +9,14 @@
 		assert.ok( mw.user.options instanceof mw.Map, 'options instance of mw.Map' );
 	} );
 
-	QUnit.test( 'user status', 11, function ( assert ) {
+	QUnit.test( 'user status', 7, function ( assert ) {
 
 		// Forge an anonymous user
 		mw.config.set( 'wgUserName', null );
 		delete mw.config.values.wgUserId;
 
 		assert.strictEqual( mw.user.getName(), null, 'user.getName() returns null when anonymous' );
-		assert.strictEqual( mw.user.name(), null, 'user.name() compatibility' );
 		assert.assertTrue( mw.user.isAnon(), 'user.isAnon() returns true when anonymous' );
-		assert.assertTrue( mw.user.anonymous(), 'user.anonymous() compatibility' );
 		assert.strictEqual( mw.user.getId(), 0, 'user.getId() returns 0 when anonymous' );
 
 		// Not part of startUp module
@@ -26,9 +24,7 @@
 		mw.config.set( 'wgUserId', 123 );
 
 		assert.equal( mw.user.getName(), 'John', 'user.getName() returns username when logged-in' );
-		assert.equal( mw.user.name(), 'John', 'user.name() compatibility' );
 		assert.assertFalse( mw.user.isAnon(), 'user.isAnon() returns false when logged-in' );
-		assert.assertFalse( mw.user.anonymous(), 'user.anonymous() compatibility' );
 		assert.strictEqual( mw.user.getId(), 123, 'user.getId() returns correct ID when logged-in' );
 
 		assert.equal( mw.user.id(), 'John', 'user.id Returns username when logged-in' );
-- 
2.20.1