From 3ce5a25afef3b938c2bbbe8ce481f2af9e0c24dc Mon Sep 17 00:00:00 2001 From: Azul Date: Fri, 23 Nov 2012 10:24:46 +0100 Subject: test editing user settings --- users/test/functional/users_controller_test.rb | 31 ++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) (limited to 'users/test/functional/users_controller_test.rb') 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 From 46c0140a8eab632c783d309a7afd87cb7aad4280 Mon Sep 17 00:00:00 2001 From: Azul Date: Fri, 23 Nov 2012 10:55:49 +0100 Subject: refactored creation of record stubs --- users/test/functional/users_controller_test.rb | 33 +++++++------------------- 1 file changed, 9 insertions(+), 24 deletions(-) (limited to 'users/test/functional/users_controller_test.rb') diff --git a/users/test/functional/users_controller_test.rb b/users/test/functional/users_controller_test.rb index feae2dd..4318928 100644 --- a/users/test/functional/users_controller_test.rb +++ b/users/test/functional/users_controller_test.rb @@ -1,6 +1,8 @@ require 'test_helper' class UsersControllerTest < ActionController::TestCase + include StubRecordHelper + test "should get new" do get :new assert_equal User, assigns(:user).class @@ -8,11 +10,9 @@ class UsersControllerTest < ActionController::TestCase end test "should create new user" do - params = User.valid_attributes_hash - user = stub params.merge(:id => 123) - params.stringify_keys! - User.expects(:create!).with(params).returns(user) - post :create, :user => params + user = stub_record User + User.expects(:create!).with(user.params).returns(user) + post :create, :user => user.params assert_nil session[:user_id] assert_response :redirect assert_redirected_to root_url @@ -31,34 +31,19 @@ class UsersControllerTest < ActionController::TestCase 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) + user = stub_record User 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) + user = stub_record User + user.expects(:update).with(user.params).returns(user) login user - post :update, :user => params, :id => user.id + post :update, :user => 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 From ee3c9146e4bbe93ec1f00ee45386a82ec4363c4d Mon Sep 17 00:00:00 2001 From: Azul Date: Fri, 23 Nov 2012 12:11:11 +0100 Subject: identify user by id so rerendering the form does not use new invalid login --- users/test/functional/users_controller_test.rb | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'users/test/functional/users_controller_test.rb') diff --git a/users/test/functional/users_controller_test.rb b/users/test/functional/users_controller_test.rb index 4318928..e39869f 100644 --- a/users/test/functional/users_controller_test.rb +++ b/users/test/functional/users_controller_test.rb @@ -32,6 +32,7 @@ class UsersControllerTest < ActionController::TestCase test "should get edit view" do user = stub_record User + User.expects(:find_by_param).with(user.id.to_s).returns(user) login user get :edit, :id => user.id assert_equal user, assigns[:user] @@ -39,7 +40,8 @@ class UsersControllerTest < ActionController::TestCase test "should process updated params" do user = stub_record User - user.expects(:update).with(user.params).returns(user) + user.expects(:update_attributes).with(user.params).returns(true) + User.expects(:find_by_param).with(user.id.to_s).returns(user) login user post :update, :user => user.params, :id => user.id assert_equal user, assigns[:user] -- cgit v1.2.3 From 595518684b9c4364f96c97a84cc481b5ae0da981 Mon Sep 17 00:00:00 2001 From: Azul Date: Mon, 26 Nov 2012 11:54:11 +0100 Subject: simplified controller and adjusted tests Also added #assert_json_error to tests. --- users/test/functional/users_controller_test.rb | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) (limited to 'users/test/functional/users_controller_test.rb') diff --git a/users/test/functional/users_controller_test.rb b/users/test/functional/users_controller_test.rb index e39869f..ced8ee9 100644 --- a/users/test/functional/users_controller_test.rb +++ b/users/test/functional/users_controller_test.rb @@ -11,23 +11,22 @@ class UsersControllerTest < ActionController::TestCase test "should create new user" do user = stub_record User - User.expects(:create!).with(user.params).returns(user) - post :create, :user => user.params + User.expects(:create).with(user.params).returns(user) + post :create, :user => user.params, :format => :json assert_nil session[:user_id] - assert_response :redirect - assert_redirected_to root_url + assert_json_response user + assert_response :success end test "should redirect to signup form on failed attempt" do params = User.valid_attributes_hash.slice(:login) user = User.new(params) params.stringify_keys! - User.expects(:create!).with(params).raises(VALIDATION_FAILED.new(user)) - post :create, :user => params - assert_nil session[:user_id] - assert_equal user, assigns[:user] - assert_response :redirect - assert_redirected_to new_user_path + assert !user.valid? + User.expects(:create).with(params).returns(user) + post :create, :user => params, :format => :json + assert_json_error user.errors.messages + assert_response 422 end test "should get edit view" do @@ -43,9 +42,9 @@ class UsersControllerTest < ActionController::TestCase user.expects(:update_attributes).with(user.params).returns(true) User.expects(:find_by_param).with(user.id.to_s).returns(user) login user - post :update, :user => user.params, :id => user.id + put :update, :user => user.params, :id => user.id, :format => :json assert_equal user, assigns[:user] - assert_response :redirect - assert_redirected_to edit_user_path(user) + assert_equal " ", @response.body + assert_response 204 end end -- cgit v1.2.3