All API 0.6 functional tests now pass.

diff --git a/app/models/way.rb b/app/models/way.rb
index b2bdfb39b0e0e96bc6ee4d497b240ade8238eef2..341bc6e3ece589f3495e5d2e41a99626d12dba71 100644 (file)
--- a/app/models/way.rb
+++ b/app/models/way.rb
@@ -222,7 +222,7 @@ class Way < ActiveRecord::Base
   def create_with_history(user)
     check_create_consistency(self, user)
     if !self.preconditions_ok?
-      raise OSM::APIPreconditionsFailedError.new
+      raise OSM::APIPreconditionFailedError.new
     end
     self.version = 0
     self.visible = true

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
 
   # -------------------------------------