Merge branch 'wip-mdl-56519-m' of https://github.com/rajeshtaneja/moodle

2025-08-05 00:46:50 +02:00 · 2017-01-11 02:42:29 +01:00 · 2017-01-11 02:42:29 +01:00 · 777361983c
commit 777361983c
parent 122c3aff5c d44f7e4623
99 changed files with 562 additions and 543 deletions
--- a/blocks/activity_results/tests/behat/addblockinactivity.feature
+++ b/blocks/activity_results/tests/behat/addblockinactivity.feature
@ -60,7 +60,7 @@ Feature: The activity results block displays student scores
    And I press "Save changes"
    And I follow "Course 1"

-Scenario: Configure the block on a non-graded activity to show 3 high scores
+  Scenario: Configure the block on a non-graded activity to show 3 high scores
    Given I follow "Test page name"
    And I add the "Activity results" block
    When I configure the "Activity results" block
@ -78,7 +78,7 @@ Scenario: Configure the block on a non-graded activity to show 3 high scores
    And I should see "Student 3" in the "Activity results" "block"
    And I should see "70.00" in the "Activity results" "block"

-Scenario: Block should select current activity by default
+  Scenario: Block should select current activity by default
    Given I follow "Test assignment 1"
    When I add the "Activity results" block
    And I configure the "Activity results" block
--- a/blocks/activity_results/tests/behat/addunconfiguredblock.feature
+++ b/blocks/activity_results/tests/behat/addunconfiguredblock.feature
@ -1,5 +1,5 @@
@block @block_activity_results
-Feature: The activity results block displays student scores
+Feature: The activity results block doesn't displays student scores for unconfigured block
  In order to be display student scores
  As a user
  I need to see the activity results block
--- a/blocks/activity_results/tests/behat/addunsupportedactivity.feature
+++ b/blocks/activity_results/tests/behat/addunsupportedactivity.feature
@ -1,5 +1,5 @@
@block @block_activity_results
-Feature: The activity results block displays student scores
+Feature: The activity results block doesn't display student scores for unsupported activity
  In order to be display student scores
  As a user
  I need to properly configure the activity results block
--- a/blocks/activity_results/tests/behat/highscoreswithoutgroups.feature
+++ b/blocks/activity_results/tests/behat/highscoreswithoutgroups.feature
@ -1,5 +1,5 @@
@block @block_activity_results
-Feature: The activity results block displays student scores
+Feature: The activity results block displays student high scores
  In order to be display student scores
  As a user
  I need to see the activity results block
--- a/blocks/activity_results/tests/behat/highscoreswithscales.feature
+++ b/blocks/activity_results/tests/behat/highscoreswithscales.feature
@ -1,5 +1,5 @@
@block @block_activity_results
-Feature: The activity results block displays student scores as scales
+Feature: The activity results block displays students high scores in group as scales
  In order to be display student scores as scales
  As a user
  I need to see the activity results block
--- a/blocks/activity_results/tests/behat/highscoreswithscalesandgroups.feature
+++ b/blocks/activity_results/tests/behat/highscoreswithscalesandgroups.feature
@ -1,5 +1,5 @@
@block @block_activity_results
-Feature: The activity results block displays student scores as scales
+Feature: The activity results block displays student in group high scores as scales
  In order to be display student scores as scales
  As a user
  I need to see the activity results block
--- a/blocks/activity_results/tests/behat/highscoreswithseperategroups.feature
+++ b/blocks/activity_results/tests/behat/highscoreswithseperategroups.feature
@ -1,5 +1,5 @@
@block @block_activity_results
-Feature: The activity results block displays student scores
+Feature: The activity results block displays student in separate groups scores
  In order to be display student scores
  As a user
  I need to see the activity results block
--- a/blocks/activity_results/tests/behat/highscoreswithvisiblegroups.feature
+++ b/blocks/activity_results/tests/behat/highscoreswithvisiblegroups.feature
@ -1,5 +1,5 @@
@block @block_activity_results
-Feature: The activity results block displays student scores
+Feature: The activity results block displays student in visible groups scores
  In order to be display student scores
  As a user
  I need to see the activity results block
--- a/blocks/activity_results/tests/behat/lowscoreswithoutgroups.feature
+++ b/blocks/activity_results/tests/behat/lowscoreswithoutgroups.feature
@ -1,5 +1,5 @@
@block @block_activity_results
-Feature: The activity results block displays student scores
+Feature: The activity results block displays student low scores
  In order to be display student scores
  As a user
  I need to see the activity results block
--- a/blocks/activity_results/tests/behat/lowscoreswithscales.feature
+++ b/blocks/activity_results/tests/behat/lowscoreswithscales.feature
@ -1,5 +1,5 @@
@block @block_activity_results
-Feature: The activity results block displays student scores as scales
+Feature: The activity results block displays student low scores as scales
  In order to be display student scores as scales
  As a user
  I need to see the activity results block
--- a/blocks/activity_results/tests/behat/lowscoreswithscalesandgroups.feature
+++ b/blocks/activity_results/tests/behat/lowscoreswithscalesandgroups.feature
@ -1,5 +1,5 @@
@block @block_activity_results
-Feature: The activity results block displays student scores as scales
+Feature: The activity results block displays students in groups low scores as scales
  In order to be display student scores as scales
  As a user
  I need to see the activity results block
@ -146,4 +146,3 @@ Feature: The activity results block displays student scores as scales
    And I should see "User" in the "Activity results" "block"
    And I should see "Good" in the "Activity results" "block"
    And I should see "Average" in the "Activity results" "block"
-
--- a/blocks/activity_results/tests/behat/lowscoreswithseperategroups.feature
+++ b/blocks/activity_results/tests/behat/lowscoreswithseperategroups.feature
@ -1,5 +1,5 @@
@block @block_activity_results
-Feature: The activity results block displays student scores
+Feature: The activity results block displays students in separate groups scores
  In order to be display student scores
  As a user
  I need to see the activity results block
--- a/blocks/activity_results/tests/behat/lowscoreswithvisiblegroups.feature
+++ b/blocks/activity_results/tests/behat/lowscoreswithvisiblegroups.feature
@ -1,5 +1,5 @@
@block @block_activity_results
-Feature: The activity results block displays student scores
+Feature: The activity results block displays student in visible groups low scores
  In order to be display student scores
  As a user
  I need to see the activity results block
--- a/blocks/blog_menu/tests/behat/block_blog_menu_course.feature
+++ b/blocks/blog_menu/tests/behat/block_blog_menu_course.feature
@ -1,8 +1,8 @@
@block @block_blog_menu
-Feature: Enable Block blog menu in a course
-  In order to enable the blog menu in a course
-  As a teacher
-  I can add blog menu block to a course
+Feature: Students can use block blog menu in a course
+  In order students to use the blog menu in a course
+  As a student
+  I view blog menu block in a course

  Background:
    Given the following "users" exist:
--- a/blocks/calendar_upcoming/tests/behat/block_calendar_upcoming_dashboard.feature
+++ b/blocks/calendar_upcoming/tests/behat/block_calendar_upcoming_dashboard.feature
@ -1,5 +1,5 @@
@block @block_calendar_upcoming
-Feature: View a site event on the dashboard
+Feature: View a upcoming site event on the dashboard
  In order to view a site event
  As a student
  I can view the event in the upcoming events block
--- a/blocks/completionstatus/tests/behat/block_completionstatus_manual_other.feature
+++ b/blocks/completionstatus/tests/behat/block_completionstatus_manual_other.feature
@ -52,7 +52,6 @@ Feature: Enable Block Completion in a course using manual completion by others
    And I follow "More details"
    And I should see "Yes" in the "Marked complete by Teacher" "table_row"

-
  Scenario: Add the block to a the course and require multiple roles to mark a student complete.
    Given I log in as "teacher1"
    And I follow "Course 1"
--- a/blocks/course_overview/tests/behat/quiz_overview.feature
+++ b/blocks/course_overview/tests/behat/quiz_overview.feature
@ -91,4 +91,3 @@ Feature: View the quiz being due
    And I should not see "Quiz 1B Past deadline" in the "Course overview" "block"
    And I should not see "Quiz 1D Future deadline" in the "Course overview" "block"
    And I should not see "Quiz 2A Future deadline" in the "Course overview" "block"
-
--- a/blocks/glossary_random/tests/behat/glossary_random_frontpage.feature
+++ b/blocks/glossary_random/tests/behat/glossary_random_frontpage.feature
@ -4,24 +4,24 @@ Feature: Random glossary entry block can be added to the frontpage
  As a teacher
  I can add the random glossary entry to the frontpage

-Scenario: Admin can add random glossary block to the frontpage
-  Given the following "activities" exist:
-    | activity   | name             | intro                          | course               | idnumber  |
-    | glossary   | Tips and Tricks  | Frontpage glossary description | Acceptance test site | glossary0 |
-  And I log in as "admin"
-  And I am on site homepage
-  And I turn editing mode on
-  And I add the "Random glossary entry" block
-  And I configure the "block_glossary_random" block
-  And I set the following fields to these values:
-    | Title                           | Tip of the day  |
-    | Take entries from this glossary | Tips and Tricks |
-  And I press "Save changes"
-  And I click on "Add a new entry" "link" in the "Tip of the day" "block"
-  And I set the following fields to these values:
-    | Concept    | Never come late               |
-    | Definition | Come in time for your classes |
-  And I press "Save changes"
-  When I log out
-  Then I should see "Never come late" in the "Tip of the day" "block"
-  And I should see "Come in time for your classes" in the "Tip of the day" "block"
+  Scenario: Admin can add random glossary block to the frontpage
+    Given the following "activities" exist:
+      | activity   | name             | intro                          | course               | idnumber  |
+      | glossary   | Tips and Tricks  | Frontpage glossary description | Acceptance test site | glossary0 |
+    And I log in as "admin"
+    And I am on site homepage
+    And I turn editing mode on
+    And I add the "Random glossary entry" block
+    And I configure the "block_glossary_random" block
+    And I set the following fields to these values:
+      | Title                           | Tip of the day  |
+      | Take entries from this glossary | Tips and Tricks |
+    And I press "Save changes"
+    And I click on "Add a new entry" "link" in the "Tip of the day" "block"
+    And I set the following fields to these values:
+      | Concept    | Never come late               |
+      | Definition | Come in time for your classes |
+    And I press "Save changes"
+    When I log out
+    Then I should see "Never come late" in the "Tip of the day" "block"
+    And I should see "Come in time for your classes" in the "Tip of the day" "block"
--- a/blocks/html/tests/behat/multiple_instances.feature
+++ b/blocks/html/tests/behat/multiple_instances.feature
@ -1,5 +1,5 @@
@block @block_html
-Feature: Adding and configuring HTML blocks
+Feature: Adding and configuring multiple HTML blocks
  In order to have one or multiple HTML blocks on a page
  As admin
  I need to be able to create, configure and change HTML blocks
--- a/blocks/online_users/tests/behat/block_online_users_dashboard.feature
+++ b/blocks/online_users/tests/behat/block_online_users_dashboard.feature
@ -1,5 +1,5 @@
@block @block_online_users
-Feature: The online users block allow you to see who is currently online
+Feature: The online users block allow you to see who is currently online on dashboard
  In order to use the online users block on the dashboard
  As a user
  I can view the online users block on my dashboard
--- a/blocks/online_users/tests/behat/block_online_users_frontpage.feature
+++ b/blocks/online_users/tests/behat/block_online_users_frontpage.feature
@ -1,5 +1,5 @@
@block @block_online_users
-Feature: The online users block allow you to see who is currently online
+Feature: The online users block allow you to see who is currently online on frontpage
  In order to enable the online users block on the front page page
  As an admin
  I can add the online users block to the front page page
--- a/blocks/private_files/tests/behat/block_private_files_activity.feature
+++ b/blocks/private_files/tests/behat/block_private_files_activity.feature
@ -1,5 +1,5 @@
@block @block_private_files @_file_upload @javascript
-Feature: The private files block allows users to store files privately in moodle
+Feature: The private files block allows users to store files privately in moodle on activity page
  In order to store a private file in moodle
  As a teacher
  I can upload the file to my private files area using the private files block in an activity
--- a/blocks/private_files/tests/behat/block_private_files_course.feature
+++ b/blocks/private_files/tests/behat/block_private_files_course.feature
@ -1,5 +1,5 @@
@block @block_private_files @_file_upload @javascript
-Feature: The private files block allows users to store files privately in moodle
+Feature: The private files block allows users to store files privately in moodle on course page
  In order to store a private file in moodle
  As a teacher
  I can upload the file to my private files area using the private files block in a course
--- a/blocks/private_files/tests/behat/block_private_files_dashboard.feature
+++ b/blocks/private_files/tests/behat/block_private_files_dashboard.feature
@ -1,5 +1,5 @@
@block @block_private_files @_file_upload @javascript
-Feature: The private files block allows users to store files privately in moodle
+Feature: The private files block allows users to store files privately in moodle on dashboard
  In order to store a private file in moodle
  As a user
  I can upload the file to my private files area using the private files block on the dashboard
--- a/blocks/private_files/tests/behat/block_private_files_frontpage.feature
+++ b/blocks/private_files/tests/behat/block_private_files_frontpage.feature
@ -1,5 +1,5 @@
@block @block_private_files @_file_upload
-Feature: The private files block allows users to store files privately in moodle
+Feature: The private files block allows users to store files privately in moodle on front page.
  In order to store a private file in moodle
  As a teacher
  I can upload the file to my private files area using the private files block from the front page
--- a/blocks/search_forums/tests/behat/block_search_forums_course.feature
+++ b/blocks/search_forums/tests/behat/block_search_forums_course.feature
@ -1,5 +1,5 @@
@block @block_search_forums @mod_forum
-Feature: The search forums block allows users to search for forum posts
+Feature: The search forums block allows users to search for forum posts on course page
  In order to search for a forum post
  As a user
  I can use the search forums block
--- a/blocks/search_forums/tests/behat/block_search_forums_frontpage.feature
+++ b/blocks/search_forums/tests/behat/block_search_forums_frontpage.feature
@ -1,5 +1,5 @@
@block @block_search_forums @mod_forum
-Feature: The search forums block allows users to search for forum posts
+Feature: The search forums block allows users to search for forum posts on frontpage
  In order to search for a forum post
  As an administrator
  I can add the search forums block
--- a/blocks/section_links/tests/behat/block_section_links_course.feature
+++ b/blocks/section_links/tests/behat/block_section_links_course.feature
@ -27,7 +27,6 @@ Feature: The section links block allows users to quickly navigate around a moodl
      | id_coursedisplay | Show one section per page |
    And I press "Save and display"

-
  Scenario: Add the section links block to a course.
    Given I add the "Section links" block
    And I turn editing mode off