X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/90e46a58de583ac2bd7bb43077faa94186957a7a..6c51b3cc0ad7e193c7dae3794502088faab37c7b:/test/functional/way_controller_test.rb

diff --git a/test/functional/way_controller_test.rb b/test/functional/way_controller_test.rb
index a4b5a192a..332f92dc7 100644
--- a/test/functional/way_controller_test.rb
+++ b/test/functional/way_controller_test.rb
@@ -54,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...
@@ -79,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.
   # -------------------------------------