Merge pull request #36 from cre-ne-jp/fix-redirection-on-user-edit

利用者追加・編集で保存した後のリダイレクト先を修正する
cre-ne-jp · Apr 8, 2017 · fe05de9 · fe05de9
2 parents 2cacbae + bb0a6da
commit fe05de9
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 8 deletions.
diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb
@@ -14,7 +14,7 @@ def create
 
     if @user.save
       flash[:success] = t('views.flash.added_user')
-      redirect_to(users_path)
+      redirect_to(@user)
     else
       render(:new)
     end
@@ -36,7 +36,7 @@ def update
 
     if @user.update_attributes(user_params)
       flash[:success] = t('views.flash.updated_user')
-      redirect_to(users_path)
+      redirect_to(@user)
     else
       @user.username = old_username
       render(:edit)

diff --git a/test/controllers/users_controller_test.rb b/test/controllers/users_controller_test.rb
@@ -69,26 +69,24 @@ class UsersControllerTest < ActionController::TestCase
   test 'create: 追加に成功する' do
     login_user(@user)
 
-    patch(
+    post(
       :create,
-      id: 'new_user',
       user: {
         username: 'new_user',
         password: '12345678',
         password_confirmation: '12345678'
       }
     )
 
-    assert_redirected_to(:users, '利用者一覧ページにリダイレクトされる')
+    assert_redirected_to(user_path(id: 'new_user'), '利用者ページにリダイレクトされる')
     refute_nil(flash[:success], 'successのflashが表示される')
   end
 
   test 'create: 無効な値の場合は追加に失敗する' do
     login_user(@user)
 
-    patch(
+    post(
       :create,
-      id: @user.friendly_id,
       user: {
         username: '',
         password: '12345678',
@@ -113,7 +111,7 @@ class UsersControllerTest < ActionController::TestCase
       }
     )
 
-    assert_redirected_to(:users, '利用者一覧ページにリダイレクトされる')
+    assert_redirected_to(user_path(id: 'new_user'), '利用者ページにリダイレクトされる')
     refute_nil(flash[:success], 'successのflashが表示される')
   end