MDL-59759 core_user: Use SAVE_CANCEL modal for unenrol dialog

hig3 · Sep 4, 2017 · 7800e68 · 7800e68
1 parent 23356f4
commit 7800e68
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 11 deletions.
diff --git a/user/amd/build/status_field.min.js b/user/amd/build/status_field.min.js
diff --git a/user/amd/src/status_field.js b/user/amd/src/status_field.js
@@ -145,18 +145,19 @@ define(['core/templates',
                     }
                 ];
 
-                $.when(Str.get_strings(strings)).then(function(results) {
+                var deleteModalPromise = ModalFactory.create({
+                    type: ModalFactory.types.SAVE_CANCEL
+                });
+
+                $.when(Str.get_strings(strings), deleteModalPromise).done(function(results, modal) {
                     var title = results[0];
                     var confirmMessage = results[1];
-                    return ModalFactory.create({
-                        body: confirmMessage,
-                        large: true,
-                        title: title,
-                        type: ModalFactory.types.CONFIRM
-                    });
-                }).done(function(modal) {
+                    modal.setTitle(title);
+                    modal.setBody(confirmMessage);
+                    modal.setSaveButtonText(title);
+
                     // Handle confirm event.
-                    modal.getRoot().on(ModalEvents.yes, function() {
+                    modal.getRoot().on(ModalEvents.save, function() {
                         // Build params.
                         var unenrolParams = {
                             confirm: 1,

diff --git a/user/tests/behat/edit_user_enrolment.feature b/user/tests/behat/edit_user_enrolment.feature
@@ -45,7 +45,7 @@ Feature: Edit user enrolment
     And I am on "Course 1" course homepage
     And I navigate to course participants
     When I click on "Unenrol" "icon" in the "student1" "table_row"
-    And I click on "Yes" "button"
+    And I click on "Unenrol" "button" in the ".modal-footer" "css_element"
     Then I should not see "Student 1" in the "participants" "table"
 
   @javascript