Merge branch 'MDL-72893-master' of https://github.com/HuongNV13/moodle

blocks/timeline/amd/src/event_list.js

@@ -28,15 +28,17 @@ define(
     'core/templates',
     'core/str',
     'core/user_date',
-    'block_timeline/calendar_events_repository'
+    'block_timeline/calendar_events_repository',
+    'core/pending'
 ],
 function(
     $,
     Notification,
     Templates,
     Str,
     UserDate,
-    CalendarEventsRepository
+    CalendarEventsRepository,
+    Pending
 ) {
 
     var SECONDS_IN_DAY = 60 * 60 * 24;
@@ -215,6 +217,7 @@ function(
      * @param {object} additionalConfig Additional config options to pass to pagedContentFactory.
      */
     var init = function(root, additionalConfig = {}) {
+        const pendingPromise = new Pending('block/timeline:event-init');
         root = $(root);
 
         courseview = !!additionalConfig.courseview;
@@ -286,6 +289,8 @@ function(
                 });
 
                 return html;
+            }).then(() => {
+                return pendingPromise.resolve();
             })
             .catch(Notification.exception);
     };

blocks/timeline/tests/behat/block_timeline_courses.feature

@@ -42,8 +42,8 @@ Feature: The timeline block allows users to see upcoming courses
     And I click on "Next 30 days" "link" in the "Timeline" "block"
     And I click on "Sort timeline items" "button" in the "Timeline" "block"
     When I click on "Sort by courses" "link" in the "Timeline" "block"
-    Then I should see "Course 1" in the "Timeline" "block"
-    And I should see "Course 2" in the "Timeline" "block"
+    Then I should see "Course 1" in the ".block_timeline [data-region='view-courses']" "css_element"
+    And I should see "Course 2" in the ".block_timeline [data-region='view-courses']" "css_element"
     And I should see "Show more courses" in the "Timeline" "block"
     And "Test choice 1" "link" should exist in the "Timeline" "block"
     And I should see "Choice closes" in the "Timeline" "block"