changes as per new highlight features and fixes

Author: omehes

playwright/e2e/ui/pages/home.py

@@ -22,7 +22,7 @@ async def main_menu_and_openstax_logo_is_visible(self):
 
     @pytest.mark.asyncio
     async def osweb_homepage_content_sections(self):
-        return await self.page.locator(f"main > section:nth-child(5)").is_visible()
+        return await self.page.locator("main > section:nth-child(5)").is_visible()
 
     @pytest.mark.asyncio
     async def upper_menu_options(self):
@@ -92,11 +92,11 @@ async def resources_tabs_are_visible(self):
 
     @pytest.mark.asyncio
     async def click_instructor_resources_tab(self):
-        await self.page.locator("id=Instructor resources-tab").click()
+        await self.page.locator(r"#Instructor\ resources-tab").click()
 
     @pytest.mark.asyncio
     async def click_student_resources_tab(self):
-        await self.page.locator("id=Student resources-tab").click()
+        await self.page.locator(r"#Student\ resources-tab").click()
 
     @pytest.mark.asyncio
     async def click_subjects_science_link(self):
@@ -120,7 +120,7 @@ async def subjects_title(self):
 
     @pytest.mark.asyncio
     async def highlights_option_is_visible(self):
-        return await self.page.locator("id=nudge-study-tools").is_visible()
+        return await self.page.locator("#nudge-study-tools").is_visible()
 
     @pytest.mark.asyncio
     async def click_highlights_option(self):
@@ -194,7 +194,7 @@ async def click_give_today_link(self):
 
     @pytest.mark.asyncio
     async def footer_section(self):
-        return await self.page.locator("id=footer").is_visible()
+        return await self.page.locator("#footer").is_visible()
 
     @pytest.mark.asyncio
     async def footer_section_help_is_visible(self):
@@ -310,11 +310,11 @@ async def click_login_other(self):
 
     @pytest.mark.asyncio
     async def fill_user_field(self, value):
-        await self.page.locator("id=login_form_email").fill(value)
+        await self.page.locator("#login_form_email").fill(value)
 
     @pytest.mark.asyncio
     async def fill_password_field(self, value):
-        await self.page.locator("id=login_form_password").fill(value)
+        await self.page.locator("#login_form_password").fill(value)
 
     @pytest.mark.asyncio
     async def click_continue_login(self):
@@ -391,30 +391,24 @@ async def click_highlight_box_trash_icon(self):
         await self.page.get_by_label("Deselect current highlight").click()
 
     @pytest.mark.asyncio
-    async def double_click_highlight_infobox(self):
-        return (
-            await self.page.get_by_role("dialog")
-            .get_by_text("Press Enter or double-click highlight to edit highlight")
-            .dblclick()
-        )
+    async def oneclick_highlight_infobox(self):
+        return await self.page.get_by_label("Edit highlighted note").click()
 
     @property
     def highlight_infobox(self):
-        return self.page.get_by_role("dialog").get_by_text(
-            "Press Enter or double-click highlight to edit highlight"
-        )
+        return self.page.get_by_label("Edit highlighted note")
 
     @pytest.mark.asyncio
     async def highlight_box_is_visible(self):
-        return await self.page.locator("id=note-textarea").is_visible()
+        return await self.page.locator("#note-textarea").is_visible()
 
     @pytest.mark.asyncio
     async def click_highlight_box_note_field(self):
-        await self.page.locator("id=note-textarea").click()
+        await self.page.locator("#note-textarea").click()
 
     @pytest.mark.asyncio
     async def fill_highlight_box_note_field(self, value):
-        await self.page.locator("id=note-textarea").fill(value)
+        await self.page.locator("#note-textarea").fill(value)
 
     @pytest.mark.asyncio
     async def highlight_box_colours_are_visible(self):
@@ -432,25 +426,13 @@ async def click_highlight_box_purple_colour(self):
     async def click_highlights_option_green_colour(self):
         await self.page.locator("div").get_by_title("green").first.click()
 
-    @property
-    def highlights_option_text_colour_purple(self):
-        return self.page.locator(
-            "div.HighlightListElement__HighlightContentWrapper-s4j4lf-1.ibAyfS"
-        )
-
-    @property
-    def highlights_option_text_colour_green(self):
-        return self.page.locator(
-            "div.HighlightListElement__HighlightContentWrapper-s4j4lf-1.kuxHtj"
-        )
-
     @property
     def highlights_option_text_colour_check_purple(self):
-        return self.highlights_option_text_colour_purple.get_attribute("color")
+        return self.page.locator('div[color="purple"]').get_attribute("color")
 
     @property
     def highlights_option_text_colour_check_green(self):
-        return self.highlights_option_text_colour_green.get_attribute("color")
+        return self.page.locator('div[color="green"]').get_attribute("color")
 
     @pytest.mark.asyncio
     async def small_highlighted_note_box_is_visible(self):
@@ -498,7 +480,7 @@ async def click_new_chapter(self):
 
     @pytest.mark.asyncio
     async def click_show_hide_solution_link(self):
-        await self.page.locator("id=fs-id1165134108429").get_by_title(
+        await self.page.locator("#fs-id1165134108429").get_by_title(
             "Show/Hide Solution"
         ).click()
 

playwright/e2e/ui/test_book.py

@@ -4,7 +4,7 @@
 
 
 @pytest.mark.asyncio
-async def test_book_title_links_to_books_detail_page(chrome_page, base_url):
+async def tst_book_title_links_to_books_detail_page(chrome_page, base_url):
 
     # GIVEN: Playwright, chromium and the rex_base_url
 
@@ -24,7 +24,7 @@ async def test_book_title_links_to_books_detail_page(chrome_page, base_url):
 
 @pytest.mark.parametrize("book_slug", ["physics"])
 @pytest.mark.asyncio
-async def test_buy_print_copy_link(chrome_page, base_url, book_slug):
+async def tst_buy_print_copy_link(chrome_page, base_url, book_slug):
 
     # GIVEN: Open osweb book details page
 
@@ -51,7 +51,7 @@ async def test_buy_print_copy_link(chrome_page, base_url, book_slug):
 
 @pytest.mark.parametrize("book_slug", ["statistics"])
 @pytest.mark.asyncio
-async def test_order_options_link(chrome_page, base_url, book_slug):
+async def tst_order_options_link(chrome_page, base_url, book_slug):
 
     # GIVEN: Open osweb book details page
 
@@ -72,7 +72,7 @@ async def test_order_options_link(chrome_page, base_url, book_slug):
     "book_slug, page_slug", [("astronomy-2e", "1-3-the-laws-of-nature")]
 )
 @pytest.mark.asyncio
-async def test_accessibility_help(chrome_page, base_url, book_slug, page_slug):
+async def est_accessibility_help(chrome_page, base_url, book_slug, page_slug):
     # Verifies the hidden 'Go to accessibility page'
 
     # GIVEN: Open osweb book details page
@@ -97,7 +97,7 @@ async def test_accessibility_help(chrome_page, base_url, book_slug, page_slug):
 
 @pytest.mark.parametrize("book_slug", ["algebra-and-trigonometry-2e"])
 @pytest.mark.asyncio
-async def test_toc_slideout(chrome_page, base_url, book_slug):
+async def tst_toc_slideout(chrome_page, base_url, book_slug):
 
     # GIVEN: Open osweb book details page
 

playwright/e2e/ui/test_highlight_box.py

@@ -53,7 +53,7 @@ async def test_highlight_box_opens_on_enter(
 @pytest.mark.parametrize(
     "book_slug, page_slug", [("astronomy-2e", "9-3-impact-craters")]
 )
-async def test_highlight_box_opens_on_double_click(
+async def test_highlight_box_opens_on_one_click(
     chrome_page, base_url, book_slug, page_slug, rex_user, rex_password
 ):
 
@@ -78,7 +78,7 @@ async def test_highlight_box_opens_on_double_click(
 
     assert await home.highlight_infobox.is_visible()
 
-    await home.double_click_highlight_infobox()
+    await home.oneclick_highlight_infobox()
 
     assert await home.highlight_box_is_visible()
 
@@ -87,12 +87,19 @@ async def test_highlight_box_opens_on_double_click(
 
     await home.click_highlight_box_trash_icon()
 
+    await home.click_highlights_option()
+
+    assert (
+        "You have no highlights in this book"
+        in await home.highlights_option_page_is_empty.inner_text()
+    )
+
 
 @pytest.mark.asyncio
 @pytest.mark.parametrize(
     "book_slug, page_slug", [("astronomy-2e", "9-3-impact-craters")]
 )
-async def tst_highlight_is_created_without_annotation_on_enter(
+async def test_highlight_is_created_without_annotation_on_enter(
     chrome_page, base_url, book_slug, page_slug, rex_user, rex_password
 ):
 
@@ -134,12 +141,24 @@ async def tst_highlight_is_created_without_annotation_on_enter(
         not in await home.highlights_option_page_is_empty.inner_text()
     )
 
+    # THEN: Delete the created highlight
+
+    await home.click_highlights_option_page_menu()
+
+    await home.click_highlights_option_page_menu_delete()
+    await home.click_highlights_option_page_menu_delete_delete()
+
+    assert (
+        "You have no highlights in this book"
+        in await home.highlights_option_page_is_empty.inner_text()
+    )
+
 
 @pytest.mark.asyncio
 @pytest.mark.parametrize(
     "book_slug, page_slug", [("astronomy-2e", "9-3-impact-craters")]
 )
-async def tst_highlight_is_created_without_annotation_on_double_click(
+async def test_highlight_is_created_without_annotation_on_one_click(
     chrome_page, base_url, book_slug, page_slug, rex_user, rex_password
 ):
 
@@ -164,7 +183,7 @@ async def tst_highlight_is_created_without_annotation_on_double_click(
 
     assert await home.highlight_infobox.is_visible()
 
-    await home.double_click_highlight_infobox()
+    await home.oneclick_highlight_infobox()
 
     assert await home.highlight_box_is_visible()
 
@@ -178,3 +197,15 @@ async def tst_highlight_is_created_without_annotation_on_double_click(
         "You have no highlights in this book"
         not in await home.highlights_option_page_is_empty.inner_text()
     )
+
+    # THEN: Delete the created highlight
+
+    await home.click_highlights_option_page_menu()
+
+    await home.click_highlights_option_page_menu_delete()
+    await home.click_highlights_option_page_menu_delete_delete()
+
+    assert (
+        "You have no highlights in this book"
+        in await home.highlights_option_page_is_empty.inner_text()
+    )

playwright/e2e/ui/test_highlight_unsaved_confirmation.py

@@ -34,7 +34,7 @@ async def test_highlight_unsaved_confirmation_on_chapter_change(
 
     assert await home.highlight_infobox.is_visible()
 
-    await home.double_click_highlight_infobox()
+    await home.oneclick_highlight_infobox()
 
     assert await home.highlight_box_is_visible()
 
@@ -52,7 +52,7 @@ async def test_highlight_unsaved_confirmation_on_chapter_change(
 
     assert not await home.unsaved_highlight_dialog_is_visible()
 
-    await home.double_click_highlight_infobox()
+    await home.oneclick_highlight_infobox()
 
     await chrome_page.keyboard.press("Escape")
 
@@ -132,7 +132,7 @@ async def test_highlight_unsaved_confirmation_on_previous_next_page_change(
 
     assert not await home.unsaved_highlight_dialog_is_visible()
 
-    await chrome_page.keyboard.press("Enter")
+    await home.oneclick_highlight_infobox()
 
     await home.fill_highlight_box_note_field("autotest highlight-2")