X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/109e69efc186113380eccca35bfdb4bd83365db5..692c0c39b68a77057526781a83dabe56a6931fa0:/test/controllers/search_controller_test.rb diff --git a/test/controllers/search_controller_test.rb b/test/controllers/search_controller_test.rb index 2e835a587..8c7a2d2b1 100644 --- a/test/controllers/search_controller_test.rb +++ b/test/controllers/search_controller_test.rb @@ -43,10 +43,14 @@ class SearchControllerTest < ActionController::TestCase ## # test searching ways def test_search_ways - [:visible_way, :invisible_way, :used_way].each do |way| - create(:way_tag, :way => current_ways(way), :k => "test", :v => "yes") + first_way = create(:way_with_nodes, :nodes_count => 2) + deleted_way = create(:way_with_nodes, :deleted, :nodes_count => 2) + third_way = create(:way_with_nodes, :nodes_count => 2) + + [first_way, deleted_way, third_way].each do |way| + create(:way_tag, :way => way, :k => "test", :v => "yes") end - create(:way_tag, :way => current_ways(:used_way), :k => "name", :v => "Test Way") + create(:way_tag, :way => third_way, :k => "name", :v => "Test Way") get :search_ways, :type => "test" assert_response :service_unavailable @@ -64,10 +68,14 @@ class SearchControllerTest < ActionController::TestCase ## # test searching relations def test_search_relations - [:visible_relation, :invisible_relation, :used_relation].each do |relation| - create(:relation_tag, :relation => current_relations(relation), :k => "test", :v => "yes") + first_relation = create(:relation) + deleted_relation = create(:relation) + third_relation = create(:relation) + + [first_relation, deleted_relation, third_relation].each do |relation| + create(:relation_tag, :relation => relation, :k => "test", :v => "yes") end - create(:relation_tag, :relation => current_relations(:used_relation), :k => "name", :v => "Test Relation") + create(:relation_tag, :relation => third_relation, :k => "name", :v => "Test Relation") get :search_relations, :type => "test" assert_response :service_unavailable