Remove unneessary return added accidentally

[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 3452be6d04a120ed771a2a1a1b05367e36117ab0..332f92dc7898d3bc571fd1817fc4f4f8b8ed6df3 100644 (file)
--- a/test/functional/way_controller_test.rb
+++ b/test/functional/way_controller_test.rb
@@ -4,6 +4,35 @@ require 'way_controller'
 class WayControllerTest < ActionController::TestCase
   api_fixtures
 
+  ##
+  # test all routes which lead to this controller
+  def test_routes
+    assert_routing(
+      { :path => "/api/0.6/way/create", :method => :put },
+      { :controller => "way", :action => "create" }
+    )
+    assert_routing(
+      { :path => "/api/0.6/way/1/full", :method => :get },
+      { :controller => "way", :action => "full", :id => "1" }
+    )
+    assert_routing(
+      { :path => "/api/0.6/way/1", :method => :get },
+      { :controller => "way", :action => "read", :id => "1" }
+    )
+    assert_routing(
+      { :path => "/api/0.6/way/1", :method => :put },
+      { :controller => "way", :action => "update", :id => "1" }
+    )
+    assert_routing(
+      { :path => "/api/0.6/way/1", :method => :delete },
+      { :controller => "way", :action => "delete", :id => "1" }
+    )
+    assert_routing(
+      { :path => "/api/0.6/ways", :method => :get },
+      { :controller => "way", :action => "ways" }
+    )
+  end
+
   # -------------------------------------
   # Test reading ways.
   # -------------------------------------
@@ -25,7 +54,7 @@ class WayControllerTest < ActionController::TestCase
   ##
   # check the "full" mode
   def test_full
-    Way.find(:all).each do |way|
+    Way.all.each do |way|
       get :full, :id => way.id
 
       # full call should say "gone" for non-visible ways...
@@ -50,6 +79,33 @@ class WayControllerTest < ActionController::TestCase
     end
   end
 
+  ##
+  # test fetching multiple ways
+  def test_ways
+    # check error when no parameter provided
+    get :ways
+    assert_response :bad_request
+
+    # check error when no parameter value provided
+    get :ways, :ways => ""
+    assert_response :bad_request
+
+    # test a working call
+    get :ways, :ways => "1,2,4,6"
+    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
+    end
+
+    # check error when a non-existent way is included
+    get :ways, :ways => "1,2,4,6,400"
+    assert_response :not_found
+  end
+
   # -------------------------------------
   # Test simple way creation.
   # -------------------------------------
@@ -297,7 +353,7 @@ class WayControllerTest < ActionController::TestCase
     delete :delete, :id => current_ways(:used_way).id
     assert_response :precondition_failed, 
        "shouldn't be able to delete a way used in a relation (#{@response.body})"
-    assert_equal "Precondition failed: Way 3 still used by relation 1.", @response.body
+    assert_equal "Precondition failed: Way 3 is still used by relations 1.", @response.body
 
     # this won't work since the way never existed
     delete :delete, :id => 0
@@ -454,7 +510,7 @@ class WayControllerTest < ActionController::TestCase
                          current_ways(:used_way).id
                        ]
     found_way_ids = ways_xml.find("//osm/way").collect { |w| w["id"].to_i }
-    assert_equal expected_way_ids, found_way_ids,
+    assert_equal expected_way_ids.sort, found_way_ids.sort,
       "expected ways for node #{current_nodes(:used_node_1).id} did not match found"
     
     # check the full ways to ensure we're not missing anything