cafe-grader-web Commit - r639:2826fdf23cce

cafe-grader-web

parent | child

Description:

fix user update

Commit status:

[Not Reviewed]

References:

java

Diff options:

| | | |

Comments:

0 Commit comments 0 Inline Comments

Unresolved TODOs:

There are no unresolved TODOs

Add another comment

r639:2826fdf23cce - Thu, 02 Feb 2017 02:17:29 - 2 files changed: 4 inserted, 4 deleted

app/controllers/user_admin_controller.rb ¶ +1 -1

                 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

test/controllers/announcements_controller_test.rb ¶ +3 -3

               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
                 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))
                 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

You need to be logged in to leave comments. Login now

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository permissions settings