summaryrefslogtreecommitdiff
path: root/help/test
diff options
context:
space:
mode:
authorAzul <azul@leap.se>2012-11-12 19:16:55 +0100
committerAzul <azul@leap.se>2012-11-12 19:16:55 +0100
commitc886cc17b6f37ddd556e70fe2d76a3ea28db52bf (patch)
treee27fe040bfaba5840730f466d4c6f90213759d5e /help/test
parentca2e1b9f379ccba068ad0ebb852d855f1639cd3a (diff)
parent5b300b554682c232c0955bdb0dd3d8263dde901e (diff)
Merge branch 'feature-warden-srp' into develop
Diffstat (limited to 'help/test')
-rw-r--r--help/test/functional/tickets_controller_test.rb27
1 files changed, 14 insertions, 13 deletions
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