Added database checks for add, edit and cancel hours

Author: smarshy

vms/shift/tests/test_shiftHours.py

@@ -6,6 +6,8 @@
 from pom.pages.completedShiftsPage import CompletedShiftsPage
 from pom.pages.authenticationPage import AuthenticationPage
 
+from shift.models import VolunteerShift
+
 from shift.utils import (
     create_volunteer,
     create_event_with_details,
@@ -81,6 +83,11 @@ def test_edit_hours(self):
         self.assertEqual(completed_shifts_page.get_shift_start_time(), '10 a.m.')
         self.assertEqual(completed_shifts_page.get_shift_end_time(), '1 p.m.')
 
+        # database check to ensure logged hours are edited
+        self.assertEqual(len(VolunteerShift.objects.all()), 1)
+        self.assertNotEqual(len(VolunteerShift.objects.filter(
+            start_time='10:00', end_time='13:00')), 0)
+
     def test_end_hours_less_than_start_hours(self):
         self.register_dataset()
         completed_shifts_page = self.completed_shifts_page
@@ -93,6 +100,11 @@ def test_end_hours_less_than_start_hours(self):
         except NoSuchElementException:
             raise Exception("End hours greater than start hours")
 
+        # database check to ensure logged hours are not edited
+        self.assertEqual(len(VolunteerShift.objects.all()), 1)
+        self.assertNotEqual(len(VolunteerShift.objects.filter(
+            start_time='12:00', end_time='13:00')), 0)
+
     def test_logged_hours_between_shift_hours(self):
         self.register_dataset()
         completed_shifts_page = self.completed_shifts_page
@@ -102,6 +114,11 @@ def test_logged_hours_between_shift_hours(self):
         self.assertEqual(completed_shifts_page.get_danger_box().text,
             'Logged hours should be between shift hours')
 
+        # database check to ensure logged hours are not edited
+        self.assertEqual(len(VolunteerShift.objects.all()), 1)
+        self.assertNotEqual(len(VolunteerShift.objects.filter(
+            start_time='12:00', end_time='13:00')), 0)
+
     def test_cancel_hours(self):
         self.register_dataset()
         completed_shifts_page = self.completed_shifts_page
@@ -117,3 +134,8 @@ def test_cancel_hours(self):
 
         with self.assertRaises(NoSuchElementException):
             self.assertEqual(completed_shifts_page.get_shift_job(), 'job')
+
+        # database check to ensure logged hours are cleared
+        self.assertEqual(len(VolunteerShift.objects.all()), 1)
+        self.assertEqual(len(VolunteerShift.objects.filter(
+            start_time__isnull=False, end_time__isnull=False)), 0)

vms/shift/tests/test_viewVolunteerShift.py

@@ -112,6 +112,13 @@ def test_log_hours_and_logged_shift_does_not_appear_in_upcoming_shifts(self):
         with self.assertRaises(NoSuchElementException):
             upcoming_shift_page.get_result_container()
 
+        # database check to ensure volunteer has logged the hours
+        self.assertEqual(len(VolunteerShift.objects.all()), 1)
+        self.assertNotEqual(len(VolunteerShift.objects.filter(
+            start_time__isnull=False, end_time__isnull=False)), 0)
+        self.assertNotEqual(len(VolunteerShift.objects.filter(
+            start_time='09:00', end_time='12:00')), 0)
+
     def test_cancel_shift_registration(self):
 
         self.register_dataset()