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

[rails.git] / test / controllers / way_controller_test.rb

diff --git a/test/controllers/way_controller_test.rb b/test/controllers/way_controller_test.rb
index ccf29945579ab1571551ab94aa7362151d5dd5be..650977078a1c31c1899e453ebd63e79bb1fcdaf1 100644 (file)
--- a/test/controllers/way_controller_test.rb
+++ b/test/controllers/way_controller_test.rb
@@ -538,10 +538,12 @@ class WayControllerTest < ActionController::TestCase
     # setup auth
     basic_authorization(users(:normal_user).email, "test")
 
     # setup auth
     basic_authorization(users(:normal_user).email, "test")
 

+    existing = create(:way_tag, :way => current_ways(:visible_way))
+

     # add an identical tag to the way
     tag_xml = XML::Node.new("tag")
     # add an identical tag to the way
     tag_xml = XML::Node.new("tag")

-    tag_xml["k"] = current_way_tags(:t1).k
-    tag_xml["v"] = current_way_tags(:t1).v
+    tag_xml["k"] = existing.k
+    tag_xml["v"] = existing.v

 
     # add the tag into the existing xml
     way_xml = current_ways(:visible_way).to_xml
 
     # add the tag into the existing xml
     way_xml = current_ways(:visible_way).to_xml


@@ -559,8 +561,8 @@ class WayControllerTest < ActionController::TestCase
 
     # add an identical tag to the way
     tag_xml = XML::Node.new("tag")
 
     # add an identical tag to the way
     tag_xml = XML::Node.new("tag")

-    tag_xml["k"] = current_way_tags(:t1).k
-    tag_xml["v"] = current_way_tags(:t1).v
+    tag_xml["k"] = existing.k
+    tag_xml["v"] = existing.v

 
     # add the tag into the existing xml
     way_xml = current_ways(:visible_way).to_xml
 
     # add the tag into the existing xml
     way_xml = current_ways(:visible_way).to_xml


@@ -571,7 +573,7 @@ class WayControllerTest < ActionController::TestCase
     put :update, :id => current_ways(:visible_way).id
     assert_response :bad_request,
                     "adding a duplicate tag to a way should fail with 'bad request'"
     put :update, :id => current_ways(:visible_way).id
     assert_response :bad_request,
                     "adding a duplicate tag to a way should fail with 'bad request'"

-    assert_equal "Element way/#{current_ways(:visible_way).id} has duplicate tags with key #{current_way_tags(:t1).k}", @response.body
+    assert_equal "Element way/#{current_ways(:visible_way).id} has duplicate tags with key #{existing.k}", @response.body

   end
 
   ##
   end
 
   ##