test: Fix selectors in selenium tests

Author: jennifer-richards

ietf/doc/tests_js.py

@@ -118,7 +118,7 @@ def _read_author_form(form_elt):
         # Must provide a "basis" (change reason)
         self.driver.find_element(By.ID, 'id_basis').send_keys('change testing')
         # Now click the 'submit' button and check that the update was accepted.
-        submit_button = self.driver.find_element(By.CSS_SELECTOR, 'button[type="submit"]')
+        submit_button = self.driver.find_element(By.CSS_SELECTOR, '#content button[type="submit"]')
         self.driver.execute_script("arguments[0].click();", submit_button)  # FIXME: no idea why this fails:
         # self.scroll_to_element(submit_button)
         # submit_button.click()
@@ -132,4 +132,4 @@ def _read_author_form(form_elt):
         self.assertEqual(
             list(draft.documentauthor_set.values_list('person', flat=True)),
             [first_auth.person.pk] + [auth.pk for auth in authors]
-        )
+        )

ietf/utils/jstest.py

@@ -81,7 +81,7 @@ def login(self, username='plain'):
         self.driver.get(url)
         self.driver.find_element(By.NAME, 'username').send_keys(username)
         self.driver.find_element(By.NAME, 'password').send_keys(password)
-        self.driver.find_element(By.XPATH, '//button[@type="submit"]').click()
+        self.driver.find_element(By.XPATH, '//*[@id="content"]//button[@type="submit"]').click()
 
     def scroll_to_element(self, element):
         """Scroll an element into view"""
@@ -108,4 +108,4 @@ def __init__(self, element, child_selector):
 
     def __call__(self, driver):
         child = self.element.find_element(By.CSS_SELECTOR, self.child_selector)
-        return child if child is not None else False
+        return child if child is not None else False