cleanup test

Author: jurecuhalev

web/tests/test_event_views.py

@@ -61,85 +61,37 @@ def test_search_events_with_search_query(self):
 		self.assertEquals('SI', response.context['country'])
 
 	def test_search_events_with_search_query_multiple_events(self):
-		#setup
-		approved1 = Event.objects.create(
-			status="APPROVED",
-			organizer="Organizer 1",
-			creator=User.objects.filter(pk=1)[0],
-			title="Event Arglebargle - Approved",
-			description="Some description - Approved",
-			location="Near here",
-			start_date=datetime.datetime.now() + datetime.timedelta(days=1, hours=3),
-			end_date=datetime.datetime.now() + datetime.timedelta(days=3, hours=3),
-			event_url="http://eee.com",
-			contact_person="[email protected]",
-			country="SI",
-			pub_date=datetime.datetime.now(),
-			tags=["tag1", "tag2"])
-		approved2 = Event.objects.create(
-			status="APPROVED",
-			organizer="Organizer 2",
-			creator=User.objects.filter(pk=1)[0],
-			title="Event Arglebargle - Approved",
-			description="Some description - Approved",
-			location="Near here",
-			start_date=datetime.datetime.now() + datetime.timedelta(days=1, hours=3),
-			end_date=datetime.datetime.now() + datetime.timedelta(days=3, hours=3),
-			event_url="http://eee.com",
-			contact_person="[email protected]",
-			country="AT",
-			pub_date=datetime.datetime.now(),
-			tags=["tag1", "tag2"])
+		approved1 = ApprovedEventFactory.create(title="Event Arglebargle - Approved", country="SI")
+		approved2 = ApprovedEventFactory.create(title="Event Arglebargle - Approved", country="AT")
 
 		response = self.client.get(reverse('web.search_events'), {'q':'arglebargle'}, REMOTE_ADDR='93.103.53.11')
 
-		#assert
 		self.assertEquals(1,response.context['events'].count())
 		self.assertEquals('SI', response.context['country'])
 
+		approved1.delete()
+		approved2.delete()
+
 	def test_view_event_without_picture(self):
 		test_event = EventFactory.create()
 		response = self.client.get(reverse('web.view_event', args=[test_event.pk, test_event.slug]))
 
 		assert response.status_code == 200
 		assert test_event.title in response.content
 
+		test_event.delete()
+
 	def test_search_events_with_search_query_all_countries_multiple_results(self):
-		#setup
-		approved1 = Event.objects.create(
-			status="APPROVED",
-			organizer="Organizer 1",
-			creator=User.objects.filter(pk=1)[0],
-			title="Event Arglebargle - Approved",
-			description="Some description - Approved",
-			location="Near here",
-			start_date=datetime.datetime.now() + datetime.timedelta(days=1, hours=3),
-			end_date=datetime.datetime.now() + datetime.timedelta(days=3, hours=3),
-			event_url="http://eee.com",
-			contact_person="[email protected]",
-			country="SI",
-			pub_date=datetime.datetime.now(),
-			tags=["tag1", "tag2"])
-		approved2 = Event.objects.create(
-			status="APPROVED",
-			organizer="Organizer 2",
-			creator=User.objects.filter(pk=1)[0],
-			title="Event Arglebargle - Approved",
-			description="Some description - Approved",
-			location="Near here",
-			start_date=datetime.datetime.now() + datetime.timedelta(days=1, hours=3),
-			end_date=datetime.datetime.now() + datetime.timedelta(days=3, hours=3),
-			event_url="http://eee.com",
-			contact_person="[email protected]",
-			country="AT",
-			pub_date=datetime.datetime.now(),
-			tags=["tag1", "tag2"])
+		approved1 = ApprovedEventFactory.create(title="Event Arglebargle - Approved", country="SI")
+		approved2 = ApprovedEventFactory.create(title="Event Arglebargle - Approved", country="AT")
 
 		response = self.client.get(reverse('web.search_events'), {'q':'arglebargle', 'country_code':'00'}, REMOTE_ADDR='93.103.53.11')
 
-		#assert
 		self.assertEquals(2,response.context['events'].count())
 
+		approved1.delete()
+		approved2.delete()
+
 @pytest.mark.django_db
 def test_create_event_with_image(admin_user, admin_client, db):
 	with open(local(__file__).dirname + '/../../static/img/team/alja.jpg') as fp:

web/tests/test_user_processors.py

@@ -1,10 +1,6 @@
-import datetime
-import pytest
 from django.test import TestCase
-from django.db import IntegrityError
 from django.contrib.auth.models import User, Group
 
-from api.models.events import Event
 from api.models import UserProfile
 from web.processors.user import get_ambassadors_for_country
 
@@ -15,21 +11,6 @@ def setUp(self):
 		self.u1 = User.objects.create(username='user1')
 		self.up1 = UserProfile.objects.create(user=self.u1)
 
-		Event.objects.create(organizer="asdasd",
-			creator=User.objects.filter(pk=1)[0],
-			title="asdasd",
-			description="asdsad",
-			location="asdsad",
-			start_date=datetime.datetime.now(),
-			end_date=datetime.datetime.now(),
-			event_url="http://eee.com",
-			contact_person="[email protected]",
-			country="SI",
-			audience=[1],
-			theme=[1],
-			pub_date=datetime.datetime.now(),
-			tags=["tag1", "tag2"])
-
 	def test_get_ambassadors_for_country(self):
 		self.up1.country = "SI"
 		self.up1.save()