Skip to content

Commit b851c50

Browse files
committed
Merge pull request #1 from treyhunner/middleware-tests-suggestions
Middleware testing suggestions
2 parents 7622c84 + 3daa6a9 commit b851c50

File tree

1 file changed

+12
-17
lines changed

1 file changed

+12
-17
lines changed

simple_history/tests/tests/test_admin.py

Lines changed: 12 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -218,31 +218,26 @@ def test_rolled_back_user_does_not_lead_to_foreign_key_error(self):
218218
# happens, e.g. in test cases), and verifies that subsequently
219219
# creating a new entry does not fail with a foreign key error.
220220

221-
class Rollback(Exception):
222-
pass
223-
224221
overridden_settings = {
225222
'MIDDLEWARE_CLASSES':
226223
settings.MIDDLEWARE_CLASSES
227224
+ ['simple_history.middleware.HistoryRequestMiddleware'],
228225
}
229226
with override_settings(**overridden_settings):
230-
try:
231-
with atomic():
232-
user = User.objects.create_superuser(
233-
'tmp', '[email protected]', 'pass')
234-
self.assertTrue(self.client.login(username='tmp', password='pass'))
235-
self.app.get(reverse('admin:tests_book_add'))
236-
raise Rollback()
237-
except Rollback:
238-
pass
227+
self.login()
228+
self.assertEqual(
229+
self.app.get(reverse('admin:tests_book_add')).status_code,
230+
200,
231+
)
239232

240233
book = Book.objects.create(isbn="9780147_513731")
241-
historical_book = book.history.all()[0]
242-
self.assertIsNone(
243-
historical_book.history_user,
244-
"No way to know of request, history_user should be unset.",
245-
)
234+
235+
historical_book = book.history.all()[0]
236+
237+
self.assertIsNone(
238+
historical_book.history_user,
239+
"No way to know of request, history_user should be unset.",
240+
)
246241

247242
def test_middleware_anonymous_user(self):
248243
overridden_settings = {

0 commit comments

Comments
 (0)