3 files changed, 8 insertions, 74 deletions
diff --git a/help/test/functional/tickets_controller_test.rb b/help/test/functional/tickets_controller_test.rb
deleted file mode 100644
index 7a03a86..0000000
--- a/help/test/functional/tickets_controller_test.rb
+++ /dev/null
@@ -1,63 +0,0 @@
-require 'test_helper'
-
-class TicketsControllerTest < ActionController::TestCase
-
-  test "should get index" do
-    get :index
-    assert_response :success
-    assert_not_nil assigns(:tickets)
-  end
-
-  test "should get new" do
-    get :new
-    assert_equal Ticket, assigns(:ticket).class
-    assert_response :success
-  end
-
-
-  test "should create unauthenticated ticket" do
-    params = {:title => "ticket test title", :comments_attributes => {"0" => {"body" =>"body of test ticket"}}}
-
-    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
-  end
-
-
-  test "should create authenticated ticket" do
-
-    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
-
-    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
-  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
-
-  end
-
-end
diff --git a/help/test/unit/ticket_comment_test.rb b/help/test/unit/ticket_comment_test.rb
index 1fe1fe2..883720f 100644
--- a/help/test/unit/ticket_comment_test.rb
+++ b/help/test/unit/ticket_comment_test.rb
@@ -16,8 +16,8 @@ class TicketCommentTest < ActiveSupport::TestCase
 
     comment2 = TicketComment.new :body => "help my email is broken!"
     assert comment2.valid?
-    #assert_not_nil comment2.posted_at #?
-    #assert_nil comment2.posted_by #if not logged in #TODO
+    assert_not_nil comment2.posted_at
+    assert_nil comment2.posted_by #if not logged in
 
     #comment.ticket = testticket #Ticket.find_by_title("testing")
     #assert_equal testticket.title, comment.ticket.title
@@ -49,10 +49,9 @@ class TicketCommentTest < ActiveSupport::TestCase
     testticket.comments << comment2 #this should validate comment2
     testticket.valid?
     assert_equal testticket.comments.count, 2
-    # where should posted_at be set?
-    #assert_not_nil comment.posted_at
-    #assert_not_nil testticket.comments.last.posted_at
-    #assert testticket.comments.first.posted_at < testticket.comments.last.posted_at
+    assert_not_nil comment.posted_at
+    assert_not_nil testticket.comments.last.posted_at
+    assert testticket.comments.first.posted_at < testticket.comments.last.posted_at
   end
 
 end
diff --git a/help/test/unit/ticket_test.rb b/help/test/unit/ticket_test.rb
index 6b63a23..c3a4759 100644
--- a/help/test/unit/ticket_test.rb
+++ b/help/test/unit/ticket_test.rb
@@ -41,20 +41,18 @@ class TicketTest < ActiveSupport::TestCase
     assert @sample.is_creator_validated?
   end
   
-=begin
-# TODO: do once have current_user stuff in order
   test "code if & only if not creator-validated" do
-    User.current_test = nil
     t1 = Ticket.create :title => 'test title'
     assert_not_nil t1.code
     assert_nil t1.created_by
 
-    User.current_test = 4
+    User.current = 4
     t2 = Ticket.create :title => 'test title'
     assert_nil t2.code
     assert_not_nil t2.created_by
+    
+
   end
-=end
 
 end