From 81829d8e1e40607b39c5276931d4bb9ef0d0a21b Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Wed, 4 May 2022 15:33:36 -0400 Subject: [PATCH] Add a test for M2M models in test_merge_move_detail --- tests/test_merge.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/tests/test_merge.py b/tests/test_merge.py index b3a43b61..b9d35346 100644 --- a/tests/test_merge.py +++ b/tests/test_merge.py @@ -283,8 +283,10 @@ def test_merge_move_detail(self): from adminactions.merge import MergeForm with user_grant_permission(self.user, ['auth.change_user', 'auth.adminactions_merge_user']): - # removed = User.objects.get(pk=self._selected_rows[0]) - # preserved = User.objects.get(pk=self._selected_rows[1]) + removed = User.objects.get(pk=self._selected_rows[0]) + group = Group.objects.get_or_create(name='G1')[0] + removed.groups.add(group) + removed.save() res = self.app.get('/', user='user') res = res.click('Users') @@ -292,7 +294,7 @@ def test_merge_move_detail(self): form['action'] = 'merge' self._select_rows(form, [1, 2]) res = form.submit() - removed = User.objects.get(pk=self._selected_values[0]) + removed = User.objects.get(pk=self._selected_values[0]) # reload preserved = User.objects.get(pk=self._selected_values[1]) removed.userdetail_set.create(note='1') @@ -314,6 +316,7 @@ def test_merge_move_detail(self): preserved_after = User.objects.get(pk=self._selected_values[1]) self.assertEqual(preserved_after.userdetail_set.count(), 2) self.assertFalse(User.objects.filter(pk=removed.pk).exists()) + self.assertSequenceEqual(preserved_after.groups.all(), [group]) def test_merge_delete_detail(self): from adminactions.merge import MergeForm