summaryrefslogtreecommitdiff
path: root/help/test/unit
diff options
context:
space:
mode:
authorjessib <jessib@leap.se>2013-01-14 11:50:54 -0800
committerjessib <jessib@leap.se>2013-01-14 11:50:54 -0800
commitc2f232d994b3ee01ff9d50da1e4f3798df2136f3 (patch)
tree5b7a11e9aed58357d2a38b248b965cd936de6888 /help/test/unit
parentd81bf00ecd8bdfcddf50e4881428c917253326fe (diff)
parentee2ea4ac8f4c6b0c3b09be6ed49e7a1faec7a9c1 (diff)
Merge branch 'master' into feature/show_user. Added new tests.
Conflicts: users/test/functional/users_controller_test.rb
Diffstat (limited to 'help/test/unit')
-rw-r--r--help/test/unit/ticket_comment_test.rb5
-rw-r--r--help/test/unit/ticket_test.rb1
2 files changed, 4 insertions, 2 deletions
diff --git a/help/test/unit/ticket_comment_test.rb b/help/test/unit/ticket_comment_test.rb
index 1fe1fe2..44865ed 100644
--- a/help/test/unit/ticket_comment_test.rb
+++ b/help/test/unit/ticket_comment_test.rb
@@ -21,11 +21,11 @@ class TicketCommentTest < ActiveSupport::TestCase
#comment.ticket = testticket #Ticket.find_by_title("testing")
#assert_equal testticket.title, comment.ticket.title
-
+
#tc.ticket = Ticket.find_by_title("test title")
#tc.ticket.title
end
-
+
=begin
test "create authenticated comment" do
User.current = 4
@@ -49,6 +49,7 @@ class TicketCommentTest < ActiveSupport::TestCase
testticket.comments << comment2 #this should validate comment2
testticket.valid?
assert_equal testticket.comments.count, 2
+ testticket.reload.destroy
# where should posted_at be set?
#assert_not_nil comment.posted_at
#assert_not_nil testticket.comments.last.posted_at
diff --git a/help/test/unit/ticket_test.rb b/help/test/unit/ticket_test.rb
index ac6426e..ce35e1d 100644
--- a/help/test/unit/ticket_test.rb
+++ b/help/test/unit/ticket_test.rb
@@ -32,6 +32,7 @@ class TicketTest < ActiveSupport::TestCase
#p t.email_address
#p t.email_address.strip =~ RFC822::EmailAddress
assert !t.valid?
+ t.reload.destroy
end
test "creation validated" do