Merge branch 'develop' into help_develop

Conflicts:
	help/test/functional/tickets_controller_test.rb
	users/test/functional/application_controller_test.rb
	users/test/support/auth_test_helper.rb

1 files changed, 20 insertions, 16 deletions

diff --git a/help/test/functional/tickets_controller_test.rb b/help/test/functional/tickets_controller_test.rb
index 8fae44c..bb17acc 100644
--- a/help/test/functional/tickets_controller_test.rb
+++ b/help/test/functional/tickets_controller_test.rb
@@ -24,14 +24,15 @@ 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
     assigns(:ticket).destroy # destroys without checking permission. is that okay?
+
   end
 
 
@@ -39,33 +40,36 @@ 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
-
-    assert_equal assigns(:ticket).comments.count, 1
+    ticket = assigns(:ticket)
+    assert ticket
+    assert_equal @current_user.id, ticket.created_by
+    assert_equal @current_user.email, ticket.email
 
+    assert_equal 1, assigns(:ticket).comments.count
     assigns(:ticket).destroy # ?
   end
 
   test "add comment to unauthenticated ticket" do
 
-    t = Ticket.last
-    t.created_by = nil # TODO: hacky, but this makes sure this ticket is an unauthenticated one 
-    t.save
-    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)
+    ticket = Ticket.last
+    ticket.created_by = nil # TODO: hacky, but this makes sure this ticket is an unauthenticated one 
+    ticket.save
+#    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
-  end
+    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)
 
 
   test "add comment to authenticated ticket" do