Fix discard confirmation for buttons

Fix tests and add check for discard confirmation
silverstripe · Nov 12, 2018 · ef51328 · ef51328
1 parent 950c118
commit ef51328
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 10 deletions.
diff --git a/client/src/components/Toolbar/Toolbar.scss b/client/src/components/Toolbar/Toolbar.scss
@@ -25,11 +25,12 @@
 
   .rounded {
 
-    &.btn, >.btn {
+    &.btn,
+    >.btn {
       width: 32px;
       padding-left: 7px;
 
-      &:last-child{
+      &:last-child {
         border-top-right-radius: 100px !important;
         border-bottom-right-radius: 100px !important;
       }
@@ -43,7 +44,8 @@
 
     border-radius: 100px !important;
 
-    &::before, .btn::before {
+    &::before,
+    .btn::before {
       margin-right: 0;
     }
   }

diff --git a/client/src/legacy/LeftAndMain.js b/client/src/legacy/LeftAndMain.js
@@ -1069,7 +1069,7 @@ $.entwine('ss', function($) {
    * "opt in" to panel loading, while by default links still exhibit their default behaviour.
    * The PJAX target can be specified via a 'data-pjax-target' attribute.
    */
-  $('.cms .cms-panel-link').entwine({
+  $('.cms a.cms-panel-link').entwine({
     onclick: function(e) {
       if($(this).hasClass('external-link')) {
         e.stopPropagation();
@@ -1086,6 +1086,14 @@ $.entwine('ss', function($) {
     }
   });
 
+  $('.cms button.cms-panel-link').entwine({
+    onclick: function(e) {
+      if (!$('.cms-container').checkCanNavigate()) {
+        e.preventDefault();
+      }
+    }
+  });
+
   /**
    * Does an ajax loads of the link's 'href' attribute via ajax and displays any FormResponse messages from the CMS.
    * Little helper to avoid repetition, and make it easy to trigger actions via a link,

diff --git a/tests/behat/features/manage-users.feature b/tests/behat/features/manage-users.feature
@@ -8,6 +8,7 @@ Feature: Manage users
     Given a "member" "ADMIN" belonging to "ADMIN group" with "Email"="[email protected]"
     And the "member" "ADMIN" belonging to "ADMIN group2"
     And a "member" "Staff" belonging to "Staff group" with "Email"="[email protected]"
+    And a "member" "Other Staff" belonging to "Staff group" with "Email"="[email protected]"
     And the "group" "ADMIN group" has permissions "Full administrative rights"
     And the "group" "ADMIN group2" has permissions "Full administrative rights"
     And I am logged in with "ADMIN" permissions
@@ -79,7 +80,7 @@ Feature: Manage users
     When I click the "Users" CMS tab
     And I press the "Add Member" button
     And I fill in the following:
-      | First Name | Other Staff |
+      | First Name | John |
       | Surname | Doe |
       | Email | john.doe@example.org |
     And I press the "Create" button
@@ -88,20 +89,29 @@ Feature: Manage users
     When I go to "admin/security/"
     Then I should see "[email protected]" in the "#Root_Users" element
 
+  @modal
   Scenario: I can navigate users from the edit form and retain my search query
     When I press the "Open search and filter" button
     And I press the "Advanced" button
     And I fill in "Search__FirstName" with "Staff"
     And I press the "Search" button
     Then I should see "[email protected]" in the "#Root_Users" element
-    And I should see "john.doe@example.org" in the "#Root_Users" element
+    And I should see "otherstaffmember@example.org" in the "#Root_Users" element
     But I should not see "[email protected]" in the "#Root_Users" element
 
-    When I click "john.doe@example.org" in the "#Root_Users" element
-    And I press the "Next" button
+    When I click "otherstaffmember@example.org" in the "#Root_Users" element
+    And I press the "Form_ItemEditForm_action_doNext" button
     Then the "Email" field should contain "[email protected]"
-    When I press the "Previous" button
-    Then the "Email" field should contain "[email protected]"
+    When I press the "Form_ItemEditForm_action_doPrevious" button
+    Then the "Email" field should contain "[email protected]"
+
+    When I fill in "FirstName" with "Staff Renamed"
+    And I press the "Form_ItemEditForm_action_doNew" button
+    Then I see the text "Are you sure you want to navigate away from this page?" in the alert
+    And I dismiss the dialog
+
+    When I go to "admin/security/"
+    Then I confirm the dialog
 
   Scenario: I can edit an existing user and add him to an existing group
     When I go to "admin/security/"