diff options
author | Luke Shumaker <LukeShu@sbcglobal.net> | 2014-03-05 21:28:25 -0500 |
---|---|---|
committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2014-03-05 21:28:25 -0500 |
commit | f72b55ce938a14313091a92d84c4083c3ba4f2fd (patch) | |
tree | 19439a28eb3519e060fe63e045dc412dfb3aa71a /test | |
parent | 0d710239a765787f10de304edc438de2dfaa9824 (diff) |
move the separate migrations into the original generates
Diffstat (limited to 'test')
-rw-r--r-- | test/controllers/users_controller_test.rb | 4 | ||||
-rw-r--r-- | test/fixtures/users.yml | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/test/controllers/users_controller_test.rb b/test/controllers/users_controller_test.rb index 79a5700..fc06f63 100644 --- a/test/controllers/users_controller_test.rb +++ b/test/controllers/users_controller_test.rb @@ -18,7 +18,7 @@ class UsersControllerTest < ActionController::TestCase test "should create user" do assert_difference('User.count') do - post :create, user: { email: @user.email, name: @user.name, user_name: @user.user_name } + post :create, user: { email: @user.email, name: @user.name, password_digest: @user.password_digest, remember_token: @user.remember_token, user_name: @user.user_name } end assert_redirected_to user_path(assigns(:user)) @@ -35,7 +35,7 @@ class UsersControllerTest < ActionController::TestCase end test "should update user" do - patch :update, id: @user, user: { email: @user.email, name: @user.name, user_name: @user.user_name } + patch :update, id: @user, user: { email: @user.email, name: @user.name, password_digest: @user.password_digest, remember_token: @user.remember_token, user_name: @user.user_name } assert_redirected_to user_path(assigns(:user)) end diff --git a/test/fixtures/users.yml b/test/fixtures/users.yml index ea3e874..cf39694 100644 --- a/test/fixtures/users.yml +++ b/test/fixtures/users.yml @@ -4,8 +4,12 @@ one: name: MyString email: MyString user_name: MyString + password_digest: MyString + remember_token: MyString two: name: MyString email: MyString user_name: MyString + password_digest: MyString + remember_token: MyString |