From f908e8beef49af365a22ce73b827901185abcc92 Mon Sep 17 00:00:00 2001 From: Andrew Nicols Date: Thu, 8 Oct 2020 08:01:25 +0800 Subject: [PATCH] MDL-69192 mod_assign: Stop clicking OK on non-existent modal --- .../condition/grade/tests/behat/availability_grade.feature | 1 - completion/tests/behat/restrict_activity_by_grade.feature | 1 - .../tests/behat/restrict_section_availability.feature | 1 - grade/grading/form/guide/tests/behat/edit_guide.feature | 1 - grade/grading/tests/behat/behat_grading.php | 1 - .../singleview/tests/behat/bulk_insert_grades.feature | 2 -- grade/tests/behat/grade_scales.feature | 5 ----- grade/tests/behat/grade_single_item_scales.feature | 1 - lib/form/tests/behat/modgrade_validation.feature | 2 -- .../feedback/editpdf/tests/behat/annotate_pdf.feature | 1 - .../feedback/editpdf/tests/behat/group_annotations.feature | 2 -- .../editpdf/tests/behat/view_previous_annotations.feature | 1 - mod/assign/feedback/file/tests/behat/feedback_file.feature | 2 -- mod/assign/tests/behat/allow_another_attempt.feature | 2 -- mod/assign/tests/behat/assign_hidden.feature | 1 - mod/assign/tests/behat/comment_inline.feature | 1 - mod/assign/tests/behat/display_grade.feature | 2 -- mod/assign/tests/behat/edit_previous_feedback.feature | 2 -- mod/assign/tests/behat/filter_by_marker.feature | 1 - mod/assign/tests/behat/grading_app_filters.feature | 2 -- mod/assign/tests/behat/grading_status.feature | 7 ------- mod/assign/tests/behat/group_submission.feature | 2 -- mod/assign/tests/behat/hide_grader.feature | 4 ---- mod/assign/tests/behat/outcome_grading.feature | 3 --- mod/assign/tests/behat/prevent_submission_changes.feature | 1 - mod/assign/tests/behat/quickgrading.feature | 2 -- mod/assign/tests/behat/relative_dates.feature | 2 -- mod/assign/tests/behat/rescale_grades.feature | 1 - mod/assign/tests/behat/steps_blind_marking.feature | 5 ----- mod/assign/tests/behat/submission_comments.feature | 2 -- 30 files changed, 61 deletions(-) diff --git a/availability/condition/grade/tests/behat/availability_grade.feature b/availability/condition/grade/tests/behat/availability_grade.feature index 622047c4351..5ec09bd66fe 100644 --- a/availability/condition/grade/tests/behat/availability_grade.feature +++ b/availability/condition/grade/tests/behat/availability_grade.feature @@ -116,7 +116,6 @@ Feature: availability_grade And I click on "Grade" "link" in the "s@example.com" "table_row" And I set the field "Grade out of 100" to "40" And I click on "Save changes" "button" - And I press "OK" And I click on "Edit settings" "link" # Log back in as student. diff --git a/completion/tests/behat/restrict_activity_by_grade.feature b/completion/tests/behat/restrict_activity_by_grade.feature index 2cd824c1328..f7cd860340b 100644 --- a/completion/tests/behat/restrict_activity_by_grade.feature +++ b/completion/tests/behat/restrict_activity_by_grade.feature @@ -58,7 +58,6 @@ Feature: Restrict activity availability through grade conditions And I set the following fields to these values: | Grade | 21 | And I press "Save changes" - And I press "OK" And I follow "Edit settings" And I log out And I log in as "student1" diff --git a/completion/tests/behat/restrict_section_availability.feature b/completion/tests/behat/restrict_section_availability.feature index 6785e903f1d..f65c9fa29e4 100644 --- a/completion/tests/behat/restrict_section_availability.feature +++ b/completion/tests/behat/restrict_section_availability.feature @@ -91,7 +91,6 @@ Feature: Restrict sections availability through completion or grade conditions And I set the following fields to these values: | Grade | 21 | And I press "Save changes" - And I press "OK" And I follow "Edit settings" And I log out And I log in as "student1" diff --git a/grade/grading/form/guide/tests/behat/edit_guide.feature b/grade/grading/form/guide/tests/behat/edit_guide.feature index bd4cb7715f6..403eacf6d16 100644 --- a/grade/grading/form/guide/tests/behat/edit_guide.feature +++ b/grade/grading/form/guide/tests/behat/edit_guide.feature @@ -83,7 +83,6 @@ Feature: Marking guides can be created and edited And I wait "1" seconds Then the field "Guide criterion B criterion remark" matches value "Comment \"4\"" When I press "Save changes" - And I press "OK" And I follow "Edit settings" And I follow "Test assignment 1 name" And I navigate to "View all submissions" in current page administration diff --git a/grade/grading/tests/behat/behat_grading.php b/grade/grading/tests/behat/behat_grading.php index 3b3c784ac2f..d43220ec46e 100644 --- a/grade/grading/tests/behat/behat_grading.php +++ b/grade/grading/tests/behat/behat_grading.php @@ -156,7 +156,6 @@ class behat_grading extends behat_base { public function i_save_the_advanced_grading_form() { $this->execute('behat_forms::press_button', get_string('savechanges')); - $this->execute('behat_forms::press_button', 'OK'); $this->execute('behat_general::i_click_on', array($this->escape(get_string('editsettings')), 'link')); $this->execute('behat_forms::press_button', get_string('cancel')); $this->execute('behat_navigation::i_navigate_to_in_current_page_administration', diff --git a/grade/report/singleview/tests/behat/bulk_insert_grades.feature b/grade/report/singleview/tests/behat/bulk_insert_grades.feature index faa5ba255ba..6fd73ff077d 100644 --- a/grade/report/singleview/tests/behat/bulk_insert_grades.feature +++ b/grade/report/singleview/tests/behat/bulk_insert_grades.feature @@ -38,7 +38,6 @@ Feature: We can bulk insert grades for students in a course And I set the following fields to these values: | Grade out of 100 | 50 | And I press "Save changes" - And I press "OK" And I am on "Course 1" course homepage And I navigate to "View > Grader report" in the course gradebook And I follow "Single view for Test assignment one" @@ -79,7 +78,6 @@ Feature: We can bulk insert grades for students in a course And I set the following fields to these values: | Grade out of 100 | 50 | And I press "Save changes" - And I press "OK" And I am on "Course 1" course homepage And I navigate to "View > Grader report" in the course gradebook # And I click on "input[title='Dock Navigation block']" "css_element" diff --git a/grade/tests/behat/grade_scales.feature b/grade/tests/behat/grade_scales.feature index ec2377bac1c..5124594a34a 100644 --- a/grade/tests/behat/grade_scales.feature +++ b/grade/tests/behat/grade_scales.feature @@ -55,23 +55,18 @@ Feature: View gradebook when scales are used And I click on "Grade" "link" in the "Student 1" "table_row" And I set the field "Grade" to "A" And I press "Save changes" - And I press "OK" And I click on "[data-action=next-user]" "css_element" And I set the field "Grade" to "B" And I press "Save changes" - And I press "OK" And I click on "[data-action=next-user]" "css_element" And I set the field "Grade" to "C" And I press "Save changes" - And I press "OK" And I click on "[data-action=next-user]" "css_element" And I set the field "Grade" to "D" And I press "Save changes" - And I press "OK" And I click on "[data-action=next-user]" "css_element" And I set the field "Grade" to "F" And I press "Save changes" - And I press "OK" And I am on "Course 1" course homepage And I navigate to "Setup > Course grade settings" in the course gradebook And I set the field "Show weightings" to "Show" diff --git a/grade/tests/behat/grade_single_item_scales.feature b/grade/tests/behat/grade_single_item_scales.feature index 7ebd7a7052c..dc78a79ee66 100644 --- a/grade/tests/behat/grade_single_item_scales.feature +++ b/grade/tests/behat/grade_single_item_scales.feature @@ -51,7 +51,6 @@ Feature: View gradebook when single item scales are used And I click on "Grade" "link" in the "Student 1" "table_row" And I set the field "Grade" to "A" And I press "Save changes" - And I press "OK" And I am on "Course 1" course homepage And I navigate to "Setup > Course grade settings" in the course gradebook And I set the field "Show weightings" to "Show" diff --git a/lib/form/tests/behat/modgrade_validation.feature b/lib/form/tests/behat/modgrade_validation.feature index 65eacd445d6..d154d6768ff 100644 --- a/lib/form/tests/behat/modgrade_validation.feature +++ b/lib/form/tests/behat/modgrade_validation.feature @@ -144,7 +144,6 @@ Feature: Using the activity grade form element And I click on "Grade" "link" in the "Student 1" "table_row" And I set the field "Grade" to "C" And I press "Save changes" - And I press "OK" And I follow "Edit settings" When I expand all fieldsets Then I should see "Some grades have already been awarded, so the grade type and scale cannot be changed" @@ -203,7 +202,6 @@ Feature: Using the activity grade form element And I click on "Grade" "link" in the "Student 1" "table_row" And I set the field "Grade out of 100" to "50" And I press "Save changes" - And I press "OK" And I follow "Edit settings" When I expand all fieldsets Then I should see "Some grades have already been awarded, so the grade type cannot be changed. If you wish to change the maximum grade, you must first choose whether or not to rescale existing grades." diff --git a/mod/assign/feedback/editpdf/tests/behat/annotate_pdf.feature b/mod/assign/feedback/editpdf/tests/behat/annotate_pdf.feature index 41cefd72674..acc7bbb46de 100644 --- a/mod/assign/feedback/editpdf/tests/behat/annotate_pdf.feature +++ b/mod/assign/feedback/editpdf/tests/behat/annotate_pdf.feature @@ -133,7 +133,6 @@ Feature: In an assignment, teacher can annotate PDF files during grading And I draw on the pdf And I press "Save changes" And I should see "The changes to the grade and feedback were saved" - And I press "OK" And I click on "Edit settings" "link" And I follow "Test assignment name" And I navigate to "View all submissions" in current page administration diff --git a/mod/assign/feedback/editpdf/tests/behat/group_annotations.feature b/mod/assign/feedback/editpdf/tests/behat/group_annotations.feature index 17c152449d8..bab7c30f703 100644 --- a/mod/assign/feedback/editpdf/tests/behat/group_annotations.feature +++ b/mod/assign/feedback/editpdf/tests/behat/group_annotations.feature @@ -62,7 +62,6 @@ Feature: In a group assignment, teacher can annotate PDF files for all users Given I set the field "applytoall" to "0" And I press "Save changes" And I should see "The changes to the grade and feedback were saved" - And I press "OK" And I click on "Edit settings" "link" And I log out And I log in as "student1" @@ -81,7 +80,6 @@ Feature: In a group assignment, teacher can annotate PDF files for all users @javascript Scenario: Submit a PDF file as a student and annotate the PDF as a teacher and all students in the group get a copy of the annotated PDF. Given I press "Save changes" - And I click on "OK" "button" And I am on "Course 1" course homepage And I log out And I log in as "student1" diff --git a/mod/assign/feedback/editpdf/tests/behat/view_previous_annotations.feature b/mod/assign/feedback/editpdf/tests/behat/view_previous_annotations.feature index d66eae9087f..f86f9baec2f 100644 --- a/mod/assign/feedback/editpdf/tests/behat/view_previous_annotations.feature +++ b/mod/assign/feedback/editpdf/tests/behat/view_previous_annotations.feature @@ -54,7 +54,6 @@ Feature: In an assignment, teacher can view the feedback for a previous attempt. And I press "Save changes" And I wait until the page is ready And I should see "The changes to the grade and feedback were saved" - And I press "OK" And I follow "View a different attempt" And I click on "Attempt 1" "radio" in the "View a different attempt" "dialogue" And I press "View" diff --git a/mod/assign/feedback/file/tests/behat/feedback_file.feature b/mod/assign/feedback/file/tests/behat/feedback_file.feature index a0f260e0c4f..bae6a8b7255 100644 --- a/mod/assign/feedback/file/tests/behat/feedback_file.feature +++ b/mod/assign/feedback/file/tests/behat/feedback_file.feature @@ -58,7 +58,6 @@ Feature: In an assignment, teacher can submit feedback files during grading Scenario: A teacher can provide a feedback file when grading an assignment. Given I set the field "applytoall" to "0" And I press "Save changes" - And I click on "OK" "button" And I click on "Course 1" "link" in the "[data-region=assignment-info]" "css_element" And I log out And I log in as "student1" @@ -74,7 +73,6 @@ Feature: In an assignment, teacher can submit feedback files during grading @javascript Scenario: A teacher can provide a feedback file when grading an assignment and all students in the group will receive the file. Given I press "Save changes" - And I click on "OK" "button" And I click on "Course 1" "link" in the "[data-region=assignment-info]" "css_element" And I log out And I log in as "student1" diff --git a/mod/assign/tests/behat/allow_another_attempt.feature b/mod/assign/tests/behat/allow_another_attempt.feature index 49935d783a4..34b5d3ea5bd 100644 --- a/mod/assign/tests/behat/allow_another_attempt.feature +++ b/mod/assign/tests/behat/allow_another_attempt.feature @@ -43,7 +43,6 @@ Feature: In an assignment, students start a new attempt based on their previous And I set the following fields to these values: | Allow another attempt | 1 | And I press "Save changes" - And I press "OK" And I click on "Edit settings" "link" And I log out Then I log in as "student1" @@ -150,7 +149,6 @@ Feature: In an assignment, students start a new attempt based on their previous And I set the following fields to these values: | Allow another attempt | 1 | And I press "Save changes" - And I press "OK" And I follow "Assignment: Test assignment name" And I log out And I log in as "student4" diff --git a/mod/assign/tests/behat/assign_hidden.feature b/mod/assign/tests/behat/assign_hidden.feature index 378867e9563..b3750872848 100644 --- a/mod/assign/tests/behat/assign_hidden.feature +++ b/mod/assign/tests/behat/assign_hidden.feature @@ -35,4 +35,3 @@ Feature: When a Teacher hides an assignment from view for students it should con And I am on "Course 1" course homepage And I should not see "Test hidden assignment" And I should see "Test visible assignment" - And I log out diff --git a/mod/assign/tests/behat/comment_inline.feature b/mod/assign/tests/behat/comment_inline.feature index 040db93a07e..3eb08a30e6c 100644 --- a/mod/assign/tests/behat/comment_inline.feature +++ b/mod/assign/tests/behat/comment_inline.feature @@ -46,7 +46,6 @@ Feature: In an assignment, teachers can edit a students submission inline | Feedback comments | I'm the teacher feedback | And I upload "lib/tests/fixtures/empty.txt" file to "Feedback files" filemanager And I press "Save changes" - And I press "OK" And I click on "Edit settings" "link" And I follow "Test assignment name" And I navigate to "View all submissions" in current page administration diff --git a/mod/assign/tests/behat/display_grade.feature b/mod/assign/tests/behat/display_grade.feature index 7c4108e3bdd..fca77d9da62 100644 --- a/mod/assign/tests/behat/display_grade.feature +++ b/mod/assign/tests/behat/display_grade.feature @@ -32,7 +32,6 @@ Feature: Check that the assignment grade can be updated correctly And I set the field "Grade out of 100" to "50" And I set the field "Notify students" to "0" And I press "Save changes" - And I press "OK" And I click on "Edit settings" "link" And I follow "Test assignment name" And I navigate to "View all submissions" in current page administration @@ -68,7 +67,6 @@ Feature: Check that the assignment grade can be updated correctly And I set the field "Grade out of 100" to "50" And I set the field "Notify students" to "0" And I press "Save changes" - And I press "OK" And I click on "Edit settings" "link" And I follow "Test assignment name" And I navigate to "View all submissions" in current page administration diff --git a/mod/assign/tests/behat/edit_previous_feedback.feature b/mod/assign/tests/behat/edit_previous_feedback.feature index 66e95c0946f..5ee1dd45cac 100644 --- a/mod/assign/tests/behat/edit_previous_feedback.feature +++ b/mod/assign/tests/behat/edit_previous_feedback.feature @@ -46,7 +46,6 @@ Feature: In an assignment, teachers can edit feedback for a students previous su | Feedback comments | I'm the teacher first feedback | | Allow another attempt | Yes | And I press "Save changes" - And I click on "OK" "button" And I click on "Edit settings" "link" And I log out And I log in as "student2" @@ -66,7 +65,6 @@ Feature: In an assignment, teachers can edit feedback for a students previous su | Grade | 50 | | Feedback comments | I'm the teacher second feedback | And I press "Save changes" - And I click on "OK" "button" And I click on "Edit settings" "link" And I log out Then I log in as "student2" diff --git a/mod/assign/tests/behat/filter_by_marker.feature b/mod/assign/tests/behat/filter_by_marker.feature index 56683ce6144..41e381f38bb 100644 --- a/mod/assign/tests/behat/filter_by_marker.feature +++ b/mod/assign/tests/behat/filter_by_marker.feature @@ -36,7 +36,6 @@ Feature: In an assignment, teachers can filter displayed submissions by assigned And I set the field "allocatedmarker" to "Marker 1" And I set the field "Notify students" to "0" And I press "Save changes" - And I press "OK" And I click on "Edit settings" "link" And I log out When I log in as "teacher1" diff --git a/mod/assign/tests/behat/grading_app_filters.feature b/mod/assign/tests/behat/grading_app_filters.feature index 92fd41f8874..293d0e96dda 100644 --- a/mod/assign/tests/behat/grading_app_filters.feature +++ b/mod/assign/tests/behat/grading_app_filters.feature @@ -39,7 +39,6 @@ Feature: In an assignment, teachers can change filters in the grading app And I set the field "workflowstate" to "In marking" And I set the field "Notify students" to "0" And I press "Save changes" - And I press "OK" And I click on "Edit settings" "link" And I log out When I log in as "teacher1" @@ -89,7 +88,6 @@ Feature: In an assignment, teachers can change filters in the grading app And I set the field "workflowstate" to "In marking" And I set the field "Notify students" to "0" And I press "Save changes" - And I press "OK" And I click on "Edit settings" "link" And I log out When I log in as "teacher1" diff --git a/mod/assign/tests/behat/grading_status.feature b/mod/assign/tests/behat/grading_status.feature index 38852e1d655..4e828940f9f 100644 --- a/mod/assign/tests/behat/grading_status.feature +++ b/mod/assign/tests/behat/grading_status.feature @@ -57,7 +57,6 @@ Feature: View the grading status of an assignment And I set the field "Feedback comments" to "Great job! Lol, not really." And I set the field "Notify students" to "0" And I press "Save changes" - And I press "OK" And I click on "Edit settings" "link" And I follow "Test assignment name" And I navigate to "View all submissions" in current page administration @@ -80,7 +79,6 @@ Feature: View the grading status of an assignment And I should see "1 of 1" And I set the field "Marking workflow state" to "Released" And I press "Save changes" - And I press "OK" And I click on "Edit settings" "link" And I follow "Test assignment name" And I navigate to "View all submissions" in current page administration @@ -104,7 +102,6 @@ Feature: View the grading status of an assignment And I set the field "Marking workflow state" to "In marking" And I set the field "Notify students" to "0" And I press "Save changes" - And I press "OK" And I click on "Edit settings" "link" And I follow "Test assignment name" And I navigate to "View all submissions" in current page administration @@ -117,7 +114,6 @@ Feature: View the grading status of an assignment And I set the field "Workflow filter" to "In review" And I should see "0 of 0" And I follow "Test assignment name" - And I log out @javascript Scenario: View the grading status for an assignment with marking workflow disabled @@ -154,7 +150,6 @@ Feature: View the grading status of an assignment And I set the field "Grade out of 100" to "50" And I set the field "Feedback comments" to "Great job! Lol, not really." And I press "Save changes" - And I press "OK" And I click on "Edit settings" "link" And I follow "Test assignment name" And I navigate to "View all submissions" in current page administration @@ -188,7 +183,6 @@ Feature: View the grading status of an assignment And I set the field "Grade out of 100" to "99.99" And I set the field "Feedback comments" to "Even better job! Really." And I press "Save changes" - And I press "OK" And I click on "Edit settings" "link" And I follow "Test assignment name" And I navigate to "View all submissions" in current page administration @@ -200,4 +194,3 @@ Feature: View the grading status of an assignment And I follow "Test assignment name" And I should see "Graded" in the "Grading status" "table_row" And I should see "Even better job! Really." - And I log out diff --git a/mod/assign/tests/behat/group_submission.feature b/mod/assign/tests/behat/group_submission.feature index 2f8d02debf4..6a8454301a5 100644 --- a/mod/assign/tests/behat/group_submission.feature +++ b/mod/assign/tests/behat/group_submission.feature @@ -189,11 +189,9 @@ Feature: Group assignment submissions | Grade out of 100 | 50.0 | | Apply grades and feedback to entire group | 1 | And I press "Save changes" - And I press "OK" And I set the following fields to these values: | Allow another attempt | 1 | And I press "Save changes" - And I press "OK" When I am on "Course 1" course homepage And I follow "Test assignment name" And I navigate to "View all submissions" in current page administration diff --git a/mod/assign/tests/behat/hide_grader.feature b/mod/assign/tests/behat/hide_grader.feature index 027c5c2bb13..e4118840a1a 100644 --- a/mod/assign/tests/behat/hide_grader.feature +++ b/mod/assign/tests/behat/hide_grader.feature @@ -46,7 +46,6 @@ Feature: Hide grader identities identity from students And I set the field "Grade out of 100" to "50" And I set the field "Feedback comments" to "Catch for us the foxes." And I press "Save changes" - And I press "OK" And I follow "Test assignment name" And I navigate to "View all submissions" in current page administration And I should see "Graded" in the "Student 1" "table_row" @@ -60,7 +59,6 @@ Feature: Hide grader identities identity from students And I should see "Graded" in the "Grading status" "table_row" And I should see "Catch for us the foxes." And I should see "Teacher" in the "Graded by" "table_row" - And I log out @javascript Scenario: Hidden grading is enabled. @@ -80,7 +78,6 @@ Feature: Hide grader identities identity from students And I should see "Graded" in the "Grading status" "table_row" And I should see "Catch for us the foxes." And I should not see "Graded by" - And I log out @javascript Scenario: Hidden grading is enabled, but students have the 'view' capability. @@ -93,4 +90,3 @@ Feature: Hide grader identities identity from students And I should see "Graded" in the "Grading status" "table_row" And I should see "Catch for us the foxes." And I should see "Teacher" in the "Graded by" "table_row" - And I log out diff --git a/mod/assign/tests/behat/outcome_grading.feature b/mod/assign/tests/behat/outcome_grading.feature index d49ae63307e..15179e04b9b 100644 --- a/mod/assign/tests/behat/outcome_grading.feature +++ b/mod/assign/tests/behat/outcome_grading.feature @@ -65,7 +65,6 @@ Feature: Outcome grading And I set the following fields to these values: | Outcome Test: | Excellent | And I press "Save changes" - And I press "OK" And I click on "Edit settings" "link" And I follow "Test assignment name" And I navigate to "View all submissions" in current page administration @@ -113,7 +112,6 @@ Feature: Outcome grading | Outcome Test: | Excellent | | Apply grades and feedback to entire group | Yes | And I press "Save changes" - And I press "OK" And I click on "Edit settings" "link" And I follow "Test assignment name" And I navigate to "View all submissions" in current page administration @@ -125,7 +123,6 @@ Feature: Outcome grading | Outcome Test: | Disappointing | | Apply grades and feedback to entire group | No | And I press "Save changes" - And I press "OK" And I click on "Edit settings" "link" And I follow "Test assignment name" And I navigate to "View all submissions" in current page administration diff --git a/mod/assign/tests/behat/prevent_submission_changes.feature b/mod/assign/tests/behat/prevent_submission_changes.feature index feb4534bd4f..5ff263b67db 100644 --- a/mod/assign/tests/behat/prevent_submission_changes.feature +++ b/mod/assign/tests/behat/prevent_submission_changes.feature @@ -125,4 +125,3 @@ Feature: Prevent or allow assignment submission changes And I set the following fields to these values: | Online text | I'm the student2 submission and he/she edited me | And I press "Save changes" - And I log out diff --git a/mod/assign/tests/behat/quickgrading.feature b/mod/assign/tests/behat/quickgrading.feature index f4d87922b77..e76250fd4a3 100644 --- a/mod/assign/tests/behat/quickgrading.feature +++ b/mod/assign/tests/behat/quickgrading.feature @@ -39,7 +39,6 @@ Feature: In an assignment, teachers grade multiple students on one page And I click on "Grade" "link" in the "Student 1" "table_row" And I wait until the page is ready And I press "Save changes" - And I press "OK" And I click on "Edit settings" "link" And I follow "Test assignment name" Then I should see "1" in the "Needs grading" "table_row" @@ -113,7 +112,6 @@ Feature: In an assignment, teachers grade multiple students on one page | M8d skillZ! | 1337 | | Feedback comments | I'm the teacher first feedback | And I press "Save changes" - And I press "OK" And I click on "Edit settings" "link" And I follow "Test assignment name" And I navigate to "View all submissions" in current page administration diff --git a/mod/assign/tests/behat/relative_dates.feature b/mod/assign/tests/behat/relative_dates.feature index 3175903a943..d1204f3115e 100644 --- a/mod/assign/tests/behat/relative_dates.feature +++ b/mod/assign/tests/behat/relative_dates.feature @@ -34,7 +34,6 @@ I should be able to create an assignment with a due date relative to the course And I am on "Course 1" course homepage And I follow "Test assignment name" And I should not see "Assignment is overdue by:" in the "Time remaining" "table_row" - And I log out Scenario: As a teacher, I should see the relative dates when reviewing assignment submissions Given the following config values are set as admin: @@ -67,4 +66,3 @@ I should be able to create an assignment with a due date relative to the course And I should see "Assignment is overdue by:" in the "Student 1" "table_row" And I should see "No submission" in the "Student 2" "table_row" And I should not see "Assignment is overdue by:" in the "Student 2" "table_row" - And I log out diff --git a/mod/assign/tests/behat/rescale_grades.feature b/mod/assign/tests/behat/rescale_grades.feature index f3a8c445aba..33c769e671b 100644 --- a/mod/assign/tests/behat/rescale_grades.feature +++ b/mod/assign/tests/behat/rescale_grades.feature @@ -31,7 +31,6 @@ Feature: Check that the assignment grade can be rescaled when the max grade is c And I click on "Grade" "link" in the "Student 1" "table_row" And I set the field "Grade out of 100" to "40" And I press "Save changes" - And I press "OK" And I follow "Edit settings" And I follow "Test assignment name" And I navigate to "View all submissions" in current page administration diff --git a/mod/assign/tests/behat/steps_blind_marking.feature b/mod/assign/tests/behat/steps_blind_marking.feature index f7af38a4223..3ed57864ded 100644 --- a/mod/assign/tests/behat/steps_blind_marking.feature +++ b/mod/assign/tests/behat/steps_blind_marking.feature @@ -51,7 +51,6 @@ Feature: Assignments correctly add feedback to the grade report when workflow an And I set the field "Feedback comments" to "Great job! Lol, not really." And I set the field "Notify students" to "0" And I press "Save changes" - And I press "OK" And I click on "Edit settings" "link" And I follow "Test assignment name" And I navigate to "View all submissions" in current page administration @@ -63,7 +62,6 @@ Feature: Assignments correctly add feedback to the grade report when workflow an And I set the field "Marking workflow state" to "Ready for release" And I set the field "Notify students" to "0" And I press "Save changes" - And I press "OK" And I click on "Edit settings" "link" And I follow "Test assignment name" And I navigate to "View all submissions" in current page administration @@ -71,7 +69,6 @@ Feature: Assignments correctly add feedback to the grade report when workflow an And I click on "Grade" "link" in the "I'm the student's first submission" "table_row" And I set the field "Marking workflow state" to "Released" And I press "Save changes" - And I press "OK" And I click on "Edit settings" "link" And I follow "Test assignment name" And I navigate to "View all submissions" in current page administration @@ -91,7 +88,6 @@ Feature: Assignments correctly add feedback to the grade report when workflow an And I set the field "Marking workflow state" to "Ready for release" And I set the field "Notify students" to "0" And I press "Save changes" - And I press "OK" And I click on "Edit settings" "link" And I follow "Test assignment name" And I navigate to "View all submissions" in current page administration @@ -101,7 +97,6 @@ Feature: Assignments correctly add feedback to the grade report when workflow an And I click on "Grade" "link" in the "Student 1" "table_row" And I set the field "Marking workflow state" to "Released" And I press "Save changes" - And I press "OK" And I click on "Edit settings" "link" And I follow "Test assignment name" And I navigate to "View all submissions" in current page administration diff --git a/mod/assign/tests/behat/submission_comments.feature b/mod/assign/tests/behat/submission_comments.feature index ff96ca0f573..ec77765c5c2 100644 --- a/mod/assign/tests/behat/submission_comments.feature +++ b/mod/assign/tests/behat/submission_comments.feature @@ -58,7 +58,6 @@ Feature: In an assignment, students can comment in their submissions | Grade out of 100 | 50 | | Feedback comments | I'm the teacher feedback | And I press "Save changes" - And I press "OK" And I click on "Edit settings" "link" And I follow "Test assignment name" And I navigate to "View all submissions" in current page administration @@ -78,7 +77,6 @@ Feature: In an assignment, students can comment in their submissions | Grade out of 100 | 0 | And I press "Save changes" And I should see "The changes to the grade and feedback were saved" - And I press "OK" And I set the following fields to these values: | Feedback comments | I'm the teacher feedback | And I press "Save changes"