From 3ce5a25afef3b938c2bbbe8ce481f2af9e0c24dc Mon Sep 17 00:00:00 2001
From: Azul <azul@leap.se>
Date: Fri, 23 Nov 2012 10:24:46 +0100
Subject: test editing user settings

---
 users/app/controllers/users_controller.rb      |  2 +-
 users/test/functional/users_controller_test.rb | 31 ++++++++++++++++++++++++++
 2 files changed, 32 insertions(+), 1 deletion(-)

(limited to 'users')

diff --git a/users/app/controllers/users_controller.rb b/users/app/controllers/users_controller.rb
index 46ecc32..ecab53b 100644
--- a/users/app/controllers/users_controller.rb
+++ b/users/app/controllers/users_controller.rb
@@ -22,7 +22,7 @@ class UsersController < ApplicationController
 
   def update
     @user = current_user
-    @user.update!(params[:user])
+    @user.update(params[:user])
     respond_with(@user, :location => edit_user_path(@user))
   end
 end
diff --git a/users/test/functional/users_controller_test.rb b/users/test/functional/users_controller_test.rb
index 1cb28a6..feae2dd 100644
--- a/users/test/functional/users_controller_test.rb
+++ b/users/test/functional/users_controller_test.rb
@@ -30,4 +30,35 @@ class UsersControllerTest < ActionController::TestCase
     assert_redirected_to new_user_path
   end
 
+  test "should get edit view" do
+    params = User.valid_attributes_hash
+    user = stub params.merge(:id => 123, :class => User, :to_key => ['123'], :new_record? => false, :persisted? => :true)
+    login user
+    get :edit, :id => user.id
+    assert_equal user, assigns[:user]
+  end
+
+  test "should process updated params" do
+    params = User.valid_attributes_hash
+    user = stub params.merge(:id => 123)
+    params.stringify_keys!
+    user.expects(:update).with(params).returns(user)
+    login user
+    post :update, :user => params, :id => user.id
+    assert_equal user, assigns[:user]
+    assert_response :redirect
+    assert_redirected_to edit_user_path(user)
+  end
+
+  test "should validate updated params" do
+    params = User.valid_attributes_hash
+    user = stub params.merge(:id => 123)
+    params.stringify_keys!
+    user.expects(:update).with(params).returns(user)
+    login user
+    post :update, :user => params, :id => user.id
+    assert_equal user, assigns[:user]
+  end
+
+
 end
-- 
cgit v1.2.3