diff --git a/smash/web/tests/functions.py b/smash/web/tests/functions.py index 8e7cb61c5281c6b4c5f653c85792c3a62dc63d43..cf506263c3159f82a18d6b52e964f5e59c73aba0 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 7a7620d3ec28a0ce70d052fc5e4b079b253a44ae..99e312a8c85d747a66ca3a90396f1c9ece48b9f5 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 6d3cf3ac1239ff4ed763325b58e7de9b92940a04..ecf1161677c0a104d9861bd356c2c96416b81bf0 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)