From e4d3c7fb8ee478bb7e489577a2404328c6477e53 Mon Sep 17 00:00:00 2001
From: Andy Allan <git@gravitystorm.co.uk>
Date: Thu, 6 Oct 2016 08:56:45 +0100
Subject: [PATCH] Update note model tests to use factories.

The NoteTest.test_visible? has changed slightly, so that the second
test of .visible? is using a closed note, which is a more useful test
than the original.
---
 test/models/note_comment_test.rb | 10 +++++-----
 test/models/note_test.rb         | 32 ++++++++++++++++++--------------
 2 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/test/models/note_comment_test.rb b/test/models/note_comment_test.rb
index 323a827c0..2375ba9d4 100644
--- a/test/models/note_comment_test.rb
+++ b/test/models/note_comment_test.rb
@@ -2,20 +2,20 @@
 require "test_helper"
 
 class NoteCommentTest < ActiveSupport::TestCase
-  fixtures :users, :notes, :note_comments
+  fixtures :users
 
   def test_event_valid
     ok = %w(opened closed reopened commented hidden)
     bad = %w(expropriated fubared)
 
     ok.each do |event|
-      note_comment = note_comments(:t1)
+      note_comment = create(:note_comment)
       note_comment.event = event
       assert note_comment.valid?, "#{event} is invalid, when it should be"
     end
 
     bad.each do |event|
-      note_comment = note_comments(:t1)
+      note_comment = create(:note_comment)
       note_comment.event = event
       assert !note_comment.valid?, "#{event} is valid when it shouldn't be"
     end
@@ -28,13 +28,13 @@ class NoteCommentTest < ActiveSupport::TestCase
            "foo\ufffebar", "foo\uffffbar"]
 
     ok.each do |body|
-      note_comment = note_comments(:t1)
+      note_comment = create(:note_comment)
       note_comment.body = body
       assert note_comment.valid?, "#{body} is invalid, when it should be"
     end
 
     bad.each do |body|
-      note_comment = note_comments(:t1)
+      note_comment = create(:note_comment)
       note_comment.body = body
       assert !note_comment.valid?, "#{body} is valid when it shouldn't be"
     end
diff --git a/test/models/note_test.rb b/test/models/note_test.rb
index 4adbef4b8..441f52eb6 100644
--- 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,27 @@ 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
+    anonymous_comment = create(:note_comment)
+    assert_nil anonymous_comment.note.author
+    comment = create(:note_comment, :author_id => users(:normal_user).id)
+    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, :author_ip => IPAddr.new("192.168.1.1"))
+    assert_equal IPAddr.new("192.168.1.1"), comment.note.author_ip
+    comment = create(:note_comment, :author_ip => nil)
+    assert_nil comment.note.author_ip
   end
 end
-- 
2.43.2