codeforlife-portal 5.33.5__py2.py3-none-any.whl → 8.9.9__py2.py3-none-any.whl

portal/tests/pageObjects/portal/game_page.py

@@ -25,20 +25,20 @@ class GamePage(BasePage):
 
     def dismiss_dialog(self, button_id):
         self.wait_for_element_to_be_clickable((By.ID, button_id))
-        self.browser.find_element_by_id(button_id).click()
+        self.browser.find_element(By.ID, button_id).click()
         self.wait_for_element_to_be_invisible((By.ID, button_id))
 
     def load_solution(self, workspace_id):
-        self.browser.find_element_by_id("load_tab").click()
+        self.browser.find_element(By.ID, "load_tab").click()
         selector = "#loadWorkspaceTable tr[value='" + str(workspace_id) + "']"
         self.wait_for_element_to_be_clickable((By.CSS_SELECTOR, selector))
-        self.browser.find_element_by_css_selector(selector).click()
-        self.browser.find_element_by_id("loadWorkspace").click()
+        self.browser.find_element(By.CSS_SELECTOR, selector).click()
+        self.browser.find_element(By.ID, "loadWorkspace").click()
         time.sleep(1)
         return self
 
     def clear(self):
-        self.browser.find_element_by_id("clear_tab").click()
+        self.browser.find_element(By.ID, "clear_tab").click()
         return self
 
     def try_again(self):
@@ -46,7 +46,7 @@ class GamePage(BasePage):
         return self
 
     def step(self):
-        self.browser.find_element_by_id("step_tab").click()
+        self.browser.find_element(By.ID, "step_tab").click()
         return self
 
     def assert_is_green_light(self, traffic_light_index):
@@ -56,14 +56,12 @@ class GamePage(BasePage):
         self._assert_light_is_on(traffic_light_index, "red")
 
     def _assert_light_is_on(self, traffic_light_index, colour):
-        image = self.browser.find_element_by_id(
-            "trafficLight_%s_%s" % (traffic_light_index, colour)
-        )
+        image = self.browser.find_element(By.ID, "trafficLight_%s_%s" % (traffic_light_index, colour))
 
         assert_that(image.get_attribute("opacity"), equal_to("1"))
 
     def run_program(self, wait_for_element_id="algorithmScore"):
-        self.browser.find_element_by_id("fast_tab").click()
+        self.browser.find_element(By.ID, "fast_tab").click()
 
         try:
             self.wait_for_element_to_be_clickable((By.ID, wait_for_element_id), 45)
@@ -71,10 +69,7 @@ class GamePage(BasePage):
             import time
 
             millis = int(round(time.time() * 1000))
-            screenshot_filename = "/tmp/game_tests_%s-%s.png" % (
-                os.getenv("BUILD_NUMBER", "nonumber"),
-                str(millis),
-            )
+            screenshot_filename = "/tmp/game_tests_%s-%s.png" % (os.getenv("BUILD_NUMBER", "nonumber"), str(millis))
             print("Saved screenshot to " + screenshot_filename)
             self.browser.get_screenshot_as_file(screenshot_filename)
             raise e
@@ -85,18 +80,16 @@ class GamePage(BasePage):
         return self._run_failing_program("What went wrong")
 
     def run_program_that_runs_out_of_instructions(self):
-        return self._run_failing_program(
-            "The van ran out of instructions before it reached a destination."
-        )
+        return self._run_failing_program("The van ran out of instructions before it reached a destination.")
 
     def _run_failing_program(self, text):
         self.run_program("try_again_button")
-        error_message = self.browser.find_element_by_id("myModal-lead").text
+        error_message = self.browser.find_element(By.ID, "myModal-lead").text
         assert_that(error_message, contains_string(text))
         return self
 
     def _assert_score(self, element_id, score):
-        route_score = self.browser.find_element_by_id(element_id).text
+        route_score = self.browser.find_element(By.ID, element_id).text
         assert_that(route_score, equal_to(score))
         return self
 

portal/tests/pageObjects/portal/home_page.py

@@ -1,5 +1,7 @@
 from __future__ import absolute_import
 
+from selenium.webdriver.common.by import By
+
 from .base_page import BasePage
 
 
@@ -9,40 +11,36 @@ class HomePage(BasePage):
         assert self.on_correct_page("home_page")
 
     def go_to_teacher_login_page(self):
-        self.browser.find_element_by_id("login_dropdown").click()
-        self.browser.find_element_by_id("teacher_login_button").click()
+        self.browser.find_element(By.ID, "login_dropdown").click()
+        self.browser.find_element(By.ID, "teacher_login_button").click()
 
         from portal.tests.pageObjects.portal.teacher_login_page import TeacherLoginPage
 
         return TeacherLoginPage(self.browser)
 
     def teacher_logout(self):
-        self.browser.find_element_by_id("logout_menu").click()
-        self.browser.find_element_by_id("logout_button").click()
+        self.browser.find_element(By.ID, "logout_menu").click()
+        self.browser.find_element(By.ID, "logout_button").click()
         return HomePage(self.browser)
 
     def go_to_independent_student_login_page(self):
-        self.browser.find_element_by_id("login_dropdown").click()
-        self.browser.find_element_by_id("independent_login_button").click()
+        self.browser.find_element(By.ID, "login_dropdown").click()
+        self.browser.find_element(By.ID, "independent_login_button").click()
 
-        from portal.tests.pageObjects.portal.independent_login_page import (
-            IndependentStudentLoginPage,
-        )
+        from portal.tests.pageObjects.portal.independent_login_page import IndependentStudentLoginPage
 
         return IndependentStudentLoginPage(self.browser)
 
     def go_to_student_login_page(self):
-        self.browser.find_element_by_id("login_dropdown").click()
-        self.browser.find_element_by_id("student_login_button").click()
+        self.browser.find_element(By.ID, "login_dropdown").click()
+        self.browser.find_element(By.ID, "student_login_button").click()
 
-        from portal.tests.pageObjects.portal.student_login_class_code import (
-            StudentLoginClassCodePage,
-        )
+        from portal.tests.pageObjects.portal.student_login_class_code import StudentLoginClassCodePage
 
         return StudentLoginClassCodePage(self.browser)
 
     def go_to_signup_page(self):
-        self.browser.find_element_by_id("signup_button").click()
+        self.browser.find_element(By.ID, "signup_button").click()
 
         import portal.tests.pageObjects.portal.signup_page as signup_page
 

portal/tests/pageObjects/portal/independent_login_page.py

@@ -1,8 +1,8 @@
-import time
+from selenium.webdriver.common.by import By
 
 from .base_page import BasePage
+from .password_reset_page import PasswordResetPage
 from .play import dashboard_page
-from .student_password_reset_form_page import StudentPasswordResetFormPage
 
 
 class IndependentStudentLoginPage(BasePage):
@@ -11,28 +11,24 @@ class IndependentStudentLoginPage(BasePage):
 
         assert self.on_correct_page("independent_login_page")
 
-    def independent_student_login(self, username, password):
-        self._independent_student_login(username, password)
+    def independent_student_login(self, email, password):
+        self._independent_student_login(email, password)
 
         return dashboard_page.PlayDashboardPage(self.browser)
 
-    def independent_student_login_failure(self, username, password):
-        self._independent_student_login(username, password)
+    def independent_student_login_failure(self, email, password):
+        self._independent_student_login(email, password)
         return self
 
-    def _independent_student_login(self, username, password):
-        self.browser.find_element_by_id("id_username").send_keys(username)
-        self.browser.find_element_by_id("id_password").send_keys(password)
-        self.browser.find_element_by_name("independent_student_login").click()
+    def _independent_student_login(self, email, password):
+        self.browser.find_element(By.ID, "id_username").send_keys(email)
+        self.browser.find_element(By.ID, "id_password").send_keys(password)
+        self.browser.find_element(By.NAME, "independent_student_login").click()
 
     def go_to_indep_forgotten_password_page(self):
-        self.browser.find_element_by_id("student_forgotten_password_button").click()
-        return StudentPasswordResetFormPage(self.browser)
+        self.browser.find_element(By.ID, "student_forgotten_password_button").click()
+        return PasswordResetPage(self.browser)
 
     def has_login_failed(self, form_id, error):
-        errors = (
-            self.browser.find_element_by_id(form_id)
-            .find_element_by_class_name("errorlist")
-            .text
-        )
+        errors = self.browser.find_element(By.ID, form_id).find_element(By.CLASS_NAME, "errorlist").text
         return error in errors

portal/tests/pageObjects/portal/password_reset_form_page.py

@@ -1,5 +1,8 @@
 from __future__ import absolute_import
 
+from selenium.common.exceptions import NoSuchElementException
+from selenium.webdriver.common.by import By
+
 from .base_page import BasePage
 
 
@@ -13,7 +16,7 @@ class PasswordResetPage(BasePage):
         self.clear_and_fill("new_password1", new_password)
         self.clear_and_fill("new_password2", new_password)
 
-        self.browser.find_element_by_id("teacher_update_button").click()
+        self.browser.find_element(By.ID, "teacher_update_button").click()
 
         self.wait_for_element_by_id("reset_password_done_page")
 
@@ -23,12 +26,25 @@ class PasswordResetPage(BasePage):
         self.clear_and_fill("new_password1", new_password)
         self.clear_and_fill("new_password2", new_password)
 
-        self.browser.find_element_by_id("student_update_button").click()
+        self.browser.find_element(By.ID, "student_update_button").click()
 
         self.wait_for_element_by_id("reset_password_done_page")
 
         return self
 
+    def reset_password_fail(self, new_password):
+        self.clear_and_fill("new_password1", new_password)
+        self.clear_and_fill("new_password2", new_password)
+
+        try:
+            update_button = self.browser.find_element(By.ID, "teacher_update_button")
+        except NoSuchElementException:
+            update_button = self.browser.find_element(By.ID, "student_update_button")
+
+        update_button.click()
+
+        return self
+
     def clear_and_fill(self, field, value):
-        self.browser.find_element_by_id("id_" + field).clear()
-        self.browser.find_element_by_id("id_" + field).send_keys(value)
+        self.browser.find_element(By.ID, "id_" + field).clear()
+        self.browser.find_element(By.ID, "id_" + field).send_keys(value)

portal/tests/pageObjects/portal/password_reset_page.py

@@ -0,0 +1,25 @@
+from __future__ import absolute_import
+
+from selenium.webdriver.common.by import By
+
+from .base_page import BasePage
+from .home_page import HomePage
+
+
+class PasswordResetPage(BasePage):
+    def __init__(self, browser):
+        super(PasswordResetPage, self).__init__(browser)
+
+        assert self.on_correct_page("reset_password_page")
+
+    def cancel(self):
+        self.browser.find_element(By.ID, "cancel_button").click()
+        return HomePage(self.browser)
+
+    def reset_email_submit(self, email):
+        self.browser.find_element(By.ID, "id_email").send_keys(email)
+
+        self.wait_for_element_by_id("reset_button")
+
+        self.browser.find_element(By.ID, "reset_button").click()
+        return self

portal/tests/pageObjects/portal/play/account_page.py

@@ -1,15 +1,11 @@
 from __future__ import absolute_import
 
-from portal.tests.pageObjects.portal.email_verification_needed_page import (
-    EmailVerificationNeededPage,
-)
-from portal.tests.pageObjects.portal.independent_login_page import (
-    IndependentStudentLoginPage,
-)
+from selenium.webdriver.common.by import By
+
+from portal.tests.pageObjects.portal.email_verification_needed_page import EmailVerificationNeededPage
+from portal.tests.pageObjects.portal.independent_login_page import IndependentStudentLoginPage
 from portal.tests.pageObjects.portal.play.dashboard_page import PlayDashboardPage
-from portal.tests.pageObjects.portal.student_login_class_code import (
-    StudentLoginClassCodePage,
-)
+from portal.tests.pageObjects.portal.student_login_class_code import StudentLoginClassCodePage
 from .play_base_page import PlayBasePage
 
 
@@ -23,21 +19,18 @@ class PlayAccountPage(PlayBasePage):
         correct = True
 
         for field, value in list(details.items()):
-            correct &= (
-                self.browser.find_element_by_id("id_" + field).get_attribute("value")
-                == value
-            )
+            correct &= self.browser.find_element(By.ID, "id_" + field).get_attribute("value") == value
 
         return correct
 
     def _change_details(self, details):
         for field, value in list(details.items()):
-            self.browser.find_element_by_id("id_" + field).clear()
-            self.browser.find_element_by_id("id_" + field).send_keys(value)
-        self.browser.find_element_by_id("update_button").click()
+            self.browser.find_element(By.ID, "id_" + field).clear()
+            self.browser.find_element(By.ID, "id_" + field).send_keys(value)
+        self.browser.find_element(By.ID, "update_button").click()
 
     def submit_empty_form(self):
-        self.browser.find_element_by_id("update_button").click()
+        self.browser.find_element(By.ID, "update_button").click()
         return self
 
     def update_password_failure(self, new_password, confirm_new_password, old_password):
@@ -64,15 +57,13 @@ class PlayAccountPage(PlayBasePage):
         return EmailVerificationNeededPage(self.browser)
 
     def _update_password(self, new_password, confirm_new_password, old_password):
-        self.browser.find_element_by_id("id_password").send_keys(new_password)
-        self.browser.find_element_by_id("id_confirm_password").send_keys(
-            confirm_new_password
-        )
-        self.browser.find_element_by_id("id_current_password").send_keys(old_password)
-        self.browser.find_element_by_id("update_button").click()
+        self.browser.find_element(By.ID, "id_password").send_keys(new_password)
+        self.browser.find_element(By.ID, "id_confirm_password").send_keys(confirm_new_password)
+        self.browser.find_element(By.ID, "id_current_password").send_keys(old_password)
+        self.browser.find_element(By.ID, "update_button").click()
 
     def _update_name(self, new_name, password):
-        self.browser.find_element_by_id("id_name").clear()
-        self.browser.find_element_by_id("id_name").send_keys(new_name)
-        self.browser.find_element_by_id("id_current_password").send_keys(password)
-        self.browser.find_element_by_id("update_button").click()
+        self.browser.find_element(By.ID, "id_name").clear()
+        self.browser.find_element(By.ID, "id_name").send_keys(new_name)
+        self.browser.find_element(By.ID, "id_current_password").send_keys(password)
+        self.browser.find_element(By.ID, "update_button").click()

portal/tests/pageObjects/portal/play/dashboard_page.py

@@ -1,8 +1,8 @@
 from __future__ import absolute_import
 
-from portal.tests.pageObjects.portal.play.join_school_or_club_page import (
-    JoinSchoolOrClubPage,
-)
+from selenium.webdriver.common.by import By
+
+from portal.tests.pageObjects.portal.play.join_school_or_club_page import JoinSchoolOrClubPage
 from .play_base_page import PlayBasePage
 
 
@@ -13,6 +13,6 @@ class PlayDashboardPage(PlayBasePage):
         assert self.on_correct_page("play_dashboard_page")
 
     def go_to_join_a_school_or_club_page(self):
-        self.browser.find_element_by_id("student_join_school_link").click()
+        self.browser.find_element(By.ID, "student_join_school_link").click()
 
         return JoinSchoolOrClubPage(self.browser)

portal/tests/pageObjects/portal/play/join_school_or_club_page.py

@@ -1,3 +1,5 @@
+from selenium.webdriver.common.by import By
+
 from portal.tests.pageObjects.portal.play.play_base_page import PlayBasePage
 
 
@@ -8,28 +10,24 @@ class JoinSchoolOrClubPage(PlayBasePage):
         assert self.on_correct_page("play_join_organisation_page")
 
     def join_a_school_or_club(self, access_code):
-        self.browser.find_element_by_id("id_access_code").send_keys(access_code)
-        self.browser.find_element_by_id("request_join_a_school_or_club_button").click()
+        self.browser.find_element(By.ID, "id_access_code").send_keys(access_code)
+        self.browser.find_element(By.ID, "request_join_a_school_or_club_button").click()
         assert self.element_exists_by_css(".success")
 
         return self
 
     def join_a_school_or_club_failure(self, access_code):
-        self.browser.find_element_by_id("id_access_code").send_keys(access_code)
-        self.browser.find_element_by_id("request_join_a_school_or_club_button").click()
+        self.browser.find_element(By.ID, "id_access_code").send_keys(access_code)
+        self.browser.find_element(By.ID, "request_join_a_school_or_club_button").click()
         assert not self.element_exists_by_css(".success")
 
         return self
 
     def has_join_request_failed(self, error):
-        errors = (
-            self.browser.find_element_by_id("join_class_form")
-            .find_element_by_class_name("errorlist")
-            .text
-        )
+        errors = self.browser.find_element(By.ID, "join_class_form").find_element(By.CLASS_NAME, "errorlist").text
         return error in errors
 
     def revoke_join_request(self):
-        self.browser.find_element_by_name("revoke_join_request").click()
+        self.browser.find_element(By.NAME, "revoke_join_request").click()
 
         return self

portal/tests/pageObjects/portal/play/play_base_page.py

@@ -2,6 +2,8 @@ from __future__ import absolute_import
 
 import time
 
+from selenium.webdriver.common.by import By
+
 from portal.tests.pageObjects.portal.base_page import BasePage
 
 
@@ -11,7 +13,7 @@ class PlayBasePage(BasePage):
 
     def logout(self):
         self.open_user_options_box()
-        self.browser.find_element_by_id("logout_button").click()
+        self.browser.find_element(By.ID, "logout_button").click()
 
         from portal.tests.pageObjects.portal.home_page import HomePage
 
@@ -19,12 +21,12 @@ class PlayBasePage(BasePage):
 
     def go_to_account_page(self):
         self.open_user_options_box()
-        self.browser.find_element_by_id("student_edit_account_button").click()
+        self.browser.find_element(By.ID, "student_edit_account_button").click()
 
         from .account_page import PlayAccountPage
 
         return PlayAccountPage(self.browser)
 
     def open_user_options_box(self):
-        self.browser.find_element_by_id("logout_menu").click()
+        self.browser.find_element(By.ID, "logout_menu").click()
         time.sleep(1)

portal/tests/pageObjects/portal/signup_page.py

@@ -1,5 +1,8 @@
 from __future__ import absolute_import
 
+from selenium.webdriver.common.by import By
+from selenium.webdriver.support.ui import Select
+
 from . import email_verification_needed_page
 from .base_page import BasePage
 
@@ -20,74 +23,40 @@ class SignupPage(BasePage):
         success=True,
         newsletter=False,
     ):
-        self.browser.find_element_by_id(
-            "id_teacher_signup-teacher_first_name"
-        ).send_keys(first_name)
-        self.browser.find_element_by_id(
-            "id_teacher_signup-teacher_last_name"
-        ).send_keys(last_name)
-        self.browser.find_element_by_id("id_teacher_signup-teacher_email").send_keys(
-            email
-        )
-        self.browser.find_element_by_id("id_teacher_signup-teacher_password").send_keys(
-            password
-        )
-        self.browser.find_element_by_id(
-            "id_teacher_signup-teacher_confirm_password"
-        ).send_keys(confirm_password)
+        self.browser.find_element(By.ID, "id_teacher_signup-teacher_first_name").send_keys(first_name)
+        self.browser.find_element(By.ID, "id_teacher_signup-teacher_last_name").send_keys(last_name)
+        self.browser.find_element(By.ID, "id_teacher_signup-teacher_email").send_keys(email)
+        self.browser.find_element(By.ID, "id_teacher_signup-teacher_password").send_keys(password)
+        self.browser.find_element(By.ID, "id_teacher_signup-teacher_confirm_password").send_keys(confirm_password)
+        self.browser.find_element(By.ID, "id_teacher_signup-consent_ticked").click()
 
         if newsletter:
-            self.browser.find_element_by_id(
-                "id_teacher_signup-newsletter_ticked"
-            ).click()
+            self.browser.find_element(By.ID, "id_teacher_signup-newsletter_ticked").click()
 
-        self.browser.find_element_by_name("teacher_signup").click()
+        self.browser.find_element(By.NAME, "teacher_signup").click()
 
         if success:
-            return email_verification_needed_page.EmailVerificationNeededPage(
-                self.browser
-            )
+            return email_verification_needed_page.EmailVerificationNeededPage(self.browser)
         else:
             return self
 
-    def independent_student_signup(
-        self,
-        name,
-        username,
-        email_address,
-        password,
-        confirm_password,
-        success=True,
-        newsletter=False,
-        is_over_required_age=True,
-    ):
-        self.browser.find_element_by_id("id_independent_student_signup-name").send_keys(
-            name
-        )
-        self.browser.find_element_by_id(
-            "id_independent_student_signup-username"
-        ).send_keys(username)
-        self.browser.find_element_by_id(
-            "id_independent_student_signup-email"
-        ).send_keys(email_address)
-        self.browser.find_element_by_id(
-            "id_independent_student_signup-password"
-        ).send_keys(password)
-        self.browser.find_element_by_id(
-            "id_independent_student_signup-confirm_password"
-        ).send_keys(confirm_password)
-
-        if newsletter:
-            self.browser.find_element_by_id(
-                "id_independent_student_signup-newsletter_ticked"
-            ).click()
-
-        if is_over_required_age:
-            self.browser.find_element_by_id(
-                "id_independent_student_signup-is_over_required_age"
-            ).click()
+    def independent_student_signup(self, name, email_address, password, confirm_password, success=True):
+        dob_day_element = self.browser.find_element(By.ID, "id_independent_student_signup-date_of_birth_day")
+        dob_month_element = self.browser.find_element(By.ID, "id_independent_student_signup-date_of_birth_month")
+        dob_year_element = self.browser.find_element(By.ID, "id_independent_student_signup-date_of_birth_year")
+        day_select = Select(dob_day_element)
+        month_select = Select(dob_month_element)
+        year_select = Select(dob_year_element)
+        day_select.select_by_value("7")
+        month_select.select_by_value("10")
+        year_select.select_by_value("1997")
+        self.browser.find_element(By.ID, "id_independent_student_signup-name").send_keys(name)
+        self.browser.find_element(By.ID, "id_independent_student_signup-email").send_keys(email_address)
+        self.browser.find_element(By.ID, "id_independent_student_signup-password").send_keys(password)
+        self.browser.find_element(By.ID, "id_independent_student_signup-confirm_password").send_keys(confirm_password)
+        self.browser.find_element(By.ID, "id_independent_student_signup-consent_ticked").click()
 
-        self.browser.find_element_by_name("independent_student_signup").click()
+        self.browser.find_element(By.NAME, "independent_student_signup").click()
         if success:
             from .email_verification_needed_page import EmailVerificationNeededPage
 

portal/tests/pageObjects/portal/student_login_class_code.py

@@ -1,6 +1,7 @@
-from .base_page import BasePage
+from selenium.webdriver.common.by import By
+
 from . import student_login_page
-import time
+from .base_page import BasePage
 
 
 class StudentLoginClassCodePage(BasePage):
@@ -19,13 +20,9 @@ class StudentLoginClassCodePage(BasePage):
         return self
 
     def _student_input_access_code(self, access_code):
-        self.browser.find_element_by_id("id_access_code").send_keys(access_code)
-        self.browser.find_element_by_name("school_login_class_code").click()
+        self.browser.find_element(By.ID, "id_access_code").send_keys(access_code)
+        self.browser.find_element(By.NAME, "school_login_class_code").click()
 
     def has_access_code_input_failed(self, form_id, error):
-        errors = (
-            self.browser.find_element_by_id(form_id)
-            .find_element_by_class_name("errorlist")
-            .text
-        )
+        errors = self.browser.find_element(By.ID, form_id).find_element(By.CLASS_NAME, "errorlist").text
         return error in errors

portal/tests/pageObjects/portal/student_login_page.py

@@ -1,3 +1,5 @@
+from selenium.webdriver.common.by import By
+
 from .base_page import BasePage
 from .play import dashboard_page
 
@@ -18,14 +20,10 @@ class StudentLoginPage(BasePage):
         return self
 
     def _student_login(self, name, password):
-        self.browser.find_element_by_id("id_username").send_keys(name)
-        self.browser.find_element_by_id("id_password").send_keys(password)
-        self.browser.find_element_by_name("school_login").click()
+        self.browser.find_element(By.ID, "id_username").send_keys(name)
+        self.browser.find_element(By.ID, "id_password").send_keys(password)
+        self.browser.find_element(By.NAME, "school_login").click()
 
     def has_login_failed(self, form_id, error):
-        errors = (
-            self.browser.find_element_by_id(form_id)
-            .find_element_by_class_name("errorlist")
-            .text
-        )
+        errors = self.browser.find_element(By.ID, form_id).find_element(By.CLASS_NAME, "errorlist").text
         return error in errors

portal/tests/pageObjects/portal/teach/add_independent_student_to_class_page.py

@@ -13,12 +13,12 @@ class AddIndependentStudentToClassPage(TeachBasePage):
         assert self.on_correct_page("add_independent_student_to_class")
 
     def _rename(self, name):
-        self.browser.find_element_by_id("id_name").clear()
-        self.browser.find_element_by_id("id_name").send_keys(name)
+        self.browser.find_element(By.ID, "id_name").clear()
+        self.browser.find_element(By.ID, "id_name").send_keys(name)
 
     def save(self, name):
         self._rename(name)
         self.wait_for_element_to_be_clickable((By.ID, "save_student_name_button"))
-        self.browser.find_element_by_id("save_student_name_button").click()
+        self.browser.find_element(By.ID, "save_student_name_button").click()
 
         return AddedIndependentStudentToClassPage(self.browser)

portal/tests/pageObjects/portal/teach/added_independent_student_to_class_page.py

@@ -1,3 +1,5 @@
+from selenium.webdriver.common.by import By
+
 from portal.tests.pageObjects.portal.teach.class_page import TeachClassPage
 from portal.tests.pageObjects.portal.teach.teach_base_page import TeachBasePage
 
@@ -9,6 +11,6 @@ class AddedIndependentStudentToClassPage(TeachBasePage):
         assert self.on_correct_page("added_independent_student_to_class")
 
     def return_to_class(self):
-        self.browser.find_element_by_id("return_button").click()
+        self.browser.find_element(By.ID, "return_button").click()
 
         return TeachClassPage(self.browser)