diff --git a/app/controllers/admin/api_users_controller.rb b/app/controllers/admin/api_users_controller.rb index cb2c6ff52..0eba34739 100644 --- a/app/controllers/admin/api_users_controller.rb +++ b/app/controllers/admin/api_users_controller.rb @@ -16,8 +16,8 @@ module Admin if @api_user.valid? @api_user.save! - flash[:notice] = I18n.t('record_created') - redirect_to admin_registrar_api_user_path(@api_user.registrar, @api_user) + redirect_to admin_registrar_api_user_path(@api_user.registrar, @api_user), + notice: t('.created') else render 'new' end @@ -38,8 +38,8 @@ module Admin if @api_user.valid? @api_user.save! - flash[:notice] = I18n.t('record_updated') - redirect_to admin_registrar_api_user_path(@api_user.registrar, @api_user) + redirect_to admin_registrar_api_user_path(@api_user.registrar, @api_user), + notice: t('.updated') else render 'edit' end @@ -47,7 +47,7 @@ module Admin def destroy @api_user.destroy! - redirect_to admin_registrar_path(@api_user.registrar), notice: t('record_deleted') + redirect_to admin_registrar_path(@api_user.registrar), notice: t('.deleted') end private diff --git a/config/locales/admin/api_users.en.yml b/config/locales/admin/api_users.en.yml index 0c8e6273c..49b72a2bd 100644 --- a/config/locales/admin/api_users.en.yml +++ b/config/locales/admin/api_users.en.yml @@ -5,18 +5,27 @@ en: header: API users active: Active + new: + header: New API user + + create: + created: API user has been successfully created + show: active: Active subject: Subject edit_btn: Edit delete_btn: Delete - new: - header: New API user - edit: header: Edit API user + update: + updated: API user has been successfully updated + + destroy: + deleted: API user has been successfully deleted + form: active: Active create_btn: Create API user diff --git a/test/system/admin_area/registrars/api_users_test.rb b/test/system/admin_area/registrars/api_users_test.rb index 054261c71..5d833dde2 100644 --- a/test/system/admin_area/registrars/api_users_test.rb +++ b/test/system/admin_area/registrars/api_users_test.rb @@ -16,7 +16,7 @@ class AdminRegistrarsApiUsersSystemTest < ApplicationSystemTestCase fill_in 'Password', with: valid_password click_on 'Create API user' - assert_text 'Record created' + assert_text 'API user has been successfully created' assert_text "Username #{username}" new_api_user = ApiUser.last assert_current_path admin_registrar_api_user_path(registrar, new_api_user) @@ -45,7 +45,7 @@ class AdminRegistrarsApiUsersSystemTest < ApplicationSystemTestCase fill_in 'Username', with: new_username click_link_or_button 'Update API user' - assert_text 'Record updated' + assert_text 'API user has been successfully updated' assert_text "Username #{new_username}" assert_current_path admin_registrar_api_user_path(api_user.registrar, api_user) end @@ -56,7 +56,7 @@ class AdminRegistrarsApiUsersSystemTest < ApplicationSystemTestCase visit admin_registrar_api_user_path(api_user.registrar, api_user) click_on 'Delete' - assert_text 'Record deleted' + assert_text 'API user has been successfully deleted' assert_current_path admin_registrar_path(api_user.registrar) end