MDL-67827 behat: Pending JS improvements for dialogues

mvaraujo · Mar 6, 2020 · 604887c · 604887c
1 parent ae8d60c
commit 604887c
Show file tree

Hide file tree

Showing 9 changed files with 27 additions and 14 deletions.
diff --git a/enrol/manual/amd/build/quickenrolment.min.js b/enrol/manual/amd/build/quickenrolment.min.js
diff --git a/enrol/manual/amd/build/quickenrolment.min.js.map b/enrol/manual/amd/build/quickenrolment.min.js.map
diff --git a/enrol/manual/amd/src/quickenrolment.js b/enrol/manual/amd/src/quickenrolment.js
@@ -28,8 +28,9 @@ define(['core/templates',
          'core/modal_factory',
          'core/modal_events',
          'core/fragment',
+         'core/pending',
        ],
-       function(Template, $, Str, Config, Notification, ModalFactory, ModalEvents, Fragment) {
+       function(Template, $, Str, Config, Notification, ModalFactory, ModalEvents, Fragment, Pending) {
 
     /** @type {Object} The list of selectors for the quick enrolment modal. */
     var SELECTORS = {
@@ -91,14 +92,16 @@ define(['core/templates',
             });
 
             modal.getRoot().on(ModalEvents.shown, function() {
+                var pendingPromise = new Pending('enrol_manual/quickenrolment:initModal:shown');
                 var bodyPromise = this.getBody();
                 bodyPromise.then(function(html) {
                     var stringIndex = $(html).find(SELECTORS.COHORTSELECT).length ? 0 : 1;
                     modal.setSaveButtonText(strings[stringIndex]);
 
                     return;
                 })
-                .fail(Notification.exception);
+                .then(pendingPromise.resolve)
+                .catch(Notification.exception);
 
                 modal.setBody(bodyPromise);
             }.bind(this));

diff --git a/lib/amd/build/modal.min.js b/lib/amd/build/modal.min.js
diff --git a/lib/amd/build/modal.min.js.map b/lib/amd/build/modal.min.js.map
diff --git a/lib/amd/build/modal_factory.min.js b/lib/amd/build/modal_factory.min.js