Convert client applications fixtures into a factory

[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 2ea7aa15a00e86e4044f22ce1f396c73dbfe33e8..2e835a58758dbb88a995e85f698da6370ab4d7de 100644 (file)
--- a/test/controllers/search_controller_test.rb
+++ b/test/controllers/search_controller_test.rb
@@ -1,6 +1,8 @@
 require "test_helper"
 
 class SearchControllerTest < ActionController::TestCase
+  api_fixtures
+
   ##
   # test all routes which lead to this controller
   def test_routes
@@ -24,65 +26,75 @@ class SearchControllerTest < ActionController::TestCase
 
   ##
   # test searching nodes
-  def search_nodes
+  def test_search_nodes
     get :search_nodes, :type => "test"
-    assert_response :status => :service_unavailable
+    assert_response :service_unavailable
     assert_equal "Searching of nodes is currently unavailable", response.headers["Error"]
 
     get :search_nodes, :type => "test", :value => "yes"
-    assert_response :status => :service_unavailable
+    assert_response :service_unavailable
     assert_equal "Searching of nodes is currently unavailable", response.headers["Error"]
 
     get :search_nodes, :name => "Test Node"
-    assert_response :status => :service_unavailable
+    assert_response :service_unavailable
     assert_equal "Searching of nodes is currently unavailable", response.headers["Error"]
   end
 
   ##
   # test searching ways
-  def search_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")
+    end
+    create(:way_tag, :way => current_ways(:used_way), :k => "name", :v => "Test Way")
+
     get :search_ways, :type => "test"
-    assert_response :status => :service_unavailable
+    assert_response :service_unavailable
     assert_equal "Searching for a key without value is currently unavailable", response.headers["Error"]
 
     get :search_ways, :type => "test", :value => "yes"
-    assert_response :status => :success
+    assert_response :success
     assert_select "way", 3
 
     get :search_ways, :name => "Test Way"
-    assert_response :status => :success
+    assert_response :success
     assert_select "way", 1
   end
 
   ##
   # test searching relations
-  def search_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")
+    end
+    create(:relation_tag, :relation => current_relations(:used_relation), :k => "name", :v => "Test Relation")
+
     get :search_relations, :type => "test"
-    assert_response :status => :service_unavailable
+    assert_response :service_unavailable
     assert_equal "Searching for a key without value is currently unavailable", response.headers["Error"]
 
     get :search_relations, :type => "test", :value => "yes"
-    assert_response :status => :success
+    assert_response :success
     assert_select "relation", 3
 
     get :search_relations, :name => "Test Relation"
-    assert_response :status => :success
+    assert_response :success
     assert_select "relation", 1
   end
 
   ##
   # test searching nodes, ways and relations
-  def search_all
+  def test_search_all
     get :search_all, :type => "test"
-    assert_response :status => :service_unavailable
+    assert_response :service_unavailable
     assert_equal "Searching of nodes is currently unavailable", response.headers["Error"]
 
     get :search_all, :type => "test", :value => "yes"
-    assert_response :status => :service_unavailable
+    assert_response :service_unavailable
     assert_equal "Searching of nodes is currently unavailable", response.headers["Error"]
 
     get :search_all, :name => "Test"
-    assert_response :status => :service_unavailable
+    assert_response :service_unavailable
     assert_equal "Searching of nodes is currently unavailable", response.headers["Error"]
   end
 end