{% with url=missing_dependency_url|safe %}
{% blocktrans with link_start="
" link_end="" %}
diff --git a/problem_builder/tests/integration/test_dashboard.py b/problem_builder/tests/integration/test_dashboard.py
index b4912a1c..a82a5759 100644
--- a/problem_builder/tests/integration/test_dashboard.py
+++ b/problem_builder/tests/integration/test_dashboard.py
@@ -17,8 +17,11 @@
# along with this program in a file in the toplevel directory called
# "AGPLv3". If not, see
.
#
+from textwrap import dedent
from mock import Mock, patch
from .base_test import ProblemBuilderBaseTest
+from selenium.common.exceptions import NoSuchElementException
+from xblockutils.resources import ResourceLoader
class MockSubmissionsAPI(object):
@@ -54,10 +57,25 @@ class TestDashboardBlock(ProblemBuilderBaseTest):
"""
Test the Student View of a dashboard XBlock linked to some problem builder blocks
"""
+ SIMPLE_DASHBOARD = """
"""
+ ALTERNATIVE_DASHBOARD = dedent("""
+
+ """)
+ HIDE_QUESTIONS_DASHBOARD = dedent("""
+
+ """)
+ MALFORMED_HIDE_QUESTIONS_DASHBOARD = dedent("""
+
+ """)
+
def setUp(self):
super(TestDashboardBlock, self).setUp()
- # Set up our scenario:
- self.load_scenario('dashboard.xml')
# Apply a whole bunch of patches that are needed in lieu of the LMS/CMS runtime and edx-submissions:
@@ -78,21 +96,43 @@ def get_mentoring_blocks(dashboard_block, mentoring_ids, ignore_errors=True):
),
("problem_builder.dashboard.DashboardBlock.get_mentoring_blocks", get_mentoring_blocks),
("problem_builder.dashboard.sub_api", mock_submisisons_api),
- ("problem_builder.mcq.sub_api", mock_submisisons_api)
+ ("problem_builder.mcq.sub_api", mock_submisisons_api),
+ (
+ "problem_builder.mentoring.MentoringBlock.url_name",
+ property(lambda block: block.display_name)
+ )
)
for p in patches:
patcher = patch(*p)
patcher.start()
self.addCleanup(patcher.stop)
- # All the patches are installed; now we can proceed with using the XBlocks for tests:
- self.go_to_view("student_view")
+
+ def _install_fixture(self, dashboard_xml):
+ self.load_scenario("dashboard.xml", {'dashboard': dashboard_xml}, load_immediately=True)
self.vertical = self.load_root_xblock()
+ def _get_cell_contents(self, cell):
+ try:
+ visible_text = cell.find_element_by_css_selector('span:not(.sr)').text
+ except NoSuchElementException:
+ visible_text = ""
+ screen_reader_text = cell.find_element_by_css_selector('span.sr')
+ return visible_text, screen_reader_text.text
+
+ def _assert_cell_contents(self, cell, expected_visible_text, expected_screen_reader_text):
+ visible_text, screen_reader_text = self._get_cell_contents(cell)
+ self.assertEqual(visible_text, expected_visible_text)
+ self.assertEqual(screen_reader_text, expected_screen_reader_text)
+
+ def _format_sr_text(self, visible_text):
+ return "Score: {value}".format(value=visible_text)
+
def test_empty_dashboard(self):
"""
Test that when the student has not submitted any question answers, we still see
the dashboard, and its lists all the MCQ questions in the way we expect.
"""
+ self._install_fixture(self.SIMPLE_DASHBOARD)
dashboard = self.browser.find_element_by_css_selector('.pb-dashboard')
step_headers = dashboard.find_elements_by_css_selector('thead')
self.assertEqual(len(step_headers), 3)
@@ -104,13 +144,10 @@ def test_empty_dashboard(self):
mcq_rows = step.find_elements_by_css_selector('tr')
self.assertTrue(2 <= len(mcq_rows) <= 3)
for mcq in mcq_rows:
- value = mcq.find_element_by_css_selector('td:last-child')
- self.assertEqual(value.text, '')
+ cell = mcq.find_element_by_css_selector('td:last-child')
+ self._assert_cell_contents(cell, '', 'No value yet')
- def test_dashboard(self):
- """
- Submit an answer to each MCQ, then check that the dashboard reflects those answers.
- """
+ def _set_mentoring_values(self):
pbs = self.browser.find_elements_by_css_selector('.mentoring')
for pb in pbs:
mcqs = pb.find_elements_by_css_selector('fieldset.choices')
@@ -119,22 +156,136 @@ def test_dashboard(self):
choices[idx].click()
self.click_submit(pb)
+ def test_dashboard(self):
+ """
+ Submit an answer to each MCQ, then check that the dashboard reflects those answers.
+ """
+ self._install_fixture(self.SIMPLE_DASHBOARD)
+ self._set_mentoring_values()
+
# Reload the page:
self.go_to_view("student_view")
dashboard = self.browser.find_element_by_css_selector('.pb-dashboard')
steps = dashboard.find_elements_by_css_selector('tbody')
self.assertEqual(len(steps), 3)
+ expected_values = ('1', '2', '3', '4', 'B')
+
+ for step_num, step in enumerate(steps):
+ mcq_rows = step.find_elements_by_css_selector('tr:not(.avg-row)')
+ self.assertTrue(2 <= len(mcq_rows) <= 3)
+ for mcq in mcq_rows:
+ cell = mcq.find_element_by_css_selector('td.value')
+ visible_text, screen_reader_text = self._get_cell_contents(cell)
+ self.assertIn(visible_text, expected_values)
+ self.assertIn(screen_reader_text, map(self._format_sr_text, expected_values))
+ # Check the average:
+ avg_row = step.find_element_by_css_selector('tr.avg-row')
+ left_col = avg_row.find_element_by_css_selector('.desc')
+ self.assertEqual(left_col.text, "Average")
+ right_col = avg_row.find_element_by_css_selector('.value')
+ expected_average = {0: "2", 1: "3", 2: "1"}[step_num]
+ self._assert_cell_contents(right_col, expected_average, self._format_sr_text(expected_average))
+
+ def test_dashboard_alternative(self):
+ """
+ Submit an answer to each MCQ, then check that the dashboard reflects those answers with alternative
+ configuration:
+
+ * Average label is "Avg." instead of default "Average"
+ * Numerical values are not shown
+ """
+ self._install_fixture(self.ALTERNATIVE_DASHBOARD)
+ self._set_mentoring_values()
+
+ # Reload the page:
+ self.go_to_view("student_view")
+ dashboard = self.browser.find_element_by_css_selector('.pb-dashboard')
+ steps = dashboard.find_elements_by_css_selector('tbody')
+ self.assertEqual(len(steps), 3)
+
+ average_labels = ["Avg.", "Mean", "Second Quartile"]
+
+ expected_values = ('1', '2', '3', '4', 'B')
for step_num, step in enumerate(steps):
mcq_rows = step.find_elements_by_css_selector('tr:not(.avg-row)')
self.assertTrue(2 <= len(mcq_rows) <= 3)
for mcq in mcq_rows:
- value = mcq.find_element_by_css_selector('td.value')
- self.assertIn(value.text, ('1', '2', '3', '4', 'B'))
+ cell = mcq.find_element_by_css_selector('td.value')
+ visible_text, screen_reader_text = self._get_cell_contents(cell)
+ # this dashboard configured to not show numbers
+ self.assertEqual(visible_text, '')
+ # but screen reader content still added
+ self.assertIn(screen_reader_text, map(self._format_sr_text, expected_values))
+ # Check the average:
+ avg_row = step.find_element_by_css_selector('tr.avg-row')
+ left_col = avg_row.find_element_by_css_selector('.desc')
+ self.assertEqual(left_col.text, average_labels[step_num])
+ right_col = avg_row.find_element_by_css_selector('.value')
+ expected_average = {0: "2", 1: "3", 2: "1"}[step_num]
+ self._assert_cell_contents(right_col, '', self._format_sr_text(expected_average))
+
+ def test_dashboard_exclude_questions(self):
+ """
+ Submit an answer to each MCQ, then check that the dashboard ignores questions it is configured to ignore
+ """
+ self._install_fixture(self.HIDE_QUESTIONS_DASHBOARD)
+ self._set_mentoring_values()
+
+ # Reload the page:
+ self.go_to_view("student_view")
+ dashboard = self.browser.find_element_by_css_selector('.pb-dashboard')
+ steps = dashboard.find_elements_by_css_selector('tbody')
+ self.assertEqual(len(steps), 3)
+ expected_values = ('1', '2', '3', '4')
+
+ lengths = [1, 2, 1]
+
+ for step_num, step in enumerate(steps):
+ mcq_rows = step.find_elements_by_css_selector('tr:not(.avg-row)')
+ self.assertEqual(len(mcq_rows), lengths[step_num])
+ for mcq in mcq_rows:
+ cell = mcq.find_element_by_css_selector('td.value')
+ visible_text, screen_reader_text = self._get_cell_contents(cell)
+ self.assertIn(visible_text, expected_values)
+ self.assertIn(screen_reader_text, map(self._format_sr_text, expected_values))
+ # Check the average:
+ avg_row = step.find_element_by_css_selector('tr.avg-row')
+ left_col = avg_row.find_element_by_css_selector('.desc')
+ self.assertEqual(left_col.text, "Average")
+ right_col = avg_row.find_element_by_css_selector('.value')
+ expected_average = {0: "1", 1: "3", 2: "1"}[step_num]
+ self._assert_cell_contents(right_col, expected_average, self._format_sr_text(expected_average))
+
+ def test_dashboard_malformed_exclude_questions(self):
+ """
+ Submit an answer to each MCQ, then check that the dashboard ignores questions it is configured to ignore
+ """
+ self._install_fixture(self.MALFORMED_HIDE_QUESTIONS_DASHBOARD)
+ self._set_mentoring_values()
+
+ # Reload the page:
+ self.go_to_view("student_view")
+ dashboard = self.browser.find_element_by_css_selector('.pb-dashboard')
+ steps = dashboard.find_elements_by_css_selector('tbody')
+ self.assertEqual(len(steps), 3)
+
+ expected_values = ('1', '2', '3', '4')
+
+ lengths = [3, 2, 1]
+
+ for step_num, step in enumerate(steps):
+ mcq_rows = step.find_elements_by_css_selector('tr:not(.avg-row)')
+ self.assertEqual(len(mcq_rows), lengths[step_num])
+ for mcq in mcq_rows:
+ cell = mcq.find_element_by_css_selector('td.value')
+ visible_text, screen_reader_text = self._get_cell_contents(cell)
+ self.assertIn(visible_text, expected_values)
+ self.assertIn(screen_reader_text, map(self._format_sr_text, expected_values))
# Check the average:
avg_row = step.find_element_by_css_selector('tr.avg-row')
left_col = avg_row.find_element_by_css_selector('.desc')
self.assertEqual(left_col.text, "Average")
right_col = avg_row.find_element_by_css_selector('.value')
expected_average = {0: "2", 1: "3", 2: "1"}[step_num]
- self.assertEqual(right_col.text, expected_average)
+ self._assert_cell_contents(right_col, expected_average, self._format_sr_text(expected_average))
diff --git a/problem_builder/tests/integration/xml_templates/dashboard.xml b/problem_builder/tests/integration/xml_templates/dashboard.xml
index 01f3971a..e4672a7d 100644
--- a/problem_builder/tests/integration/xml_templates/dashboard.xml
+++ b/problem_builder/tests/integration/xml_templates/dashboard.xml
@@ -53,6 +53,5 @@
Option C
-
-
+ {{ dashboard|safe }}