Add ways into the database explicitly, rather than relying on preloaded fixtures.

diff --git a/test/controllers/way_controller_test.rb b/test/controllers/way_controller_test.rb
index 42a0413c771f49f329bb70a84c13d8064ca0d327..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
 require "way_controller"
 
 class WayControllerTest < ActionController::TestCase

-  api_fixtures
-

   ##
   # test all routes which lead to this controller
   def test_routes
   ##
   # test all routes which lead to this controller
   def test_routes


@@ -82,6 +80,11 @@ class WayControllerTest < ActionController::TestCase
   ##
   # test fetching multiple ways
   def test_ways
   ##
   # 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
     # 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
     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_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
     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
 
     assert_response :not_found
   end