test: Enhance US05 tests with improved back button navigation and error handling

Author: 02loveslollipop

tests/us5.py

@@ -32,6 +32,8 @@ class US05Tests(unittest.TestCase):
     FIRST_TIME_ALERT_BUTTON_SELECTOR = ".alert__button.alert__button--single"
     ALERT_OVERLAY_SELECTOR = "div.alert__overlay"
     NAV_BACK_BUTTON_XPATH = "//button[contains(@class, 'nav-bar__button') and .//span[contains(@class, 'back-icon')]/svg[contains(@class, 'lucide-chevron-left')]]"
+    # Simpler CSS selector for the back button - targeting the first button in the nav-bar
+    NAV_BACK_BUTTON_SELECTOR = "nav.nav-bar > button.nav-bar__button:first-child"
     HOME_CONTAINER_SELECTOR = "div.home__container"
     SETTINGS_NAV_BUTTON_XPATH = "//button[contains(@class, 'nav-bar__button') and .//span[contains(@class, 'settings-icon')]/svg[contains(@class, 'lucide-settings')]]"
     APPROVAL_GRADE_INPUT_SELECTOR = "input.settings__input[type='number']" # Hypothetical for settings page
@@ -65,14 +67,14 @@ def setUp(self):
             logger.error("Driver is not initialized after setup attempt.")
             self.fail("Driver could not be initialized.")
             return
-        self._initial_setup()
-
+        self._initial_setup()    
+    
     def tearDown(self):
         if hasattr(self, 'is_driver_managed_by_fallback') and self.is_driver_managed_by_fallback:
             if self.driver:
                 self.driver.quit()
         # For pytest-managed driver, teardown is handled by the fixture
-
+    
     def _take_screenshot(self, name_suffix):
         timestamp = int(time.time())
         test_method_name = getattr(self, '_testMethodName', 'unknown_test')
@@ -83,21 +85,41 @@ def _take_screenshot(self, name_suffix):
                 logger.info(f"Screenshot saved: {screenshot_name}")
         except Exception as e:
             logger.error(f"Error saving screenshot {screenshot_name}: {e}")
-
+    
     def _initial_setup(self):
+        if not hasattr(self, 'driver') or not self.driver:
+            logger.error("Driver not initialized in _initial_setup. Aborting setup.")
+            self.fail("Driver not initialized for test setup.")
+            return
+
         self.driver.get(self.BASE_URL)
         logger.info(f"Navigated to base URL: {self.BASE_URL}")
         try:
+            logger.info(f"Attempting to handle first-time alert with button '{self.FIRST_TIME_ALERT_BUTTON_SELECTOR}'.")
             alert_button = WebDriverWait(self.driver, 10).until(
                 EC.element_to_be_clickable((By.CSS_SELECTOR, self.FIRST_TIME_ALERT_BUTTON_SELECTOR))
             )
             alert_button.click()
+            logger.info(f"Clicked first-time alert button: '{self.FIRST_TIME_ALERT_BUTTON_SELECTOR}'.")
+
             WebDriverWait(self.driver, 5).until(
                 EC.invisibility_of_element_located((By.CSS_SELECTOR, self.ALERT_OVERLAY_SELECTOR))
             )
-            nav_back_button = WebDriverWait(self.driver, 10).until(
-                EC.element_to_be_clickable((By.XPATH, self.NAV_BACK_BUTTON_XPATH))
-            )
+            logger.info(f"Alert overlay '{self.ALERT_OVERLAY_SELECTOR}' is no longer visible. App should be on Settings page.")
+            
+            # Try CSS selector first, fall back to XPath if needed
+            try:
+                nav_back_button = WebDriverWait(self.driver, 5).until(
+                    EC.element_to_be_clickable((By.CSS_SELECTOR, self.NAV_BACK_BUTTON_SELECTOR))
+                )
+                logger.info("Found back button using CSS selector.")
+            except TimeoutException:
+                logger.info("CSS selector failed for back button, trying XPath...")
+                nav_back_button = WebDriverWait(self.driver, 5).until(
+                    EC.element_to_be_clickable((By.XPATH, self.NAV_BACK_BUTTON_XPATH))
+                )
+                logger.info("Found back button using XPath selector.")
+                
             nav_back_button.click()
             WebDriverWait(self.driver, 10).until(
                 EC.presence_of_element_located((By.CSS_SELECTOR, self.HOME_CONTAINER_SELECTOR))
@@ -116,11 +138,9 @@ def _initial_setup(self):
             logger.error(f"An unexpected error occurred during initial setup: {e}", exc_info=True)
             self._take_screenshot("initial_setup_error")
             self.fail(f"Unexpected error during initial setup: {e}")
-        
-        # Ensure approval grade is 3.0 (default)
+          # Ensure approval grade is 3.0 (default)
         self._set_approval_grade("3.0")
 
-
     def _set_approval_grade(self, approval_grade_value):
         logger.info(f"Setting approval grade to: {approval_grade_value}")
         # Navigate to settings if not already there or on home
@@ -155,9 +175,13 @@ def _set_approval_grade(self, approval_grade_value):
         self.driver.find_element(By.XPATH, self.NAV_BACK_BUTTON_XPATH).click()
         self.wait_long.until(EC.presence_of_element_located((By.CSS_SELECTOR, self.HOME_CONTAINER_SELECTOR)))
         logger.info("Navigated back to Home page from Settings.")
-
-
     def _add_grade_and_percentage(self, grade, percentage):
+        if not hasattr(self, 'driver') or not self.driver:
+            logger.error("Driver not available in _add_grade_and_percentage.")
+            self.fail("Driver not available.")
+            return
+
+        # First check if we're on the result page and navigate back if needed
         on_result_page = False
         try:
             if self.driver.find_element(By.CSS_SELECTOR, self.RESULT_PAGE_CONTAINER_SELECTOR).is_displayed():
@@ -166,29 +190,124 @@ def _add_grade_and_percentage(self, grade, percentage):
             on_result_page = False
 
         if on_result_page:
-            logger.info("On result page, navigating back to home to add grades.")
-            self.driver.find_element(By.XPATH, self.NAV_BACK_BUTTON_XPATH).click()
+            logger.info("Currently on result page, navigating back to home to add grades.")
+            try:
+                # First try with the CSS selector
+                nav_back_button = self.wait_short.until(
+                    EC.element_to_be_clickable((By.CSS_SELECTOR, self.NAV_BACK_BUTTON_SELECTOR))
+                )
+                logger.info("Found back button using CSS selector in _add_grade_and_percentage.")
+            except TimeoutException:
+                try:
+                    # Then try with XPath
+                    logger.info("CSS selector failed for back button in _add_grade_and_percentage, trying XPath...")
+                    nav_back_button = self.wait_long.until(
+                        EC.element_to_be_clickable((By.XPATH, self.NAV_BACK_BUTTON_XPATH))
+                    )
+                    logger.info("Found back button using XPath selector in _add_grade_and_percentage.")
+                except TimeoutException:
+                    # As a last resort, try to find any buttons in the nav bar
+                    logger.info("XPath also failed. Looking for any button in the nav bar...")
+                    nav_bar = self.wait_long.until(
+                        EC.presence_of_element_located((By.CSS_SELECTOR, "nav.nav-bar"))
+                    )
+                    nav_buttons = nav_bar.find_elements(By.TAG_NAME, "button")
+                    if nav_buttons:
+                        nav_back_button = nav_buttons[0]  # First button in nav bar is usually back
+                        logger.info("Using first button found in nav bar")
+                    else:
+                        logger.error("No buttons found in nav bar")
+                        self._take_screenshot("no_buttons_in_nav_bar_add_grade")
+                        self.fail("No buttons found in nav bar when trying to navigate back")
+            
+            # Click the back button once found
+            nav_back_button.click()
             self.wait_long.until(EC.presence_of_element_located((By.CSS_SELECTOR, self.HOME_CONTAINER_SELECTOR)))
+            logger.info("Successfully navigated back to home page.")
+            
+            # Take a small pause to ensure the UI is fully loaded
+            time.sleep(0.5)
 
+        # Now we're on the home page
+        # Take a screenshot of the current state for debugging
+        self._take_screenshot("before_adding_grade")
+        
+        # Find all grade rows currently in the UI
         grade_rows = self.driver.find_elements(By.CSS_SELECTOR, self.GRADES_LIST_ITEM_SELECTOR)
-        if not grade_rows:
-            self.driver.find_element(By.CSS_SELECTOR, self.ADD_GRADE_BUTTON_SELECTOR).click()
-            time.sleep(0.5) 
+        logger.info(f"Found {len(grade_rows)} grade rows before adding.")
+        
+        # First check if we need to add a new row
+        need_new_row = True
+        if grade_rows:
+            # Check if the last row is empty (which means we can use it)
+            last_row = grade_rows[-1]
+            try:
+                grade_input = last_row.find_element(By.CSS_SELECTOR, self.GRADE_INPUT_SELECTOR)
+                percentage_input = last_row.find_element(By.CSS_SELECTOR, self.PERCENTAGE_INPUT_SELECTOR)
+                
+                grade_value = grade_input.get_attribute("value")
+                percentage_value = percentage_input.get_attribute("value")
+                
+                # If both inputs are empty, we can use this row
+                if not grade_value and not percentage_value:
+                    need_new_row = False
+                    logger.info("Found empty row to use for new grade entry.")
+            except NoSuchElementException:
+                # If we can't find inputs in the last row, we'll add a new one
+                logger.warning("Last row doesn't have expected input elements.")
+                need_new_row = True
+        
+        # If we need a new row or there are no rows, add one
+        if need_new_row or not grade_rows:
+            logger.info("Adding a new grade row...")
+            add_button = self.wait_long.until(EC.element_to_be_clickable((By.CSS_SELECTOR, self.ADD_GRADE_BUTTON_SELECTOR)))
+            add_button.click()
+            time.sleep(0.5)  # Wait for the row to be added
+            
+            # Refresh the list of grade rows
             grade_rows = self.driver.find_elements(By.CSS_SELECTOR, self.GRADES_LIST_ITEM_SELECTOR)
-            if not grade_rows: self.fail("Failed to add initial grade row.")
-
-        last_row = grade_rows[-1]
-        grade_input_element = last_row.find_element(By.CSS_SELECTOR, self.GRADE_INPUT_SELECTOR)
-        percentage_input_element = last_row.find_element(By.CSS_SELECTOR, self.PERCENTAGE_INPUT_SELECTOR)
+            if not grade_rows:
+                logger.error("Failed to add grade row - no rows found after clicking 'Add' button")
+                self._take_screenshot("failed_to_add_grade_row")
+                self.fail("Failed to add grade row - no rows found after clicking 'Add' button")
 
-        grade_input_element.clear()
-        grade_input_element.send_keys(str(grade))
-        percentage_input_element.clear()
-        percentage_input_element.send_keys(str(percentage))
+        # Now use the last row to add our grade
+        last_row = grade_rows[-1]
+        logger.info(f"Using the last of {len(grade_rows)} rows to add grade: {grade}, percentage: {percentage}")
 
-        self.driver.find_element(By.CSS_SELECTOR, self.ADD_GRADE_BUTTON_SELECTOR).click()
-        time.sleep(0.5)
-        logger.info(f"Added grade: {grade}, percentage: {percentage}.")
+        try:
+            grade_input_element = last_row.find_element(By.CSS_SELECTOR, self.GRADE_INPUT_SELECTOR)
+            percentage_input_element = last_row.find_element(By.CSS_SELECTOR, self.PERCENTAGE_INPUT_SELECTOR)
+            
+            # Clear and enter the grade and percentage
+            grade_input_element.clear()
+            grade_input_element.send_keys(str(grade))
+            percentage_input_element.clear()
+            percentage_input_element.send_keys(str(percentage))
+            
+            # Take screenshot after entering values
+            self._take_screenshot(f"after_entering_grade_{grade}_percent_{percentage}")
+            
+            # Click the add button to confirm this grade
+            add_button = self.wait_long.until(EC.element_to_be_clickable((By.CSS_SELECTOR, self.ADD_GRADE_BUTTON_SELECTOR)))
+            add_button.click()
+            logger.info(f"Clicked 'Add' button after entering grade: {grade}, percentage: {percentage}")
+            
+            # Allow time for the UI to update
+            time.sleep(0.5)
+            
+            # Verify the grade was added by checking for more rows or for values in the inputs
+            new_grade_rows = self.driver.find_elements(By.CSS_SELECTOR, self.GRADES_LIST_ITEM_SELECTOR)
+            logger.info(f"After adding: {len(new_grade_rows)} grade rows (previously {len(grade_rows)})")
+            
+            # Take screenshot after adding grade
+            self._take_screenshot("after_adding_grade")
+            
+        except NoSuchElementException as e:
+            logger.error(f"Could not find input elements in the grade row: {e}")
+            self._take_screenshot("input_elements_not_found")
+            self.fail(f"Input elements not found: {e}")
+            return
 
     def _get_required_grade_or_message(self):
         raw_text = ""