Merge remote-tracking branch 'openstreetmap/pull/1347' into master

[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 1564361c470029df4863cc22914f77f8f83f1d94..90a8518b431bf1befe77dae90d260f9fe483e150 100644 (file)
--- a/test/models/changeset_tag_test.rb
+++ b/test/models/changeset_tag_test.rb
@@ -1,36 +1,32 @@
-require 'test_helper'
+require "test_helper"
 
 class ChangesetTagTest < ActiveSupport::TestCase
   api_fixtures
 
-  def test_changeset_tag_count
-    assert_equal 2, ChangesetTag.count
-  end
-  
   def test_length_key_valid
     key = "k"
     (0..255).each do |i|
       tag = ChangesetTag.new
       tag.changeset_id = 1
-      tag.k = key*i
+      tag.k = key * i
       tag.v = "v"
       assert tag.valid?
     end
   end
-  
+
   def test_length_value_valid
     val = "v"
     (0..255).each do |i|
       tag = ChangesetTag.new
       tag.changeset_id = 1
       tag.k = "k"
-      tag.v = val*i
+      tag.v = val * i
       assert tag.valid?
     end
   end
-  
+
   def test_length_key_invalid
-    ["k"*256].each do |k|
+    ["k" * 256].each do |k|
       tag = ChangesetTag.new
       tag.changeset_id = 1
       tag.k = k
@@ -39,9 +35,9 @@ class ChangesetTagTest < ActiveSupport::TestCase
       assert tag.errors[:k].any?
     end
   end
-  
+
   def test_length_value_invalid
-    ["v"*256].each do |v|
+    ["v" * 256].each do |v|
       tag = ChangesetTag.new
       tag.changeset_id = 1
       tag.k = "k"
@@ -50,21 +46,22 @@ class ChangesetTagTest < ActiveSupport::TestCase
       assert tag.errors[:v].any?
     end
   end
-  
+
   def test_empty_tag_invalid
     tag = ChangesetTag.new
     assert !tag.valid?, "Empty tag should be invalid"
     assert tag.errors[:changeset].any?
   end
-  
+
   def test_uniqueness
+    existing = create(:changeset_tag)
     tag = ChangesetTag.new
-    tag.changeset_id = changeset_tags(:changeset_1_tag_1).changeset_id
-    tag.k = changeset_tags(:changeset_1_tag_1).k
-    tag.v = changeset_tags(:changeset_1_tag_1).v
+    tag.changeset_id = existing.changeset_id
+    tag.k = existing.k
+    tag.v = existing.v
     assert tag.new_record?
     assert !tag.valid?
-    assert_raise(ActiveRecord::RecordInvalid) {tag.save!}
+    assert_raise(ActiveRecord::RecordInvalid) { tag.save! }
     assert tag.new_record?
   end
 end