From b833308f7e7f8d531ce5de8156428818315bd472 Mon Sep 17 00:00:00 2001
From: Martin Burchell <martinb@aptivate.org>
Date: Wed, 29 Jul 2015 15:12:27 +0100
Subject: [PATCH] Refactored tests
---
django/website/data_layer/tests/item_tests.py | 31 ++++++++++---------
1 file changed, 17 insertions(+), 14 deletions(-)
diff --git a/django/website/data_layer/tests/item_tests.py b/django/website/data_layer/tests/item_tests.py
index 665588e2..6ac1c7f8 100644
--- a/django/website/data_layer/tests/item_tests.py
+++ b/django/website/data_layer/tests/item_tests.py
@@ -34,29 +34,32 @@ def num_updates(old_time, new_time):
return elapsed_time.seconds / time_granularity().seconds
-@pytest.mark.django_db
-def test_last_modified_date_updates_on_body_change():
- item = ItemFactory()
- magic_mock = MagicMock(wraps=timezone.now,
- side_effect=now_iter(timezone.now()))
+@pytest.fixture
+def item():
+ return ItemFactory()
+
+
+@pytest.fixture
+def mock_time_now():
+ return MagicMock(wraps=timezone.now,
+ side_effect=now_iter(timezone.now()))
- with patch('django.utils.timezone.now', new=magic_mock):
+
+@pytest.mark.django_db
+def test_last_modified_date_updates_on_body_change(item, mock_time_now):
+ with patch('django.utils.timezone.now', new=mock_time_now):
orig_last_modified = last_modified(item)
item.body = 'replacement text'
item.save()
- assert num_updates(orig_last_modified, last_modified(item)) == 1
+ assert num_updates(orig_last_modified, last_modified(item)) == 1
@pytest.mark.django_db
-def test_last_modified_date_updates_on_category_change():
- item = ItemFactory()
- magic_mock = MagicMock(wraps=timezone.now,
- side_effect=now_iter(timezone.now()))
-
- with patch('django.utils.timezone.now', new=magic_mock):
+def test_last_modified_date_updates_on_category_change(item, mock_time_now):
+ with patch('django.utils.timezone.now', new=mock_time_now):
orig_last_modified = last_modified(item)
term = TermFactory()
item.terms.add(term)
- assert num_updates(orig_last_modified, last_modified(item)) == 1
+ assert num_updates(orig_last_modified, last_modified(item)) == 1
--
GitLab