diff --git a/app/controllers/user_admin_controller.rb b/app/controllers/user_admin_controller.rb --- a/app/controllers/user_admin_controller.rb +++ b/app/controllers/user_admin_controller.rb @@ -550,6 +550,6 @@ private def user_params - params.require(:user).permit(:login,:full_name,:hashed_password,:salt,:alias,:email,:site_id,:country_id,:activated,:enabled,:remark,:last_ip,:section) + params.require(:user).permit(:login,:password,:password_confirmation,:email, :alias, :full_name,:remark) end end diff --git a/test/controllers/announcements_controller_test.rb b/test/controllers/announcements_controller_test.rb --- a/test/controllers/announcements_controller_test.rb +++ b/test/controllers/announcements_controller_test.rb @@ -3,7 +3,7 @@ class AnnouncementsControllerTest < ActionController::TestCase setup do @announcement = announcements(:one) - @request.session[:user_id] = users(:admin).id + @request.session[:user_id] = user(:admin).id end test "should get index" do @@ -19,7 +19,7 @@ test "should create announcement" do assert_difference('Announcement.count') do - post :create, announcement: { author: 'test', body: 'haha', published: true} + post :create, announcement: { } end assert_redirected_to announcement_path(assigns(:announcement)) @@ -36,7 +36,7 @@ end test "should update announcement" do - patch :update, id: @announcement, announcement: { body: 'another body' } + patch :update, id: @announcement, announcement: { } assert_redirected_to announcement_path(assigns(:announcement)) end