Commit 8c46d4c6 by Will Daly

Merge pull request #2479 from edx/will/update-bok-choy-for-a11y-fixes

Bok-choy fixes (a11y, video player bug)
parents f4c6bd1b 274824bf
...@@ -14,7 +14,7 @@ class OpenResponsePage(PageObject): ...@@ -14,7 +14,7 @@ class OpenResponsePage(PageObject):
url = None url = None
def is_browser_on_page(self): def is_browser_on_page(self):
return self.is_css_present('section.xmodule_CombinedOpenEndedModule') return self.is_css_present('div.xmodule_CombinedOpenEndedModule')
@property @property
def assessment_type(self): def assessment_type(self):
......
...@@ -13,7 +13,7 @@ class ProgressPage(CoursePage): ...@@ -13,7 +13,7 @@ class ProgressPage(CoursePage):
URL_PATH = "progress" URL_PATH = "progress"
def is_browser_on_page(self): def is_browser_on_page(self):
has_course_info = self.is_css_present('section.course-info') has_course_info = self.is_css_present('div.course-info')
has_graph = self.is_css_present('div#grade-detail-graph') has_graph = self.is_css_present('div#grade-detail-graph')
return has_course_info and has_graph return has_course_info and has_graph
...@@ -45,7 +45,7 @@ class ProgressPage(CoursePage): ...@@ -45,7 +45,7 @@ class ProgressPage(CoursePage):
Return the CSS index of the chapter with `title`. Return the CSS index of the chapter with `title`.
Returns `None` if it cannot find such a chapter. Returns `None` if it cannot find such a chapter.
""" """
chapter_css = 'ol.chapters li h2' chapter_css = 'div.chapters section h2'
chapter_titles = self.css_map(chapter_css, lambda el: el.text.lower().strip()) chapter_titles = self.css_map(chapter_css, lambda el: el.text.lower().strip())
try: try:
...@@ -64,7 +64,7 @@ class ProgressPage(CoursePage): ...@@ -64,7 +64,7 @@ class ProgressPage(CoursePage):
# This is a hideous CSS selector that means: # This is a hideous CSS selector that means:
# Get the links containing the section titles in `chapter_index`. # Get the links containing the section titles in `chapter_index`.
# The link text is the section title. # The link text is the section title.
section_css = 'ol.chapters>li:nth-of-type({0}) ol.sections li h3 a'.format(chapter_index) section_css = 'div.chapters>section:nth-of-type({0}) div.sections div h3 a'.format(chapter_index)
section_titles = self.css_map(section_css, lambda el: el.text.lower().strip()) section_titles = self.css_map(section_css, lambda el: el.text.lower().strip())
# The section titles also contain "n of m possible points" on the second line # The section titles also contain "n of m possible points" on the second line
...@@ -91,7 +91,7 @@ class ProgressPage(CoursePage): ...@@ -91,7 +91,7 @@ class ProgressPage(CoursePage):
# This is CSS selector means: # This is CSS selector means:
# Get the scores for the chapter at `chapter_index` and the section at `section_index` # Get the scores for the chapter at `chapter_index` and the section at `section_index`
# Example text of the retrieved elements: "0/1" # Example text of the retrieved elements: "0/1"
score_css = "ol.chapters>li:nth-of-type({0}) ol.sections>li:nth-of-type({1}) section.scores>ol>li".format( score_css = "div.chapters>section:nth-of-type({0}) div.sections>div:nth-of-type({1}) div.scores>ol>li".format(
chapter_index, section_index chapter_index, section_index
) )
......
...@@ -17,7 +17,7 @@ class VideoPage(PageObject): ...@@ -17,7 +17,7 @@ class VideoPage(PageObject):
url = None url = None
def is_browser_on_page(self): def is_browser_on_page(self):
return self.is_css_present('section.xmodule_VideoModule') return self.is_css_present('div.xmodule_VideoModule')
@property @property
def elapsed_time(self): def elapsed_time(self):
......
...@@ -2,6 +2,8 @@ ...@@ -2,6 +2,8 @@
E2E tests for the LMS. E2E tests for the LMS.
""" """
from unittest import skip
from bok_choy.web_app_test import WebAppTest from bok_choy.web_app_test import WebAppTest
from bok_choy.promise import EmptyPromise, fulfill_before from bok_choy.promise import EmptyPromise, fulfill_before
...@@ -213,6 +215,7 @@ class VideoTest(UniqueCourseTest): ...@@ -213,6 +215,7 @@ class VideoTest(UniqueCourseTest):
# Auto-auth register for the course # Auto-auth register for the course
AutoAuthPage(self.browser, course_id=self.course_id).visit() AutoAuthPage(self.browser, course_id=self.course_id).visit()
@skip("BLD-563: Video Player Stuck on Pause")
def test_video_player(self): def test_video_player(self):
""" """
Play a video in the courseware. Play a video in the courseware.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment