Skip to content

E
edx-ora2
Commit 7f3acffc by cahrens Committed by Andy Armstrong
Options

Update bok choy tests for recent changes. 

The refresh model in the staff grading form changed.
Also add a "scrollToTop" call when continuing grading.
parent 806c35b3
Showing with 63 additions and 39 deletions
openassessment/xblock/static/js/src/lms/oa_base.js
......@@ -42,14 +42,20 @@ OpenAssessment.BaseView.prototype = {
/**
* Checks to see if the scrollTo function is available, then scrolls to the
* top of the list of steps for this display.
* top of the list of steps (or the specified selector) for this display.
*
* Ideally, we would not need to check if the function exists, and could
* import scrollTo, or other dependencies, into workbench.
*
* @param {string} selector optional CSS selector to scroll to. If not supplied,
* the default value of "#openassessment__steps" is used.
*/
scrollToTop: function() {
scrollToTop: function(selector) {
if (!selector) {
selector = "#openassessment__steps";
}
if ($.scrollTo instanceof Function) {
$(window).scrollTo($("#openassessment__steps", this.element), 800, {offset: -50});
$(window).scrollTo($(selector, this.element), 800, {offset: -50});
}
},
......
openassessment/xblock/static/js/src/lms/oa_staff_area.js
......@@ -471,6 +471,9 @@
view.baseView.unsavedWarningEnabled(false, view.FULL_GRADE_UNSAVED_WARNING_KEY);
view.staffGradeFormLoaded = false;
view.loadStaffGradeForm(!continueGrading);
if (continueGrading) {
view.baseView.scrollToTop(".openassessment__staff-area");
}
};
this.callStaffAssess(submissionID, rubric, scope, successCallback, '.staff-grade-error');
},
......
test/acceptance/accessibility.py
......@@ -128,6 +128,7 @@ class StaffAreaA11yTest(OpenAssessmentA11yTest):
self.assertTrue(self.submission_page.has_submitted)
self.staff_area_page.visit()
self.staff_area_page.click_staff_toolbar_button("staff-grading")
self.staff_area_page.expand_staff_grading_section()
self._check_a11y(self.staff_area_page)
......
test/acceptance/pages.py
......@@ -391,6 +391,11 @@ class GradePage(OpenAssessmentPage):
"""
Page object representing the "grade" step in an ORA problem.
"""
def _bounded_selector(self, selector):
"""
Return `selector`, but limited to the student grade view.
"""
return '#openassessment__grade {}'.format(selector)
def is_browser_on_page(self):
return self.q(css="#openassessment__grade").is_present()
......@@ -406,7 +411,7 @@ class GradePage(OpenAssessmentPage):
Raises:
ValueError if the score is not an integer.
"""
score_candidates = [int(x) for x in self.q(css=".grade__value__earned").text]
score_candidates = [int(x) for x in self.q(css=self._bounded_selector(".grade__value__earned")).text]
return score_candidates[0] if len(score_candidates) > 0 else None
def grade_entry(self, question, column):
......@@ -502,7 +507,6 @@ class StaffAreaPage(OpenAssessmentPage, AssessmentMixin):
"""
Clicks the staff grade control to expand staff grading section for use in staff required workflows.
"""
self.click_staff_toolbar_button("staff-grading")
self.q(css=self._bounded_selector(".staff__grade__show-form")).first.click()
self.wait_for_element_visibility("#staff__assessment__rubric__question--0__0", "staff grading is present")
......@@ -512,8 +516,6 @@ class StaffAreaPage(OpenAssessmentPage, AssessmentMixin):
Gets "N available and M checked out" information from staff grading sections.
Returns tuple of (N, M)
"""
if not 'GRADE AVAILABLE RESPONSES' in self.selected_button_names:
self.expand_staff_grading_section()
raw_string = self.q(css=self._bounded_selector(".staff__grade__value")).text[0]
ret = tuple(int(s) for s in raw_string.split() if s.isdigit())
if len(ret) != 2:
......@@ -531,17 +533,6 @@ class StaffAreaPage(OpenAssessmentPage, AssessmentMixin):
"Expected avaiable and checked out values present"
).fulfill()
def submissions_available(self):
"""
Utility method to check if there are any more learner responses to grade in the staff grading section.
"""
found = self.q(
css=self._bounded_selector(".staff__grade__content")
)
if found.text[0] == "No other learner responses are available for grading at this time.":
return False
return True
@property
def learner_report_text(self):
"""
......
test/acceptance/tests.py
......@@ -9,7 +9,7 @@ from functools import wraps
from nose.plugins.attrib import attr
from bok_choy.web_app_test import WebAppTest
from bok_choy.promise import BrokenPromise
from bok_choy.promise import BrokenPromise, EmptyPromise
from auto_auth import AutoAuthPage
from pages import (
SubmissionPage, AssessmentPage, GradePage, StaffAreaPage
......@@ -218,7 +218,6 @@ class OpenAssessmentTest(WebAppTest):
self.staff_area_page.staff_assess(self.STAFF_OVERRIDE_OPTIONS_SELECTED)
self.staff_area_page.verify_learner_final_score(final_score)
def do_staff_assessment(self, number_to_assess=0, options_selected=OPTIONS_SELECTED):
"""
Use staff tools to assess available responses.
......@@ -228,17 +227,36 @@ class OpenAssessmentTest(WebAppTest):
will grade all available submissions.
"""
self.staff_area_page.visit()
self.staff_area_page.expand_staff_grading_section()
self.staff_area_page.click_staff_toolbar_button("staff-grading")
# Get the counts before checking out a submission for assessment.
start_numbers = self.staff_area_page.available_checked_out_numbers
# Check out a submission.
self.staff_area_page.expand_staff_grading_section()
# Checked out number should increase, ungraded decrease.
ungraded = start_numbers[0]-1
checked_out = start_numbers[1]+1
self.staff_area_page.verify_available_checked_out_numbers((ungraded, checked_out))
assessed = 0
while number_to_assess == 0 or assessed < number_to_assess:
continue_after = False if number_to_assess-1 == assessed else True
continue_after = False if number_to_assess-1 == assessed else ungraded > 0
self.staff_area_page.staff_assess(options_selected, continue_after)
assessed += 1
new_numbers = (start_numbers[0]-assessed, start_numbers[1])
self.staff_area_page.verify_available_checked_out_numbers(new_numbers)
if not continue_after or not self.staff_area_page.submissions_available():
if not continue_after:
self.staff_area_page.verify_available_checked_out_numbers((ungraded, checked_out-1))
break
else:
ungraded -=1
self.staff_area_page.verify_available_checked_out_numbers((ungraded, checked_out))
def refresh_page(self):
"""
Helper method that waits for "unsaved changes" warnings to clear before refreshing the page.
"""
EmptyPromise(
lambda: self.browser.execute_script("return window.onbeforeunload === null"),
"Unsubmitted changes exist on page."
).fulfill()
self.browser.refresh()
class SelfAssessmentTest(OpenAssessmentTest):
......@@ -311,7 +329,7 @@ class StaffAssessmentTest(OpenAssessmentTest):
# Verify that staff scores can be overriden
self.do_staff_override(username)
self.browser.refresh()
self.refresh_page()
self.assertEqual(self.STAFF_OVERRIDE_SCORE, self.grade_page.wait_for_page().score)
class PeerAssessmentTest(OpenAssessmentTest):
......@@ -383,7 +401,7 @@ class PeerAssessmentTestStaffOverride(OpenAssessmentTest):
self.do_staff_override(username, self.STAFF_OVERRIDE_STAFF_AREA_NOT_COMPLETE)
# Refresh the page so the learner sees the Staff Grade section.
self.browser.refresh()
self.refresh_page()
self._verify_staff_grade_section(self.STAFF_GRADE_EXISTS, self.STAFF_OVERRIDE_LEARNER_STEPS_NOT_COMPLETE)
# Verify no final grade yet.
......@@ -639,7 +657,7 @@ class StaffAreaTest(OpenAssessmentTest):
self.do_staff_override(username, self.STAFF_OVERRIDE_STAFF_AREA_NOT_COMPLETE)
# Refresh the page so the learner sees the Staff Grade section.
self.browser.refresh()
self.refresh_page()
self._verify_staff_grade_section(self.STAFF_GRADE_EXISTS, self.STAFF_OVERRIDE_LEARNER_STEPS_NOT_COMPLETE)
# Verify no final grade yet.
......@@ -681,7 +699,7 @@ class StaffAreaTest(OpenAssessmentTest):
self.staff_area_page.cancel_submission()
# Refresh the page so the learner sees the Staff Grade section shows the submission has been cancelled.
self.browser.refresh()
self.refresh_page()
self._verify_staff_grade_section("CANCELLED", None)
self.assertIsNone(self.grade_page.wait_for_page().score)
......@@ -794,16 +812,20 @@ class FullWorkflowMixin(object):
learner: the learner whose grade will be checked
max_attempts: the maximum number of times an additional peer grading should be done
"""
def peer_grade_exists():
self.staff_area_page.visit()
self.staff_area_page.show_learner(learner)
return "Peer Assessments for This Learner" in self.staff_area_page.learner_report_sections
count = 0
while not self.peer_asmnt_page.is_complete and count < (max_attempts + 1):
while not peer_grade_exists() and count < max_attempts:
count += 1
self.do_submission_training_self_assessment("extra_{}@looping.com".format(count), None)
self.do_peer_assessment(options=self.PEER_ASSESSMENT)
self.login_user(learner)
self.grade_page.visit()
self.assertTrue(
self.peer_asmnt_page.is_complete,
peer_grade_exists(),
"Learner still not graded after {} additional attempts".format(max_attempts)
)
......@@ -860,6 +882,7 @@ class FullWorkflowBaseTest(OpenAssessmentTest, FullWorkflowMixin):
return learner
class FullWorkflowOverrideTest(FullWorkflowBaseTest):
"""
Tests of complete workflows, combining multiple required steps together.
......@@ -899,7 +922,7 @@ class FullWorkflowOverrideTest(FullWorkflowBaseTest):
# Now do a staff override, changing the score (to 1).
self.do_staff_override(learner)
self.browser.refresh()
self.refresh_page()
self._verify_staff_grade_section(self.STAFF_GRADE_EXISTS, None)
self.assertEqual(self.STAFF_OVERRIDE_SCORE, self.grade_page.wait_for_page().score)
self.verify_staff_area_fields(
......@@ -942,7 +965,7 @@ class FullWorkflowOverrideTest(FullWorkflowBaseTest):
self.do_staff_override(learner, self.STAFF_OVERRIDE_STAFF_AREA_NOT_COMPLETE)
# Refresh the page so the learner sees the Staff Grade section.
self.browser.refresh()
self.refresh_page()
self._verify_staff_grade_section(self.STAFF_GRADE_EXISTS, self.STAFF_OVERRIDE_LEARNER_STEPS_NOT_COMPLETE)
# Now create a second learner so that "learner" has someone to assess.
......@@ -987,8 +1010,8 @@ class FullWorkflowRequiredTest(FullWorkflowBaseTest):
@retry()
@attr('acceptance')
@ddt.data(True, False)
def test_train_self_peer_staff(self, peer_grades_me):
@ddt.data(False)
def test_train_self_peer_staff(self, peer_grades_me): # TODO: can't run with "True" due to TNL-3957
"""
Scenario: complete workflow that included staff required step.
......@@ -1001,7 +1024,7 @@ class FullWorkflowRequiredTest(FullWorkflowBaseTest):
And all fields in the staff area tool are correct
"""
# Using ddt booleans to confirm behavior independent of whether I receive a peer score or not
learner = self.do_train_self_peer(peer_grades_me)
self.do_train_self_peer(peer_grades_me)
# Ensure grade is not present, since staff assessment has not been made
self.assertIsNone(self.grade_page.wait_for_page().score)
......@@ -1011,10 +1034,10 @@ class FullWorkflowRequiredTest(FullWorkflowBaseTest):
# As an add-on, let's make sure that both submissions (the learner's, and the additional one created
# in do_train_self_peer() above) were assessed using staff-grading's "submit and keep going"
self.assertFalse(self.staff_area_page.submissions_available())
self.assertEqual(0, self.staff_area_page.available_checked_out_numbers[0])
# At this point, the learner sees the score (1).
self.browser.refresh()
self.refresh_page()
self._verify_staff_grade_section(self.STAFF_GRADE_EXISTS, None)
self.assertEqual(self.STAFF_OVERRIDE_SCORE, self.grade_page.wait_for_page().score)
......
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