Added a bunch more tests on the API 0.6. Fixed node/way/relation from_xml code to...

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

diff --git a/test/functional/way_controller_test.rb b/test/functional/way_controller_test.rb
index fbc05086f8e115ac0230059f2b31ac1f41313a2f..58bb6a9a11a822fc4bde8c824c0680e97db459a1 100644 (file)
--- a/test/functional/way_controller_test.rb
+++ b/test/functional/way_controller_test.rb
@@ -140,8 +140,8 @@ class WayControllerTest < Test::Unit::TestCase
       "<nd ref='#{nid1}'/></way></osm>"
     put :create
     # expect failure
-    assert_response :precondition_failed, 
-        "way upload to closed changeset did not return 'precondition failed'"    
+    assert_response :conflict, 
+        "way upload to closed changeset did not return 'conflict'"    
   end
 
   # -------------------------------------