summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorLuke Shumaker <LukeShu@sbcglobal.net>2014-03-05 21:48:54 -0500
committerLuke Shumaker <LukeShu@sbcglobal.net>2014-03-05 21:48:54 -0500
commitd0545c2820d101a98b3c895cf6e3691145a62f3c (patch)
treeb3bdb78ab94b2929c9bb7fdb2f6f257e58edc93e /test
parentf72b55ce938a14313091a92d84c4083c3ba4f2fd (diff)
use separate migrations to make things hidden, add user#groups:integer
Diffstat (limited to 'test')
-rw-r--r--test/controllers/users_controller_test.rb4
-rw-r--r--test/fixtures/users.yml4
2 files changed, 2 insertions, 6 deletions
diff --git a/test/controllers/users_controller_test.rb b/test/controllers/users_controller_test.rb
index fc06f63..79a5700 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, password_digest: @user.password_digest, remember_token: @user.remember_token, user_name: @user.user_name }
+ post :create, user: { email: @user.email, name: @user.name, 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, password_digest: @user.password_digest, remember_token: @user.remember_token, user_name: @user.user_name }
+ patch :update, id: @user, user: { email: @user.email, name: @user.name, 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 cf39694..ea3e874 100644
--- a/test/fixtures/users.yml
+++ b/test/fixtures/users.yml
@@ -4,12 +4,8 @@ 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