Remove the api_fixtures helper

[rails.git] / test / controllers / search_controller_test.rb

diff --git a/test/controllers/search_controller_test.rb b/test/controllers/search_controller_test.rb
index d3300452b05d15f3eeab17a13728b171dc3ace40..5b27666d9ffc5db4c7d95b65dd6681640cf914f6 100644 (file)
--- a/test/controllers/search_controller_test.rb
+++ b/test/controllers/search_controller_test.rb
@@ -1,8 +1,6 @@
 require "test_helper"
 
 class SearchControllerTest < ActionController::TestCase
 require "test_helper"
 
 class SearchControllerTest < 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


@@ -43,6 +41,15 @@ class SearchControllerTest < ActionController::TestCase
   ##
   # test searching ways
   def test_search_ways
   ##
   # test searching ways
   def test_search_ways

+    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 => third_way, :k => "name", :v => "Test Way")
+

     get :search_ways, :type => "test"
     assert_response :service_unavailable
     assert_equal "Searching for a key without value is currently unavailable", response.headers["Error"]
     get :search_ways, :type => "test"
     assert_response :service_unavailable
     assert_equal "Searching for a key without value is currently unavailable", response.headers["Error"]


@@ -59,6 +66,15 @@ class SearchControllerTest < ActionController::TestCase
   ##
   # test searching relations
   def test_search_relations
   ##
   # test searching relations
   def test_search_relations

+    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 => third_relation, :k => "name", :v => "Test Relation")
+

     get :search_relations, :type => "test"
     assert_response :service_unavailable
     assert_equal "Searching for a key without value is currently unavailable", response.headers["Error"]
     get :search_relations, :type => "test"
     assert_response :service_unavailable
     assert_equal "Searching for a key without value is currently unavailable", response.headers["Error"]