Rework coordinates to avoid scientific formatting of small numbers. Fixes #1509

[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 bdb67b09fcc0b4c89a81e3fc94d2d57ac7bc5cb0..99a45adefc42a3944c50df44e0c3b6afbffa5e85 100644 (file)
--- a/test/controllers/way_controller_test.rb
+++ b/test/controllers/way_controller_test.rb
@@ -2,8 +2,6 @@ require "test_helper"
 require "way_controller"
 
 class WayControllerTest < ActionController::TestCase
-  api_fixtures
-
   ##
   # test all routes which lead to this controller
   def test_routes
@@ -39,11 +37,11 @@ class WayControllerTest < ActionController::TestCase
 
   def test_read
     # check that a visible way is returned properly
-    get :read, :id => current_ways(:visible_way).id
+    get :read, :id => create(:way).id
     assert_response :success
 
     # check that an invisible way is not returned
-    get :read, :id => current_ways(:invisible_way).id
+    get :read, :id => create(:way, :deleted).id
     assert_response :gone
 
     # check chat a non-existent way is not returned
@@ -82,6 +80,11 @@ class WayControllerTest < ActionController::TestCase
   ##
   # test fetching multiple ways
   def test_ways
+    way1 = create(:way)
+    way2 = create(:way, :deleted)
+    way3 = create(:way)
+    way4 = create(:way)
+
     # check error when no parameter provided
     get :ways
     assert_response :bad_request
@@ -91,18 +94,18 @@ class WayControllerTest < ActionController::TestCase
     assert_response :bad_request
 
     # test a working call
-    get :ways, :ways => "1,2,4,6"
+    get :ways, :ways => "#{way1.id},#{way2.id},#{way3.id},#{way4.id}"
     assert_response :success
     assert_select "osm" do
       assert_select "way", :count => 4
-      assert_select "way[id='1'][visible='true']", :count => 1
-      assert_select "way[id='2'][visible='false']", :count => 1
-      assert_select "way[id='4'][visible='true']", :count => 1
-      assert_select "way[id='6'][visible='true']", :count => 1
+      assert_select "way[id='#{way1.id}'][visible='true']", :count => 1
+      assert_select "way[id='#{way2.id}'][visible='false']", :count => 1
+      assert_select "way[id='#{way3.id}'][visible='true']", :count => 1
+      assert_select "way[id='#{way4.id}'][visible='true']", :count => 1
     end
 
     # check error when a non-existent way is included
-    get :ways, :ways => "1,2,4,6,400"
+    get :ways, :ways => "#{way1.id},#{way2.id},#{way3.id},#{way4.id},400"
     assert_response :not_found
   end
 
@@ -406,7 +409,7 @@ class WayControllerTest < ActionController::TestCase
 
     # try and update in a closed changeset
     content update_changeset(private_way.to_xml,
-                             create(:changeset, :closed, :user => private_user))
+                             create(:changeset, :closed, :user => private_user).id)
     put :update, :id => private_way.id
     assert_require_public_data "update with closed changeset should be forbidden, when data isn't public"
 
@@ -444,7 +447,7 @@ class WayControllerTest < ActionController::TestCase
 
     # try and update in a closed changeset
     content update_changeset(way.to_xml,
-                             changesets(:normal_user_closed_change).id)
+                             create(:changeset, :closed, :user => user).id)
     put :update, :id => way.id
     assert_response :conflict, "update with closed changeset should be rejected"
 
@@ -704,19 +707,29 @@ class WayControllerTest < ActionController::TestCase
   # test that a call to ways_for_node returns all ways that contain the node
   # and none that don't.
   def test_ways_for_node
-    # in current fixtures ways 1 and 3 all use node 3. ways 2 and 4
-    # *used* to use it but doesn't.
-    get :ways_for_node, :id => current_nodes(:used_node_1).id
+    node = create(:node)
+    way1 = create(:way)
+    way2 = create(:way)
+    create(:way_node, :way => way1, :node => node)
+    create(:way_node, :way => way2, :node => node)
+    # create an unrelated way
+    create(:way_with_nodes, :nodes_count => 2)
+    # create a way which used to use the node
+    way3_v1 = create(:old_way, :version => 1)
+    _way3_v2 = create(:old_way, :current_way => way3_v1.current_way, :version => 2)
+    create(:old_way_node, :old_way => way3_v1, :node => node)
+
+    get :ways_for_node, :id => node.id
     assert_response :success
     ways_xml = XML::Parser.string(@response.body).parse
     assert_not_nil ways_xml, "failed to parse ways_for_node response"
 
     # check that the set of IDs match expectations
-    expected_way_ids = [current_ways(:visible_way).id,
-                        current_ways(:used_way).id]
+    expected_way_ids = [way1.id,
+                        way2.id]
     found_way_ids = ways_xml.find("//osm/way").collect { |w| w["id"].to_i }
     assert_equal expected_way_ids.sort, found_way_ids.sort,
-                 "expected ways for node #{current_nodes(:used_node_1).id} did not match found"
+                 "expected ways for node #{node.id} did not match found"
 
     # check the full ways to ensure we're not missing anything
     expected_way_ids.each do |id|