Extract the hostip.info stubbing into a common method.

[rails.git] / test / models / note_test.rb

diff --git a/test/models/note_test.rb b/test/models/note_test.rb
index 4adbef4b884c9a734fc9688e8fd8d4ee9c49024c..d4bd36e74a49fede0dc6600bcaceeaa4e118cdd7 100644 (file)
--- a/test/models/note_test.rb
+++ b/test/models/note_test.rb
@@ -2,27 +2,27 @@
 require "test_helper"
 
 class NoteTest < ActiveSupport::TestCase
-  fixtures :users, :notes, :note_comments
+  fixtures :users
 
   def test_status_valid
     ok = %w(open closed hidden)
     bad = %w(expropriated fubared)
 
     ok.each do |status|
-      note = notes(:open_note)
+      note = create(:note)
       note.status = status
       assert note.valid?, "#{status} is invalid, when it should be"
     end
 
     bad.each do |status|
-      note = notes(:open_note)
+      note = create(:note)
       note.status = status
       assert !note.valid?, "#{status} is valid when it shouldn't be"
     end
   end
 
   def test_close
-    note = notes(:open_note)
+    note = create(:note)
     assert_equal "open", note.status
     assert_nil note.closed_at
     note.close
@@ -31,7 +31,7 @@ class NoteTest < ActiveSupport::TestCase
   end
 
   def test_reopen
-    note = notes(:closed_note_with_comment)
+    note = create(:note, :status => "closed", :closed_at => Time.now)
     assert_equal "closed", note.status
     assert_not_nil note.closed_at
     note.reopen
@@ -40,23 +40,29 @@ class NoteTest < ActiveSupport::TestCase
   end
 
   def test_visible?
-    assert_equal true, notes(:open_note).visible?
-    assert_equal true, notes(:note_with_hidden_comment).visible?
-    assert_equal false, notes(:hidden_note_with_comment).visible?
+    assert_equal true, create(:note, :status => "open").visible?
+    assert_equal true, create(:note, :status => "closed").visible?
+    assert_equal false, create(:note, :status => "hidden").visible?
   end
 
   def test_closed?
-    assert_equal true, notes(:closed_note_with_comment).closed?
-    assert_equal false, notes(:open_note).closed?
+    assert_equal true, create(:note, :status => "closed", :closed_at => Time.now).closed?
+    assert_equal false, create(:note, :status => "open", :closed_at => nil).closed?
   end
 
   def test_author
-    assert_nil notes(:open_note).author
-    assert_equal users(:normal_user), notes(:note_with_comments_by_users).author
+    comment = create(:note_comment)
+    assert_nil comment.note.author
+
+    comment = create(:note_comment, :author => users(:normal_user))
+    assert_equal users(:normal_user), comment.note.author
   end
 
   def test_author_ip
-    assert_equal IPAddr.new("192.168.1.1"), notes(:open_note).author_ip
-    assert_nil notes(:note_with_comments_by_users).author_ip
+    comment = create(:note_comment)
+    assert_nil comment.note.author_ip
+
+    comment = create(:note_comment, :author_ip => IPAddr.new("192.168.1.1"))
+    assert_equal IPAddr.new("192.168.1.1"), comment.note.author_ip
   end
 end