Use with_settings for temporary changes to settings

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

diff --git a/test/models/relation_test.rb b/test/models/relation_test.rb
index 193126df14408e69a0ec3666eab10b8c2d4b5165..575813ad532131ea90e45fe032c2087d4b862258 100644 (file)
--- a/test/models/relation_test.rb
+++ b/test/models/relation_test.rb
@@ -235,22 +235,19 @@ class RelationTest < ActiveSupport::TestCase
   # the maximum number of members in a relation.
   def test_max_members_per_relation_limit
     # Speed up unit test by using a small relation member limit
   # the maximum number of members in a relation.
   def test_max_members_per_relation_limit
     # Speed up unit test by using a small relation member limit

-    default_limit = Settings.max_number_of_relation_members
-    Settings.max_number_of_relation_members = 20
-
-    user = create(:user)
-    changeset = create(:changeset, :user => user)
-    relation = create(:relation, :changeset => changeset)
-    node = create(:node, :longitude => 116, :latitude => 39)
-    # Create relation which exceeds the relation member limit by one
-    0.upto(Settings.max_number_of_relation_members) do |i|
-      create(:relation_member, :relation => relation, :member_type => "Node", :member_id => node.id, :sequence_id => i)
-    end
+    with_settings(:max_number_of_relation_members => 20) do
+      user = create(:user)
+      changeset = create(:changeset, :user => user)
+      relation = create(:relation, :changeset => changeset)
+      node = create(:node, :longitude => 116, :latitude => 39)
+      # Create relation which exceeds the relation member limit by one
+      0.upto(Settings.max_number_of_relation_members) do |i|
+        create(:relation_member, :relation => relation, :member_type => "Node", :member_id => node.id, :sequence_id => i)
+      end

 
 

-    assert_raise OSM::APITooManyRelationMembersError do
-      relation.create_with_history user
+      assert_raise OSM::APITooManyRelationMembersError do
+        relation.create_with_history user
+      end

     end
     end

-
-    Settings.max_number_of_relation_members = default_limit

   end
 end
   end
 end