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