added merge_users management command by Daniel Mican

1 files changed, 22 insertions, 22 deletions

diff --git a/askbot/tests/management_command_tests.py b/askbot/tests/management_command_tests.py
index 756794f4..001689c1 100644
--- a/askbot/tests/management_command_tests.py
+++ b/askbot/tests/management_command_tests.py
@@ -27,25 +27,25 @@ class ManagementCommandTests(AskbotTestCase):
         user = auth.authenticate(username = username, password = password)
         self.assertTrue(user is not None)
 
-    def test_migrate_user_account(self):
-      """Verify a users account can be transfered to another user"""
-      # Create a new user and add some random related objects
-      user_one = self.create_user()
-      question = self.post_question(user=user_one)
-      comment = self.post_comment(user=user_one, parent_post=question)
-      number_of_gold = 50
-      user_one.gold = number_of_gold 
-      reputation = 20
-      user_one.reputation = reputation 
-      user_one.save()
-      # Create a second user and transfer all objects from 'user_one' to 'user_two'
-      user_two = self.create_user(username='unique')
-      management.call_command('migrate_user_account', user_one.id, user_two.id)
-      # Check that the first user was deleted
-      self.assertEqual(models.User.objects.filter(pk=user_one.id).count(), 0)
-      # Explicitly check that the values assigned to user_one are now user_two's
-      self.assertEqual(user_two.questions.filter(pk=question.id).count(), 1)  
-      self.assertEqual(user_two.comments.filter(pk=comment.id).count(), 1)  
-      user_two = models.User.objects.get(pk=2)
-      self.assertEqual(user_two.gold, number_of_gold) 
-      self.assertEqual(user_two.reputation, reputation)
+    def test_merge_users(self):
+        """Verify a users account can be transfered to another user"""
+        # Create a new user and add some random related objects
+        user_one = self.create_user()
+        question = self.post_question(user=user_one)
+        comment = self.post_comment(user=user_one, parent_post=question)
+        number_of_gold = 50
+        user_one.gold = number_of_gold 
+        reputation = 20
+        user_one.reputation = reputation 
+        user_one.save()
+        # Create a second user and transfer all objects from 'user_one' to 'user_two'
+        user_two = self.create_user(username='unique')
+        management.call_command('merge_users', user_one.id, user_two.id)
+        # Check that the first user was deleted
+        self.assertEqual(models.User.objects.filter(pk=user_one.id).count(), 0)
+        # Explicitly check that the values assigned to user_one are now user_two's
+        self.assertEqual(user_two.questions.filter(pk=question.id).count(), 1)  
+        self.assertEqual(user_two.comments.filter(pk=comment.id).count(), 1)  
+        user_two = models.User.objects.get(pk=2)
+        self.assertEqual(user_two.gold, number_of_gold) 
+        self.assertEqual(user_two.reputation, reputation)