Merge branch 'MDL-64438-master-4' of git://github.com/mihailges/moodle

diff --cc blocks/myoverview/tests/behat/block_myoverview_dashboard.feature
index 8ee515c,b8e799a..d7ee593
--- 1/blocks/myoverview/tests/behat/block_myoverview_dashboard.feature
--- 2/blocks/myoverview/tests/behat/block_myoverview_dashboard.feature
+++ b/blocks/myoverview/tests/behat/block_myoverview_dashboard.feature
@@@ -236,9 -249,12 +236,11 @@@ Feature: The my overview block allows u
      And I should see "Course 2" in the "Course overview" "block"
      And I should see "Course 3" in the "Course overview" "block"
      And I should see "Course 4" in the "Course overview" "block"
 -    And I log out
  
    Scenario: Show course category in cards display
-     Given I log in as "student1"
+     Given the following config values are set as admin:
+       | displaycategories | 1 | block_myoverview |
+     And I log in as "student1"
      And I click on "Display drop-down menu" "button" in the "Course overview" "block"
      When I click on "Card" "link" in the "Course overview" "block"
      Then I should see "Category 1" in the "Course overview" "block"