From 79dd59755715ebacc754b07e064e022b75751e25 Mon Sep 17 00:00:00 2001 From: Afzal Wali Date: Tue, 2 Feb 2016 14:43:37 +0500 Subject: [PATCH 1/2] Bump edx-proctoring to 0.12.8 --- requirements/edx/github.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements/edx/github.txt b/requirements/edx/github.txt index 1b8388e284..8b7ca5dad4 100644 --- a/requirements/edx/github.txt +++ b/requirements/edx/github.txt @@ -93,7 +93,7 @@ git+https://github.com/edx/xblock-utils.git@v1.0.2#egg=xblock-utils==1.0.2 -e git+https://github.com/edx-solutions/xblock-google-drive.git@138e6fa0bf3a2013e904a085b9fed77dab7f3f21#egg=xblock-google-drive -e git+https://github.com/edx/edx-reverification-block.git@0.0.5#egg=edx-reverification-block==0.0.5 git+https://github.com/edx/edx-user-state-client.git@1.0.1#egg=edx-user-state-client==1.0.1 -git+https://github.com/edx/edx-proctoring.git@0.12.7#egg=edx-proctoring==0.12.7 +git+https://github.com/edx/edx-proctoring.git@0.12.8#egg=edx-proctoring==0.12.8 git+https://github.com/edx/xblock-lti-consumer.git@v1.0.3#egg=xblock-lti-consumer==1.0.3 # Third Party XBlocks From d275dd4a700f91c8ded1b08b005103de90460412 Mon Sep 17 00:00:00 2001 From: Hasnain Date: Wed, 3 Feb 2016 16:24:42 +0500 Subject: [PATCH 2/2] Added bok choy test for proctoring instructor dashboard --- .../pages/lms/instructor_dashboard.py | 47 +++++++++++++++++++ .../lms/test_lms_instructor_dashboard.py | 12 +++++ 2 files changed, 59 insertions(+) diff --git a/common/test/acceptance/pages/lms/instructor_dashboard.py b/common/test/acceptance/pages/lms/instructor_dashboard.py index 43e8eb9860..9b462b4904 100644 --- a/common/test/acceptance/pages/lms/instructor_dashboard.py +++ b/common/test/acceptance/pages/lms/instructor_dashboard.py @@ -767,6 +767,53 @@ class SpecialExamsPageAllowanceSection(PageObject): """ return self.q(css="a#add-allowance").present + @property + def is_allowance_record_visible(self): + """ + Returns True if the Add Allowance button is present. + """ + return self.q(css="table.allowance-table tr.allowance-items").present + + @property + def is_add_allowance_popup_visible(self): + """ + Returns True if the Add Allowance popup and it's all assets are present. + """ + return self.q(css="div.modal div.modal-header").present and self._are_all_assets_present() + + def _are_all_assets_present(self): + """ + Returns True if all the assets present in add allowance popup/form + """ + return ( + self.q(css="select#proctored_exam").present and + self.q(css="label#exam_type_label").present and + self.q(css="input#allowance_value").present and + self.q(css="input#user_info").present and + self.q(css="input#addNewAllowance").present + ) and ( + # This will be present if exam is proctored + self.q(css="select#allowance_type").present or + # This will be present if exam is timed + self.q(css="label#timed_exam_allowance_type").present + ) + + def click_add_allowance_button(self): + """ + Click the add allowance button + """ + self.q(css="a#add-allowance").click() + self.wait_for_element_presence("div.modal div.modal-header", "Popup should be visible") + + def submit_allowance_form(self, allowed_minutes, username): + """ + Fill and submit the allowance + """ + self.q(css='input#allowance_value').fill(allowed_minutes) + self.q(css='input#user_info').fill(username) + self.q(css="input#addNewAllowance").click() + self.wait_for_element_absence("div.modal div.modal-header", "Popup should be hidden") + class SpecialExamsPageAttemptsSection(PageObject): """ diff --git a/common/test/acceptance/tests/lms/test_lms_instructor_dashboard.py b/common/test/acceptance/tests/lms/test_lms_instructor_dashboard.py index 0fa7838b50..50c4faabd6 100644 --- a/common/test/acceptance/tests/lms/test_lms_instructor_dashboard.py +++ b/common/test/acceptance/tests/lms/test_lms_instructor_dashboard.py @@ -271,6 +271,18 @@ class ProctoredExamsTest(BaseInstructorDashboardTest): # Then I can add Allowance to that exam for a student self.assertTrue(allowance_section.is_add_allowance_button_visible) + # When I click the Add Allowance button + allowance_section.click_add_allowance_button() + + # Then popup should be visible + self.assertTrue(allowance_section.is_add_allowance_popup_visible) + + # When I fill and submit the allowance form + allowance_section.submit_allowance_form('10', self.USERNAME) + + # Then, the added record should be visible + self.assertTrue(allowance_section.is_allowance_record_visible) + def test_can_reset_attempts(self): """ Make sure that Exam attempts are visible and can be reset.