This repository has been archived by the owner on Jul 27, 2022. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 21
Isaicp 4392: Change the 'Cancel account' button label on the user cancel form #1215
Merged
Merged
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
9217315
ISAICP-4392: Extend the test to ensure proper functionality of the us…
idimopoulos b0cb06b
ISAICP-4392: Fix the labeling of the cancel button. Hide the submit b…
idimopoulos a4cae44
ISAICP-4392: Ensure that a proper exception is thrown when accessing …
idimopoulos 8d848e7
Merge remote-tracking branch 'origin/develop' into ISAICP-4392
pfrenssen File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -30,11 +30,32 @@ Feature: | |
And I check "Amelia Barker" | ||
And I select "Cancel the selected user account(s)" from "Action" | ||
And I press the "Apply to selected items" button | ||
Then I should see the text "User Hazel Olson cannot be deleted as it is currently the sole owner of these collections:" | ||
Then I should not see the following lines of text: | ||
| This action cannot be undone. | | ||
| When cancelling these accounts | | ||
| Require email confirmation to cancel account | | ||
| Notify user when account is canceled | | ||
But I should see the text "User Hazel Olson cannot be deleted as it is currently the sole owner of these collections:" | ||
And I should see the text "User Amelia Barker cannot be deleted as it is currently the sole owner of these collections:" | ||
And I should not see the text "This action cannot be undone." | ||
And I should see the link "Lugia was just released" | ||
And I should see the link "Articuno is hunted" | ||
And I should see the link "Go back" | ||
And I should not see the button "Cancel accounts" | ||
|
||
Scenario: Canceling a user directly from the profile when he is the sole owner of a collection, cannot be done. | ||
When I am logged in as a moderator | ||
And I click "People" | ||
And I click "Hazel Olson" | ||
And I click "Edit" in the "Header" region | ||
And I press "Cancel account" | ||
Then I should not see the following lines of text: | ||
| This action cannot be undone. | | ||
| When cancelling these accounts | | ||
| Require email confirmation to cancel account | | ||
| Notify user when account is canceled | | ||
But I should see the text "User Hazel Olson cannot be deleted as it is currently the sole owner of these collections:" | ||
And I should see the link "Go back" | ||
And I should not see the button "Cancel account" | ||
|
||
@javascript | ||
Scenario: A moderator deletes a user. | ||
|
@@ -45,11 +66,12 @@ Feature: | |
And I open the header local tasks menu | ||
And I click "Edit" in the "Header" region | ||
And I press "Cancel account" | ||
And I press "Cancel account" | ||
Then I should see the link "Go back" | ||
When I press "Cancel account" | ||
And I wait for the batch job to finish | ||
And the following system email should have been sent: | ||
| recipient_mail | [email protected] | | ||
| subject | Your account has been deleted. | | ||
| recipient_mail | [email protected] | | ||
| subject | Your account has been deleted. | | ||
| body | Your account alicia__1997 has been deleted.This action has been done in the framework of moderation activities regularly conducted on the Joinup platform. If you believe that this action has been performed by mistake, please contact The Joinup Support Team at | | ||
|
||
@javascript | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I agree with this but shouldn't we solve this differently? I would suggest to show a greyed out version of the button with a tooltip "This user cannot be deleted since it is the owner of a collection".
This is out of scope for this ticket so I made a followup for it: ISAICP-4555