Merge remote branch 'andym/addon-default-name'

apps/jetpack/models.py

@@ -200,8 +200,11 @@ def _get_full_name(full_name, username, type_id, i=0):
             i = i + 1
             return _get_full_name(full_name, username, type_id, i)
 
-        name = settings.DEFAULT_PACKAGE_FULLNAME.get(self.type,
-                                                     self.author.username)
+        username = self.author.username
+        if self.author.get_profile():
+            username = self.author.get_profile().nickname or username
+
+        name = settings.DEFAULT_PACKAGE_FULLNAME.get(self.type, username)
         self.full_name = _get_full_name(name, self.author.username, self.type)
 
     def set_name(self):

apps/jetpack/tests/package_tests.py

@@ -39,6 +39,22 @@ def test_addon_creation(self):
         self.failUnless(package.name)
         self.assertEqual(package.full_name, self.author.username)
 
+    def test_addon_creation_with_nickname(self):
+        """In production if you log in with an AMO user, the username
+        is set to a number and the nickname on the profile is set to the
+        real username."""
+        profile = self.author.get_profile()
+        profile.nickname = 'Gordon'
+        profile.save()
+
+        package = Package(
+            author=self.author,
+            type='a'
+        )
+        package.save()
+
+        eq_(package.full_name, 'Gordon')
+
     def test_automatic_numbering(self):
         Package(
             author=self.author,