diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 42abe990483..d4f0ffba81f 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -14,6 +14,7 @@ class ApplicationController < ActionController::Base include DatabaseHelper include AuthorizedFetchHelper include SelfDestructHelper + include MfaForceConcern helper_method :current_account helper_method :current_session diff --git a/app/helpers/flashes_helper.rb b/app/helpers/flashes_helper.rb index 6c5e9370980..ccae52f353e 100644 --- a/app/helpers/flashes_helper.rb +++ b/app/helpers/flashes_helper.rb @@ -2,6 +2,6 @@ module FlashesHelper def user_facing_flashes - flash.to_hash.slice('alert', 'error', 'notice', 'success') + flash.to_hash.slice('alert', 'error', 'notice', 'success', 'warning') end end diff --git a/spec/helpers/flashes_helper_spec.rb b/spec/helpers/flashes_helper_spec.rb index aaef7ab1443..c911c6829f1 100644 --- a/spec/helpers/flashes_helper_spec.rb +++ b/spec/helpers/flashes_helper_spec.rb @@ -10,6 +10,7 @@ RSpec.describe FlashesHelper do flash[:error] = 'an error' flash[:notice] = 'a notice' flash[:success] = 'a success' + flash[:warning] = 'a warning' flash[:not_user_facing] = 'a not user facing flash' # rubocop:enable Rails/I18nLocaleTexts end @@ -19,7 +20,8 @@ RSpec.describe FlashesHelper do 'alert' => 'an alert', 'error' => 'an error', 'notice' => 'a notice', - 'success' => 'a success' + 'success' => 'a success', + 'warning' => 'a warning' ) end end