Merge remote-tracking branch 'upstream/pull/2167'

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

diff --git a/test/models/changeset_tag_test.rb b/test/models/changeset_tag_test.rb
index 90a8518b431bf1befe77dae90d260f9fe483e150..1db2effd65aecf20c3588a93ef88a1525eaef722 100644 (file)
--- a/test/models/changeset_tag_test.rb
+++ b/test/models/changeset_tag_test.rb
@@ -1,13 +1,13 @@
 require "test_helper"
 
 class ChangesetTagTest < ActiveSupport::TestCase
-  api_fixtures
-
   def test_length_key_valid
+    changeset = create(:changeset)
+
     key = "k"
     (0..255).each do |i|
       tag = ChangesetTag.new
-      tag.changeset_id = 1
+      tag.changeset_id = changeset.id
       tag.k = key * i
       tag.v = "v"
       assert tag.valid?
@@ -15,10 +15,12 @@ class ChangesetTagTest < ActiveSupport::TestCase
   end
 
   def test_length_value_valid
+    changeset = create(:changeset)
+
     val = "v"
     (0..255).each do |i|
       tag = ChangesetTag.new
-      tag.changeset_id = 1
+      tag.changeset_id = changeset.id
       tag.k = "k"
       tag.v = val * i
       assert tag.valid?
@@ -31,7 +33,7 @@ class ChangesetTagTest < ActiveSupport::TestCase
       tag.changeset_id = 1
       tag.k = k
       tag.v = "v"
-      assert !tag.valid?, "Key #{k} should be too long"
+      assert_not tag.valid?, "Key #{k} should be too long"
       assert tag.errors[:k].any?
     end
   end
@@ -42,14 +44,14 @@ class ChangesetTagTest < ActiveSupport::TestCase
       tag.changeset_id = 1
       tag.k = "k"
       tag.v = v
-      assert !tag.valid?, "Value #{v} should be too long"
+      assert_not tag.valid?, "Value #{v} should be too long"
       assert tag.errors[:v].any?
     end
   end
 
   def test_empty_tag_invalid
     tag = ChangesetTag.new
-    assert !tag.valid?, "Empty tag should be invalid"
+    assert_not tag.valid?, "Empty tag should be invalid"
     assert tag.errors[:changeset].any?
   end
 
@@ -60,7 +62,7 @@ class ChangesetTagTest < ActiveSupport::TestCase
     tag.k = existing.k
     tag.v = existing.v
     assert tag.new_record?
-    assert !tag.valid?
+    assert_not tag.valid?
     assert_raise(ActiveRecord::RecordInvalid) { tag.save! }
     assert tag.new_record?
   end