[fixed] issue publiclab#7269 (publiclab#7280)

* [fixed] issue publiclab#7269 * [fixed] failing test cases for publiclab#7269 * [fixed] failing test cases for publiclab#7269
vinitshahdeo · Feb 1, 2020 · 678b4ab · 678b4ab
1 parent c60485c
commit 678b4ab
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/app/controllers/admin_controller.rb b/app/controllers/admin_controller.rb
@@ -274,7 +274,6 @@ def moderate
     user = User.find params[:id]
     if logged_in_as(['admin', 'moderator'])
       user.moderate
-      flash[:notice] = 'The user has been moderated.'
     else
       flash[:error] = 'Only moderators can moderate other users.'
     end

diff --git a/test/integration/moderate_and_ban_test.rb b/test/integration/moderate_and_ban_test.rb
@@ -114,7 +114,7 @@ class ModerateAndBanTest < ActionDispatch::IntegrationTest
 
     assert_response :redirect
     follow_redirect!
-    assert_equal flash[:notice], 'The user has been moderated.'
+    assert_equal I18n.t('users_controller.user_has_been_moderated'), flash[:warning]
     u = User.find(u.id)
     assert_equal 5, u.status