Add additional test condition

Author: styrix560

evap/student/tests/test_live.py

@@ -1,9 +1,12 @@
 from django.test import override_settings
 from model_bakery import baker
-from selenium.webdriver import ActionChains, Keys
 from selenium.webdriver.common.by import By
 from selenium.webdriver.remote.webelement import WebElement
-from selenium.webdriver.support.expected_conditions import presence_of_element_located, visibility_of_element_located
+from selenium.webdriver.support.expected_conditions import (
+    invisibility_of_element,
+    presence_of_element_located,
+    visibility_of_element_located,
+)
 
 from evap.evaluation.models import Contribution, Evaluation, Question, Questionnaire, QuestionType, UserProfile
 from evap.evaluation.tests.tools import LiveServerTest
@@ -120,43 +123,46 @@ def test_skip_contributor_clears_warning(self) -> None:
         id_ = button.get_attribute("data-mark-no-answers-for")
         self.assertEqual(len(self.selenium.find_elements(By.CSS_SELECTOR, f"#vote-area-{id_} .choice-error")), 0)
 
-    def test_skip_contributor_modal_appears(self) -> None:
-        def get_open_modals():
-            modals = self.selenium.find_elements(By.CSS_SELECTOR, "confirmation-modal.mark-no-answer-modal")
-            return [
-                modal for modal in modals if len(modal.shadow_root.find_elements(By.CSS_SELECTOR, "dialog:open")) == 1
-            ]
+    def get_open_modals(self):
+        modals = self.selenium.find_elements(By.CSS_SELECTOR, "confirmation-modal.mark-no-answer-modal")
+        return [modal for modal in modals if len(modal.shadow_root.find_elements(By.CSS_SELECTOR, "dialog:open")) == 1]
 
-        def assert_modal_visible_and_close():
-            modals = get_open_modals()
-            self.assertEqual(len(modals), 1)
-            ActionChains(self.selenium).send_keys(Keys.ESCAPE).perform()
+    def test_skip_contributor_modal_not_shown(self) -> None:
+        self.selenium.get(self.url)
 
-        def assert_modal_not_visible():
-            modals = get_open_modals()
-            self.assertEqual(len(modals), 0)
+        button = self.wait.until(presence_of_element_located((By.CSS_SELECTOR, "[data-mark-no-answers-for]")))
+        id_ = button.get_attribute("data-mark-no-answers-for")
+        vote_area = self.selenium.find_element(By.ID, f"vote-area-{id_}")
 
+        radio_button = vote_area.find_element(By.CSS_SELECTOR, "input[value='1'] + label.vote-btn")
+
+        open_textanswer = vote_area.find_element(By.CSS_SELECTOR, "button.btn-textanswer")
+        open_textanswer.click()
+
+        radio_button.click()
+        button.click()
+        self.assertEqual(len(self.get_open_modals()), 0)
+
+    def test_skip_contributor_modal_shown(self) -> None:
         self.selenium.get(self.url)
 
         button = self.wait.until(presence_of_element_located((By.CSS_SELECTOR, "[data-mark-no-answers-for]")))
         id_ = button.get_attribute("data-mark-no-answers-for")
         vote_area = self.selenium.find_element(By.ID, f"vote-area-{id_}")
 
-        textareas = vote_area.find_elements(By.CSS_SELECTOR, "textarea")
-        textarea = vote_area.find_element(By.CSS_SELECTOR, f"textarea[name='{textareas[0].get_attribute('name')}']")
-        radio_buttons = vote_area.find_elements(By.CSS_SELECTOR, "input[value='1'] + label.vote-btn")
-        self.assertEqual(len(radio_buttons), 1)
+        textarea = vote_area.find_element(By.CSS_SELECTOR, "textarea")
 
         open_textanswer = vote_area.find_element(By.CSS_SELECTOR, "button.btn-textanswer")
         open_textanswer.click()
 
         textarea.click()
         textarea.send_keys("a")
         button.click()
-        assert_modal_visible_and_close()
-
-        textarea.click()
-        textarea.send_keys(Keys.BACKSPACE)
-        radio_buttons[0].click()
-        button.click()
-        assert_modal_not_visible()
+        modals = self.get_open_modals()
+        self.assertEqual(len(modals), 1)
+        modal = modals[0]
+        confirm_button = modal.shadow_root.find_element(By.CSS_SELECTOR, "button[data-event-type='confirm']")
+        confirm_button.click()
+        self.wait.until(invisibility_of_element(modal))
+        self.assertEqual(len(self.get_open_modals()), 0)
+        self.assertEqual(textarea.text, "")