diff --git a/tests/features/varbase/step2-apply-tests/02-user-management/02-02-admins-can-create-users-and-assign-role-them.feature b/tests/features/varbase/step2-apply-tests/02-user-management/02-02-admins-can-create-users-and-assign-role-them.feature index 9b4867f4aa66e793ff54cebef09341eae2d842c5..4b2e8f5bbf1d3dd648a2c2ddedddd0e16dbde984 100644 --- a/tests/features/varbase/step2-apply-tests/02-user-management/02-02-admins-can-create-users-and-assign-role-them.feature +++ b/tests/features/varbase/step2-apply-tests/02-user-management/02-02-admins-can-create-users-and-assign-role-them.feature @@ -39,10 +39,10 @@ So that they will be able to use the site. Then I should see "Tester" When I click "Edit" in the "Tester" row And I wait - And I press "Cancel account" + And I press "Confirm" And I wait Then I should see "Are you sure you want to cancel the account Tester?" - When I select the radio button "Delete the account and its content." - And I press "Cancel account" + When I select the radio button "Delete the account and its content. This action cannot be undone." + And I press "Confirm" And I wait 10s Then I should see "People" diff --git a/tests/features/varbase/step3-cleanup-tests/01-delete-default-testing-users.feature b/tests/features/varbase/step3-cleanup-tests/01-delete-default-testing-users.feature index 5d846d36b00444d1a1192c59e5f2b881bd92fea0..1862db39b515c4f050178352b7588e10d57fab8c 100644 --- a/tests/features/varbase/step3-cleanup-tests/01-delete-default-testing-users.feature +++ b/tests/features/varbase/step3-cleanup-tests/01-delete-default-testing-users.feature @@ -22,7 +22,7 @@ Feature: Delete default testing users And I select "Cancel the selected user accounts" from "action" When I press "Apply to selected items" And I wait - And I select the radio button "Delete the account and its content." + And I select the radio button "Delete the account and its content. This action cannot be undone." And I press "Apply" And I wait 15s Then I should see "Action processing results: (6)." \ No newline at end of file diff --git a/tests/tools/users/delete-default-testing-users.feature b/tests/tools/users/delete-default-testing-users.feature index 3913119911ab76a112c155e7179db084a802924b..73c9653acc5c268eb1a7f26496febea0cc7f4e02 100644 --- a/tests/tools/users/delete-default-testing-users.feature +++ b/tests/tools/users/delete-default-testing-users.feature @@ -23,11 +23,11 @@ Feature: Delete default testing users. When I click "Edit" And I wait Then I should see "test_authenticated" - When I press "Cancel account" + When I press "Confirm" And I wait Then I should see "Are you sure you want to cancel the account test_authenticated?" - When I select the radio button "Delete the account and its content." - And I press "Cancel account" + When I select the radio button "Delete the account and its content. This action cannot be undone." + And I press "Confirm" And I wait for the batch job to finish Then I should see "test_authenticated has been deleted." @@ -45,11 +45,11 @@ Feature: Delete default testing users. When I click "Edit" And I wait Then I should see "test_editor" - When I press "Cancel account" + When I press "Confirm" And I wait Then I should see "Are you sure you want to cancel the account test_editor?" - When I select the radio button "Delete the account and its content." - And I press "Cancel account" + When I select the radio button "Delete the account and its content. This action cannot be undone." + And I press "Confirm" And I wait for the batch job to finish Then I should see "test_editor has been deleted." @@ -66,11 +66,11 @@ Feature: Delete default testing users. When I click "Edit" And I wait Then I should see "test_content_admin" - When I press "Cancel account" + When I press "Confirm" And I wait Then I should see "Are you sure you want to cancel the account test_content_admin?" - When I select the radio button "Delete the account and its content." - And I press "Cancel account" + When I select the radio button "Delete the account and its content. This action cannot be undone." + And I press "Confirm" And I wait for the batch job to finish Then I should see "test_content_admin has been deleted." @@ -88,11 +88,11 @@ Feature: Delete default testing users. When I click "Edit" And I wait Then I should see "test_site_admin" - When I press "Cancel account" + When I press "Confirm" And I wait Then I should see "Are you sure you want to cancel the account test_site_admin?" - When I select the radio button "Delete the account and its content." - And I press "Cancel account" + When I select the radio button "Delete the account and its content. This action cannot be undone." + And I press "Confirm" And I wait for the batch job to finish Then I should see "test_site_admin has been deleted." @@ -110,10 +110,10 @@ Feature: Delete default testing users. When I click "Edit" And I wait Then I should see "test_super_admin" - When I press "Cancel account" + When I press "Confirm" And I wait Then I should see "Are you sure you want to cancel the account test_super_admin?" - When I select the radio button "Delete the account and its content." - And I press "Cancel account" + When I select the radio button "Delete the account and its content. This action cannot be undone." + And I press "Confirm" And I wait for the batch job to finish Then I should see "test_super_admin has been deleted." diff --git a/translations/ar.po b/translations/ar.po index 1cd9cd73970a1ede13c20052c3285cb8c35f95bf..a6ad22ca7e4ef8ebda4336b27acaefb3c200b927 100644 --- a/translations/ar.po +++ b/translations/ar.po @@ -5805,7 +5805,7 @@ msgstr "Ù…Ùدخل @argument" msgid "Administer forums" msgstr "إدارة المنتديات" -msgid "Cancel account" +msgid "Confirm" msgstr "إلغاء الØساب" msgid "Dependencies" @@ -8636,7 +8636,7 @@ msgstr "عند إلغاء هذه الØسابات" msgid "Are you sure you want to cancel these user accounts?" msgstr "هل أنت متأكد من إلغاء هذه الØسابات؟" -msgid "Cancel accounts" +msgid "Confirms" msgstr "إلغاء الØسابات" msgid "Add lowercase letters" @@ -9410,7 +9410,7 @@ msgstr "" "Øذ٠الØساب وجعل Ù…Øتوياته ملكا " "للمستخدم %anonymous-name." -msgid "Delete the account and its content." +msgid "Delete the account and its content. This action cannot be undone." msgstr "Øذ٠الØساب ومØتوياته." msgid "String settings"