diff options
author | Evgeny Fadeev <evgeny.fadeev@gmail.com> | 2013-05-23 19:44:40 -0700 |
---|---|---|
committer | Evgeny Fadeev <evgeny.fadeev@gmail.com> | 2013-05-23 19:44:40 -0700 |
commit | 4302ca9363e5e352005f3e2f55facfd965fe1986 (patch) | |
tree | b7def99e36b10cb7b4eb4acb98c467a7119e7386 | |
parent | 806df3c2b0a71a85b6777e7f13e01dc115d9bef6 (diff) | |
parent | 9115ff9d0e052c61fde276dca116780da8ec53f9 (diff) | |
download | askbot-4302ca9363e5e352005f3e2f55facfd965fe1986.tar.gz askbot-4302ca9363e5e352005f3e2f55facfd965fe1986.tar.bz2 askbot-4302ca9363e5e352005f3e2f55facfd965fe1986.zip |
Merge pull request #130 from bobbydavid/privatekey
fix bug where private key was hard-coded as 2.
-rw-r--r-- | askbot/tests/management_command_tests.py | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/askbot/tests/management_command_tests.py b/askbot/tests/management_command_tests.py index e9341a8b..f1c6728d 100644 --- a/askbot/tests/management_command_tests.py +++ b/askbot/tests/management_command_tests.py @@ -34,20 +34,19 @@ class ManagementCommandTests(AskbotTestCase): 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 + user_one.gold = number_of_gold reputation = 20 - user_one.reputation = reputation + 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') + user_two_pk = user_two.pk 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.posts.get_questions().filter(pk=question.id).count(), 1) self.assertEqual(user_two.posts.get_comments().filter(pk=comment.id).count(), 1) - #todo: change groups to django groups - #then replace to 3 back to 2 in the line below - user_two = models.User.objects.get(pk=2) - self.assertEqual(user_two.gold, number_of_gold) + user_two = models.User.objects.get(pk=user_two_pk) + self.assertEqual(user_two.gold, number_of_gold) self.assertEqual(user_two.reputation, reputation) |