From 985dc8b1869f384dccf99a57465d6fd26a12caa9 Mon Sep 17 00:00:00 2001
From: Jacek Lebioda <jacek.lebioda@uni.lu>
Date: Thu, 14 Dec 2017 12:02:00 +0100
Subject: [PATCH] Tests corrected
---
smash/web/tests/functions.py | 4 +++-
smash/web/tests/view/test_equipments.py | 2 +-
smash/web/tests/view/test_rooms.py | 2 +-
3 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/smash/web/tests/functions.py b/smash/web/tests/functions.py
index 8e7cb61c..cf506263 100644
--- a/smash/web/tests/functions.py
+++ b/smash/web/tests/functions.py
@@ -254,9 +254,11 @@ def create_item(name='Test item', is_fixed=False, disposable=False):
def create_room(owner='Test owner', city='Test city',
address='Test address', equipment=[],
floor=1, is_vehicle=False, room_number=1):
- room = Room(owner=owner, city=city, address=address, equipment=equipment,
+ room = Room(owner=owner, city=city, address=address,
floor=floor, is_vehicle=is_vehicle, room_number=room_number)
room.save()
+ room.equipment = equipment # Cannot be made in constructor/with single save
+ room.save()
return room
diff --git a/smash/web/tests/view/test_equipments.py b/smash/web/tests/view/test_equipments.py
index 7a7620d3..99e312a8 100644
--- a/smash/web/tests/view/test_equipments.py
+++ b/smash/web/tests/view/test_equipments.py
@@ -68,7 +68,7 @@ class EquipmentTests(LoggedInTestCase):
page = reverse('web.views.equipment_delete',
kwargs={'equipment_id': str(item.id)})
- response = self.client.post(page, data)
+ response = self.client.get(page)
self.assertEqual(response.status_code, 302)
freshly_deleted = Item.objects.filter(id=item.id)
diff --git a/smash/web/tests/view/test_rooms.py b/smash/web/tests/view/test_rooms.py
index 6d3cf3ac..ecf11616 100644
--- a/smash/web/tests/view/test_rooms.py
+++ b/smash/web/tests/view/test_rooms.py
@@ -76,7 +76,7 @@ class RoomsTests(LoggedInTestCase):
page = reverse('web.views.equipment_and_rooms.rooms_delete',
kwargs={'room_id': str(room.id)})
- response = self.client.post(page, data)
+ response = self.client.get(page)
self.assertEqual(response.status_code, 302)
freshly_deleted = Room.objects.filter(id=room.id)
--
GitLab