8000 Changed the users id to pk on the tests£ · django-cms/django-cms@2c0a1c6 · GitHub
[go: up one dir, main page]
Skip to content

Commit 2c0a1c6

Browse files
author
Andrew Aikman
committed
Changed the users id to pk on the tests£
1 parent 153a60b commit 2c0a1c6

File tree

1 file changed

+15
-15
lines changed

1 file changed

+15
-15
lines changed

‎cms/tests/test_log_entries.py

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ def _assert_log_created_on_page_add(self, page):
4242
# Check the object_repr is set correctly
4343
self.assertEqual(str(page), log_entry.object_repr)
4444
# Check that the correct user created the log
45-
self.assertEqual(self._admin_user.id, log_entry.user_id)
45+
self.assertEqual(self._admin_user.pk, log_entry.user_id)
4646

4747
def test_log_for_create_admin_page(self):
4848
"""
@@ -118,7 +118,7 @@ def test_log_for_change_admin_page(self):
118118
# Check the object_repr is set correctly
119119
self.assertEqual(str(page), log_entry.object_repr)
120120
# Check that the correct user created the log
121-
self.assertEqual(self._admin_user.id, log_entry.user_id)
121+
self.assertEqual(self._admin_user.pk, log_entry.user_id)
122122

123123
def test_log_for_move_admin_page(self):
124124
"""
@@ -146,7 +146,7 @@ def test_log_for_move_admin_page(self):
146146
# Check the object_repr is set correctly
147147
self.assertEqual(str(page_2), log_entry.object_repr)
148148
# Check that the correct user created the log
149-
self.assertEqual(self._admin_user.id, log_entry.user_id)
149+
self.assertEqual(self._admin_user.pk, log_entry.user_id)
150150

151151
def test_log_for_delete_admin_page(self):
152152
"""
@@ -175,7 +175,7 @@ def test_log_for_delete_admin_page(self):
175175
# Check the object_repr is set correctly
176176
self.assertEqual(pre_deleted_page, log_entry.object_repr)
177177
# Check that the correct user created the log
178-
self.assertEqual(self._admin_user.id, log_entry.user_id)
178+
self.assertEqual(self._admin_user.pk, log_entry.user_id)
179179

180180
def test_log_for_change_translation(self):
181181
"""
@@ -204,7 +204,7 @@ def test_log_for_change_translation(self):
204204
# Check the object_repr is set correctly
205205
self.assertEqual(str(page), log_entry.object_repr)
206206
# Check that the correct user created the log
207-
self.assertEqual(self._admin_user.id, log_entry.user_id)
207+
self.assertEqual(self._admin_user.pk, log_entry.user_id)
208208

209209
def test_log_for_delete_translation(self):
210210
"""
@@ -232,7 +232,7 @@ def test_log_for_delete_translation(self):
232232
# Check the object_repr is set correctly
233233
self.assertEqual(str(page), log_entry.object_repr)
234234
# Check that the correct user created the log
235-
self.assertEqual(self._admin_user.id, log_entry.user_id)
235+
self.assertEqual(self._admin_user.pk, log_entry.user_id)
236236

237237

238238
class LogPlaceholderOperationsTests(CMSTestCase):
@@ -300,7 +300,7 @@ def test_log_for_add_plugin(self):
300300
# Check the object_repr is set correctly
301301
self.assertEqual(str(page), log_entry.object_repr)
302302
# Check that the correct user created the log
303-
self.assertEqual(self._admin_user.id, log_entry. 10000 user_id)
303+
self.assertEqual(self._admin_user.pk, log_entry.user_id)
304304

305305
def test_log_for_move_plugin(self):
306306
"""
@@ -332,7 +332,7 @@ def test_log_for_move_plugin(self):
332332
# Check the object_repr is set correctly
333333
self.assertEqual(str(page), log_entry.object_repr)
334334
# Check that the correct user created the log
335-
self.assertEqual(self._admin_user.id, log_entry.user_id)
335+
self.assertEqual(self._admin_user.pk, log_entry.user_id)
336336

337337
def test_log_for_change_plugin(self):
338338
"""
@@ -362,7 +362,7 @@ def test_log_for_change_plugin(self):
362362
# Check the object_repr is set correctly
363363
self.assertEqual(str(page), log_entry.object_repr)
364364
# Check that the correct user created the log
365-
self.assertEqual(self._admin_user.id, log_entry.user_id)
365+
self.assertEqual(self._admin_user.pk, log_entry.user_id)
366366

367367
def test_log_for_delete_plugin(self):
368368
"""
@@ -391,7 +391,7 @@ def test_log_for_delete_plugin(self):
391391
# Check the object_repr is set correctly
392392
self.assertEqual(str(page), log_entry.object_repr)
393393
# Check that the correct user created the log
394-
self.assertEqual(self._admin_user.id, log_entry.user_id)
394+
self.assertEqual(self._admin_user.pk, log_entry.user_id)
395395

396396
def test_log_for_cut_plugin(self):
397397
"""
@@ -428,7 +428,7 @@ def test_log_for_cut_plugin(self):
428428
# Check the object_repr is set correctly
429429
self.assertEqual(str(page), log_entry.object_repr)
430430
# Check that the correct user created the log
431-
self.assertEqual(self._admin_user.id, log_entry.user_id)
431+
self.assertEqual(self._admin_user.pk, log_entry.user_id)
432432

433433
def test_log_for_paste_plugin(self):
434434
"""
@@ -467,7 +467,7 @@ def test_log_for_paste_plugin(self):
467467
# Check the object_repr is set correctly
468468
self.assertEqual(str(page), log_entry.object_repr)
469469
# Check that the correct user created the log
470-
self.assertEqual(self._admin_user.id, log_entry.user_id)
470+
self.assertEqual(self._admin_user.pk, log_entry.user_id)
471471

472472
def test_log_for_add_plugin_to_placeholder(self):
473473
"""
@@ -501,7 +501,7 @@ def test_log_for_add_plugin_to_placeholder(self):
501501
# Check the object_repr is set correctly
502502
self.assertEqual(str(page), log_entry.object_repr)
503503
# Check that the correct user created the log
504-
self.assertEqual(self._admin_user.id, log_entry.user_id)
504+
self.assertEqual(self._admin_user.pk, log_entry.user_id)
505505

506506
def test_log_for_paste_placeholder(self):
507507
"""
@@ -548,7 +548,7 @@ def test_log_for_paste_placeholder(self):
548548
# Check the object_repr is set correctly
549549
self.assertEqual(str(page), log_entry.object_repr)
550550
# Check that the correct user created the log
551-
self.assertEqual(self._admin_user.id, log_entry.user_id)
551+
self.assertEqual(self._admin_user.pk, log_entry.user_id)
552552

553553
def test_log_for_clear_placeholder(self):
554554
"""
@@ -575,4 +575,4 @@ def test_log_for_clear_placeholder(self):
575575
# Check the object_repr is set correctly
576576
self.assertEqual(str(page), log_entry.object_repr)
577577
# Check that the correct user created the log
578-
self.assertEqual(self._admin_user.id, log_entry.user_id)
578+
self.assertEqual(self._admin_user.pk, log_entry.user_id)

0 commit comments

Comments
 (0)
0