From c8f1eb55be6743fcc476d6a8f81e1244e455154a Mon Sep 17 00:00:00 2001 From: Azul Date: Sun, 4 Nov 2012 21:01:58 +0100 Subject: using new login helper and cleaning up test a bit --- help/test/functional/tickets_controller_test.rb | 27 +++++++++++++------------ 1 file changed, 14 insertions(+), 13 deletions(-) (limited to 'help/test/functional') diff --git a/help/test/functional/tickets_controller_test.rb b/help/test/functional/tickets_controller_test.rb index 7a03a86..6bdb6c7 100644 --- a/help/test/functional/tickets_controller_test.rb +++ b/help/test/functional/tickets_controller_test.rb @@ -21,13 +21,13 @@ class TicketsControllerTest < ActionController::TestCase assert_difference('Ticket.count') do post :create, :ticket => params end - + assert_response :redirect #assert_equal assigns(:ticket).email, User.current.email #assert_equal User.find(assigns(:ticket).created_by).login, User.current.login assert_nil assigns(:ticket).created_by - assert_equal assigns(:ticket).comments.count, 1 + assert_equal 1, assigns(:ticket).comments.count end @@ -35,28 +35,29 @@ class TicketsControllerTest < ActionController::TestCase params = {:title => "ticket test title", :comments_attributes => {"0" => {"body" =>"body of test ticket"}}} - #todo: should redo this and actually authorize - user = User.last - session[:user_id] = user.id + login User.last assert_difference('Ticket.count') do post :create, :ticket => params end assert_response :redirect - assert_equal assigns(:ticket).created_by, user.id - assert_equal assigns(:ticket).email, user.email + ticket = assigns(:ticket) + assert ticket + assert_equal @current_user.id, ticket.created_by + assert_equal @current_user.email, ticket.email - assert_equal assigns(:ticket).comments.count, 1 + assert_equal 1, assigns(:ticket).comments.count end test "add comment to ticket" do - t = Ticket.last - comment_count = t.comments.count - put :update, :id => t.id, :ticket => {:comments_attributes => {"0" => {"body" =>"NEWER comment"}} } - assert_equal(comment_count + 1, assigns(:ticket).comments.count) - #assert_difference block isn't working + ticket = Ticket.last + assert_difference('Ticket.last.comments.count') do + put :update, :id => ticket.id, + :ticket => {:comments_attributes => {"0" => {"body" =>"NEWER comment"}} } + end + assert_equal ticket, assigns(:ticket) end -- cgit v1.2.3