Merge branch 'MDL-71912' of https://github.com/stronk7/moodle

2025-03-23 09:00:30 +01:00 · 2021-11-09 17:01:24 +01:00 · 2021-11-09 17:01:24 +01:00 · e871e800f1
commit e871e800f1
parent 90b40b99fd 19576e54b3
22 changed files with 25 additions and 21 deletions
--- a/blocks/completionstatus/tests/behat/block_completionstatus_activity_completion.feature
+++ b/blocks/completionstatus/tests/behat/block_completionstatus_activity_completion.feature
@ -67,7 +67,7 @@ Feature: Enable Block Completion in a course using activity completion
    And I follow "More details"
    And I should see "Yes" in the "Activity completion" "table_row"

-  @javascript
+  @javascript @skip_interim
  Scenario: Add the block to a the course and add course completion items with passing grade
    Given I am on the "Test assign name" "assign activity" page logged in as teacher1
    And I navigate to "Settings" in current page administration
@ -101,7 +101,7 @@ Feature: Enable Block Completion in a course using activity completion
    And I should see "Achieving grade, Achieving passing grade" in the "Activity completion" "table_row"
    And I should see "Yes" in the "Activity completion" "table_row"

-  @javascript
+  @javascript @skip_interim
  Scenario: Add the block to a the course and add course completion items with failing grade.
    Given I am on the "Test assign name" "assign activity" page logged in as teacher1
    And I navigate to "Settings" in current page administration
--- a/lib/form/tests/behat/modgrade_validation.feature
+++ b/lib/form/tests/behat/modgrade_validation.feature
@ -150,7 +150,7 @@ Feature: Using the activity grade form element
    Then I should see "You cannot change the type, as grades already exist for this item."
    And the "Maximum grade" "field" should be disabled

-  @javascript
+  @javascript @skip_interim
  Scenario: Attempting to change the maximum grade when no rescaling option has been chosen
    Given I am on the "Test assignment name" "assign activity" page logged in as teacher1
    And I navigate to "View all submissions" in current page administration
--- a/mod/assign/tests/behat/assign_course_reset.feature
+++ b/mod/assign/tests/behat/assign_course_reset.feature
@ -56,7 +56,7 @@ Feature: Assign reset
    And I follow "View all submissions"
    Then I should not see "Submitted for grading"

-  @javascript
+  @javascript @skip_interim
  Scenario: Use course reset to remove user overrides.
    And I am on the "Test assignment name" Activity page logged in as teacher1
    And I navigate to "Overrides" in current page administration
--- a/mod/assign/tests/behat/assign_group_override.feature
+++ b/mod/assign/tests/behat/assign_group_override.feature
@ -140,7 +140,7 @@ Feature: Assign group override
    And I am on the "Test assignment name" Activity page logged in as student1
    And I should not see "Tuesday, 1 January 2030, 8:00"

-  @javascript
+  @javascript @skip_interim
  Scenario: Add both a user and group override and verify that both are applied correctly
    Given I am on the "Test assignment name" Activity page logged in as teacher1
    When I navigate to "Settings" in current page administration
--- a/mod/assign/tests/behat/assign_user_override.feature
+++ b/mod/assign/tests/behat/assign_user_override.feature
@ -144,6 +144,7 @@ Feature: Assign user override
    Then I should see "No groups you can access."
    And the "Add user override" "button" should be disabled

+  @skip_interim
  Scenario: A teacher without accessallgroups permission should only be able to add user override for users that he/she shares groups with,
        when the activity's group mode is "separate groups"
    Given the following "permission overrides" exist:
@ -167,7 +168,7 @@ Feature: Assign user override
    Then the "Override user" select box should contain "Sam1 Student1, student1@example.com"
    And the "Override user" select box should not contain "Sam2 Student2, student2@example.com"

-  @javascript
+  @javascript @skip_interim
  Scenario: A teacher without accessallgroups permission should only be able to see the user override for users that he/she shares groups with,
        when the activity's group mode is "separate groups"
    Given the following "permission overrides" exist:
--- a/mod/assign/tests/behat/outcome_grading.feature
+++ b/mod/assign/tests/behat/outcome_grading.feature
@ -68,6 +68,7 @@ Feature: Outcome grading
    Then I should see "Outcome Test: Excellent" in the "Student 0" "table_row"
    And I should not see "Outcome Test: Excellent" in the "Student 1" "table_row"

+  @skip_interim
  Scenario: Giving an outcome to a group submission
    Given the following "users" exist:
      | username | firstname | lastname | email |
--- a/mod/assign/tests/behat/remove_submission.feature
+++ b/mod/assign/tests/behat/remove_submission.feature
@ -31,7 +31,7 @@ Feature: Remove a submission
      | student1 | G1 |
      | student2 | G1 |

-  @javascript @skip_chrome_zerosize
+  @javascript @skip_chrome_zerosize @skip_interim
  Scenario: Remove a submission should remove the data that was submitted
    Given the following "activity" exists:
      | activity                             | assign                |
@ -86,7 +86,7 @@ Feature: Remove a submission
    And I should not see "I'm the student submission"
    And I should see "Nothing has been submitted for this assignment" in the "Submission status" "table_row"

-  @javascript @skip_chrome_zerosize
+  @javascript @skip_chrome_zerosize @skip_interim
  Scenario: A student can remove their own submission
    Given the following "activity" exists:
      | activity                             | assign                |
--- a/mod/assign/tests/behat/submit_without_group.feature
+++ b/mod/assign/tests/behat/submit_without_group.feature
@ -3,7 +3,7 @@ Feature: Submit assignment without group
  As a teacher
  I should be able to prevent students submitting team assignments as members of the default group

-  @javascript
+  @javascript @skip_interim
  Scenario: Switch between group modes
    Given the following "courses" exist:
      | fullname | shortname | category | groupmode |
--- a/mod/book/tests/behat/create_chapters.feature
+++ b/mod/book/tests/behat/create_chapters.feature
@ -61,6 +61,7 @@ Feature: In a book, create chapters and sub chapters
    And I should see "1. Dummy first chapter" in the ".book_content" "css_element"
    And I should see "1. Dummy first chapter" in the "strong" "css_element"

+  @skip_interim
  Scenario: Change editing mode for an individual chapter
    Given I am on the "Test book" Activity page
    And I should see "Add new chapter"
--- a/mod/book/tests/behat/edit_tags.feature
+++ b/mod/book/tests/behat/edit_tags.feature
@ -1,4 +1,4 @@
-@mod @mod_book @core_tag @javascript
+@mod @mod_book @core_tag @javascript @skip_interim
 Feature: Edited book chapters handle tags correctly
  In order to get book chapters properly labelled
  As a user
--- a/mod/lesson/tests/behat/lesson_delete_answers.feature
+++ b/mod/lesson/tests/behat/lesson_delete_answers.feature
@ -1,4 +1,4 @@
-@mod @mod_lesson
+@mod @mod_lesson @skip_interim
 Feature: In a lesson activity, teacher can delete question answers and
 branch table contents
  In order to modify an existing lesson
--- a/mod/lesson/tests/behat/lesson_edit_cluster.feature
+++ b/mod/lesson/tests/behat/lesson_edit_cluster.feature
@ -1,4 +1,4 @@
-@mod @mod_lesson
+@mod @mod_lesson @skip_interim
 Feature: In a lesson activity, teacher can edit a cluster page
  In order to modify an existing lesson and change navigation
  As a teacher
--- a/mod/lesson/tests/behat/lesson_edit_pages.feature
+++ b/mod/lesson/tests/behat/lesson_edit_pages.feature
@ -1,4 +1,4 @@
-@mod @mod_lesson
+@mod @mod_lesson @skip_interim
 Feature: In a lesson activity, teacher can edit lesson's pages
  In order to modify an existing lesson
  As a teacher
--- a/mod/lesson/tests/behat/lesson_essay_question.feature
+++ b/mod/lesson/tests/behat/lesson_essay_question.feature
@ -1,4 +1,4 @@
-@mod @mod_lesson @_file_upload
+@mod @mod_lesson @_file_upload @skip_interim
 Feature: In a lesson activity, teacher can add an essay question
  As a teacher
  I need to add an essay question in a lesson and grade student attempts
--- a/mod/lesson/tests/behat/lesson_exit_enter_clusters.feature
+++ b/mod/lesson/tests/behat/lesson_exit_enter_clusters.feature
@ -1,4 +1,4 @@
-@mod @mod_lesson
+@mod @mod_lesson @skip_interim
 Feature: In a lesson activity, students can exit and re-enter the activity when it consists only of cluster pages
  As a student
  I need to exit and re-enter a lesson out and into clusters.
--- a/mod/lesson/tests/behat/lesson_navigation.feature
+++ b/mod/lesson/tests/behat/lesson_navigation.feature
@ -18,6 +18,7 @@ Feature: In a lesson activity, students can navigate through a series of pages i
      | student1 | C1 | student |
    And I log in as "teacher1"

+  @skip_interim
  Scenario: Student navigation with pages and questions
    Given the following "activities" exist:
      | activity   | name             | intro                   | course | idnumber    |
--- a/mod/lesson/tests/behat/lesson_number_of_student_attempts.feature
+++ b/mod/lesson/tests/behat/lesson_number_of_student_attempts.feature
@ -1,4 +1,4 @@
-@mod @mod_lesson
+@mod @mod_lesson @skip_interim
 Feature: In Dashboard, teacher can see the number of student attempts to lessons
  In order to know the number of student attempts to a lesson
  As a teacher
--- a/mod/lesson/tests/behat/lesson_numerical_question_with_locale.feature
+++ b/mod/lesson/tests/behat/lesson_numerical_question_with_locale.feature
@ -1,4 +1,4 @@
-@mod @mod_lesson
+@mod @mod_lesson @skip_interim
 Feature: In a lesson activity, I need to edit pages in the lesson taking into account locale settings

  Background:
--- a/mod/lesson/tests/behat/lesson_progress_bar.feature
+++ b/mod/lesson/tests/behat/lesson_progress_bar.feature
@ -1,4 +1,4 @@
-@mod @mod_lesson
+@mod @mod_lesson @skip_interim
 Feature: In a lesson activity, students can see their progress viewing a progress bar.
  In order to create a lesson with conditional paths
  As a teacher
--- a/mod/lesson/tests/behat/lesson_with_clusters.feature
+++ b/mod/lesson/tests/behat/lesson_with_clusters.feature
@ -1,4 +1,4 @@
-@mod @mod_lesson
+@mod @mod_lesson @skip_interim
 Feature: In a lesson activity, students can see questions in random order
  In order to create a lesson with clusters
  As a teacher
--- a/mod/lesson/tests/behat/lesson_with_subcluster.feature
+++ b/mod/lesson/tests/behat/lesson_with_subcluster.feature
@ -1,4 +1,4 @@
-@mod @mod_lesson
+@mod @mod_lesson @skip_interim
 Feature: In a lesson activity, students can see questions in random order and a single question drawn from a branch
  In order to create a lesson with a cluster and a subcluster
  As a teacher
--- a/mod/lesson/tests/behat/teacher_grade_essays.feature
+++ b/mod/lesson/tests/behat/teacher_grade_essays.feature
@ -1,4 +1,4 @@
-@mod @mod_lesson
+@mod @mod_lesson @skip_interim
 Feature: In a lesson activity, a non editing teacher can grade essay questions
  As a non editing teacher
  I need to grade student answers to essay questions in lesson