Added database checks for shift cancellation/registration, edit profile

Author: smarshy

vms/event/tests/test_shiftSignUp.py

@@ -1,6 +1,7 @@
 from django.contrib.staticfiles.testing import LiveServerTestCase
 
 from job.models import Job
+from shift.models import VolunteerShift
 
 from pom.pages.eventSignUpPage import EventSignUpPage
 from pom.pages.authenticationPage import AuthenticationPage
@@ -31,7 +32,7 @@ def setUpClass(cls):
         super(ShiftSignUp, cls).setUpClass()
 
     def setUp(self):
-        create_volunteer()
+        self.volunteer = create_volunteer()
         self.login_volunteer()
 
     def tearDown(self):
@@ -53,9 +54,9 @@ def test_events_page_with_no_events(self):
 
     def test_signup_shifts_with_registered_shifts(self):
 
-        register_event_utility()
-        register_job_utility()
-        register_shift_utility()
+        created_event = register_event_utility()
+        created_job = register_job_utility()
+        created_shift = register_shift_utility()
 
         sign_up_page = self.sign_up_page
 
@@ -83,7 +84,12 @@ def test_signup_shifts_with_registered_shifts(self):
         self.assertEqual(sign_up_page.get_shift_start_time(),'9 a.m.')
         self.assertEqual(sign_up_page.get_shift_end_time(),'3 p.m.')
 
-    def test_signup_for_same_shift_again(self):
+        # database check to ensure volunteer has signed up for the shift
+        self.assertEqual(len(VolunteerShift.objects.all()), 1)
+        self.assertNotEqual(len(VolunteerShift.objects.filter(
+            volunteer_id=self.volunteer.id, shift_id = created_shift.id)), 0)
+
+    """def test_signup_for_same_shift_again(self):
 
         register_event_utility()
         register_job_utility()
@@ -207,7 +213,8 @@ def test_search_event(self):
         # verify that no event shows up on event page
         self.assertEqual(sign_up_page.get_info_box().text,sign_up_page.no_event_message)
 
-        """# enter only incorrect starting date
+        # comm
+        # enter only incorrect starting date
         date = ['10/08/2016', '']
         sign_up_page.fill_search_form(date)
         # verify that no event shows up on event page

vms/shift/tests/test_manageVolunteerShift.py

@@ -7,6 +7,7 @@
 from selenium import webdriver
 from selenium.common.exceptions import NoSuchElementException
 
+from shift.models import VolunteerShift, Shift
 from shift.utils import (
     create_admin,
     create_volunteer_with_details,
@@ -245,6 +246,11 @@ def test_assign_shifts_with_registered_shifts(self):
         manage_shift_page.select_volunteer(1)
         self.check_job_details(['job name', 'May 20, 2017', '9 a.m.', '3 p.m.'])
 
+        # database check to ensure volunteer has been assigned the shift
+        self.assertEqual(len(VolunteerShift.objects.all()), 1)
+        self.assertNotEqual(len(VolunteerShift.objects.filter(
+            volunteer_id=v1.id, shift_id = s1.id)), 0)
+
     def test_slots_remaining_in_shift(self):
         sign_up_page = self.sign_up_page
         manage_shift_page = self.manage_shift_page
@@ -336,6 +342,9 @@ def test_cancel_assigned_shift(self):
         manage_shift_page.select_volunteer(1)
         self.check_job_details(['job name', 'May 20, 2017', '9 a.m.', '3 p.m.'])
 
+        # database check to ensure volunteer is registered
+        self.assertEqual(len(VolunteerShift.objects.all()), 1)
+
         # cancel assigned shift
         self.assertEqual(manage_shift_page.get_cancel_shift().text, 'Cancel Shift Registration')
         manage_shift_page.cancel_shift()
@@ -356,6 +365,9 @@ def test_cancel_assigned_shift(self):
         self.assertEqual(slots_remaining_before_assignment,
                 slots_after_cancellation)
 
+        # database check to ensure registration is cancelled
+        self.assertEqual(len(VolunteerShift.objects.all()), 0)
+
     def test_assign_same_shift_to_volunteer_twice(self):
         sign_up_page = self.sign_up_page
         manage_shift_page = self.manage_shift_page

vms/shift/tests/test_viewVolunteerShift.py

@@ -4,6 +4,8 @@
 from pom.pages.authenticationPage import AuthenticationPage
 from pom.pages.manageShiftPage import ManageShiftPage
 
+from shift.models import VolunteerShift
+
 from shift.utils import (
     create_volunteer,
     create_event_with_details,
@@ -133,3 +135,6 @@ def test_cancel_shift_registration(self):
             upcoming_shift_page.no_shift_message)
         with self.assertRaises(NoSuchElementException):
             upcoming_shift_page.get_result_container()
+
+        # database check to ensure shift registration is cancelled
+        self.assertEqual(len(VolunteerShift.objects.all()), 0)

vms/shift/utils.py

@@ -189,29 +189,35 @@ def create_volunteer():
     return volunteer
 
 def register_event_utility():
-    Event.objects.create(
+    event = Event.objects.create(
         name = 'event',
         start_date = '2016-05-10',
         end_date = '2018-06-16'
         )
 
+    return event
+
 def register_job_utility():
-    Job.objects.create(
+    job = Job.objects.create(
         name = 'job',
         start_date = '2016-05-10',
         end_date = '2017-06-15',
         event = Event.objects.get(name = 'event')
         )
 
+    return job
+
 def register_shift_utility():
-    Shift.objects.create(
+    shift = Shift.objects.create(
         date = '2017-06-15',
         start_time = '09:00',
         end_time = '15:00',
         max_volunteers ='6',
         job = Job.objects.get(name = 'job')
         )
 
+    return shift
+
 def register_volunteer_for_shift_utility(shift, volunteer):
         vol_shift = VolunteerShift.objects.create(
             shift=shift,

vms/volunteer/tests/test_volunteerProfile.py

@@ -101,6 +101,18 @@ def test_edit_profile(self):
         found_org = re.search(new_details[9], page_source)
         self.assertNotEqual(found_org, None)
 
+        # database check to ensure that profile has been updated
+        self.assertEqual(len(Volunteer.objects.all()), 1)
+        self.assertNotEqual(len(Volunteer.objects.filter(
+            first_name = new_details[0],
+            last_name = new_details[1],
+            email=new_details[2],
+            address = new_details[3],
+            city = new_details[4],
+            state = new_details[5],
+            country = new_details[6],
+            phone_number = new_details[7])), 0)
+
     def test_upload_resume(self):
         pass
         '''