Merge branch 'clean'

Conflicts:
	app/controllers/users_controller.rb
	app/views/users/show.json.jbuilder
	db/migrate/20140306014123_add_index_to_users_email.rb
	db/migrate/20140306014125_add_index_to_users_user_name.rb
	db/migrate/20140306014128_add_password_digest_to_users.rb
	db/migrate/20140306014130_add_remember_token_to_users.rb
	db/schema.rb

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