Test

vms/event/views.py

@@ -7,6 +7,7 @@
 # Django
 from django.contrib import messages
 from django.contrib.auth.decorators import login_required
+from django.core.exceptions import ObjectDoesNotExist
 from django.core.urlresolvers import reverse
 from django.core.urlresolvers import reverse_lazy
 from django.http import HttpResponseRedirect

vms/pom/locators/administratorReportPageLocators.py

@@ -9,7 +9,7 @@ class AdministratorReportPageLocators(object):
     FIRST_NAME_SELECTOR = '//input[@name = "first_name"]'
     LAST_NAME_SELECTOR = '//input[@name = "last_name"]'
 
-    NAME = '//table//tbody//tr[1]//td[1]'
+    NAME = '//table//tbody//tr[1]//td[4]'
     DATE = '//table//tbody//tr[1]//td[6]'
     START_TIME = '//table//tbody//tr[1]//td[7]'
     END_TIME = '//table//tbody//tr[1]//td[8]'

vms/pom/pages/administratorReportPage.py

@@ -18,16 +18,15 @@ def __init__(self, driver):
         super(AdministratorReportPage, self).__init__(driver)
 
     def go_to_admin_report(self):
-        self.home_page.get_admin_report_link().send_keys("\n")
+        self.home_page.get_admin_report_link().click()
 
     def fill_report_form(self, info):
         first_name = self.element_by_xpath(self.elements.FIRST_NAME_SELECTOR)
         last_name = self.element_by_xpath(self.elements.LAST_NAME_SELECTOR)
 
         first_name.clear()
         last_name.clear()
-        [select1, select2,
-         select3] = self.get_event_job_organization_selectors()
+        [select1, select2, select3] = self.get_event_job_organization_selectors()
 
         first_name.send_keys(info[0])
         last_name.send_keys(info[1])
@@ -38,13 +37,10 @@ def fill_report_form(self, info):
         self.submit_form()
 
     def get_event_job_organization_selectors(self):
-        select1 = Select(
-            self.element_by_xpath(self.elements.REPORT_EVENT_SELECTOR))
-        select2 = Select(
-            self.element_by_xpath(self.elements.REPORT_JOB_SELECTOR))
-        select3 = Select(
-            self.element_by_xpath(self.elements.REPORT_ORG_SELECTOR))
-        return (select1, select2, select3)
+        select1 = Select(self.element_by_xpath(self.elements.REPORT_EVENT_SELECTOR))
+        select2 = Select(self.element_by_xpath(self.elements.REPORT_JOB_SELECTOR))
+        select3 = Select(self.element_by_xpath(self.elements.REPORT_ORG_SELECTOR))
+        return select1, select2, select3
 
     def submit_form(self):
         self.element_by_xpath(self.elements.SUBMIT_PATH).submit()
@@ -53,5 +49,4 @@ def get_alert_box_text(self):
         return self.element_by_class_name(self.elements.NO_RESULT_BOX).text
 
     def get_shift_summary(self):
-        return self.element_by_xpath(
-            self.elements.REPORT_SHIFT_SUMMARY_PATH).text
+        return self.element_by_xpath(self.elements.REPORT_SHIFT_SUMMARY_PATH).text

vms/pom/pages/basePage.py

@@ -48,3 +48,8 @@ def get_value_for_xpath(self, xpath):
 
     def element_by_tag_name(self, tag):
         return self.driver.find_element_by_tag_name(tag)
+
+    @staticmethod
+    def remove_i18n(string):
+        slashes = [pos for pos, char in enumerate(string) if char == '/']
+        return string[:slashes[2]] + string[slashes[3]:]

vms/pom/pages/eventsPage.py

@@ -3,7 +3,7 @@
 
 # local Django
 from basePage import BasePage
-from pom.locators.eventsPageLocators import EventsPageLocators 
+from pom.locators.eventsPageLocators import EventsPageLocators
 from pom.pages.homePage import HomePage
 from pom.pageUrls import PageUrls
 
@@ -74,7 +74,7 @@ def submit_form(self):
         self.element_by_xpath(self.elements.GENERAL_SUBMIT_PATH).submit()
 
     def go_to_events_page(self):
-        self.home_page.get_events_link().send_keys('\n')
+        self.home_page.get_events_link().click()
 
     def navigate_to_event_list_view(self):
         self.get_page(self.live_server_url, self.event_list_page)
@@ -96,7 +96,7 @@ def go_to_edit_event_page(self):
         self.element_by_xpath(self.elements.EDIT_EVENT).click()
 
     def go_to_create_job_page(self):
-        self.get_page(self.live_server_url, self.create_job_page)
+        self.click_link('Create Job')
 
     def go_to_edit_job_page(self):
         self.element_by_xpath(self.elements.EDIT_JOB).click()
@@ -230,5 +230,4 @@ def get_shift_end_time_value(self):
         return self.get_value_for_xpath(self.elements.CREATE_SHIFT_END_TIME)
 
     def get_shift_max_volunteers(self):
-        return self.get_value_for_xpath(
-            self.elements.CREATE_SHIFT_MAX_VOLUNTEER)
+        return self.get_value_for_xpath(self.elements.CREATE_SHIFT_MAX_VOLUNTEER)