MDL-60579 user: Prevent behat from interacting til setup complete

diff --git a/user/amd/build/unified_filter.min.js b/user/amd/build/unified_filter.min.js
index eca6bea..ddca41b 100644 (file)
Binary files a/user/amd/build/unified_filter.min.js and b/user/amd/build/unified_filter.min.js differ

diff --git a/user/amd/src/unified_filter.js b/user/amd/src/unified_filter.js
index 2fddee3..e6d6e2a 100644 (file)
--- a/user/amd/src/unified_filter.js
+++ b/user/amd/src/unified_filter.js
@@ -52,11 +52,18 @@ define(['jquery', 'core/form-autocomplete', 'core/str', 'core/notification'],
             }
         ];
 
+        M.util.js_pending('unified_filter_datasource');
         Str.get_strings(stringkeys).done(function(langstrings) {
             var placeholder = langstrings[0];
             var noSelectionString = langstrings[1];
             Autocomplete.enhance(SELECTORS.UNIFIED_FILTERS, true, 'core_user/unified_filter_datasource', placeholder,
-                false, true, noSelectionString, true);
+                false, true, noSelectionString, true)
+            .then(function() {
+                M.util.js_complete('unified_filter_datasource');
+
+                return;
+            })
+            .fail(Notification.exception);
         }).fail(Notification.exception);
 
         var last = $(SELECTORS.UNIFIED_FILTERS).val();
@@ -108,30 +115,29 @@ define(['jquery', 'core/form-autocomplete', 'core/str', 'core/notification'],
      * Return the unified user filter form.
      *
      * @method getForm
-     * @private
-     * @return {Form object}
+     * @return {DOMElement}
      */
     var getForm = function() {
         return $(SELECTORS.UNIFIED_FILTERS).closest('form');
     };
 
     return /** @alias module:core/form-autocomplete */ {
-        // Public variables and functions.
         /**
          * Initialise the unified user filter.
          *
          * @method init
          */
-        'init': function() {
+        init: function() {
             init();
         },
+
         /**
          * Return the unified user filter form.
          *
          * @method getForm
-         * @return {Form object}
+         * @return {DOMElement}
          */
-        'getForm': function() {
+        getForm: function() {
             return getForm();
         }
     };