cst1/openstreetmap-website
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Replace fixtures with factory for relation_tags

Browse source
This commit is contained in:
Andy Allan 2016-10-31 12:30:57 +01:00
parent 97d63db369
commit aa185bf4f8
8 changed files with 47 additions and 92 deletions
Download patch file Download diff file Expand all files Collapse all files

3
test/controllers/amf_controller_test.rb
View file

@ -531,7 +531,10 @@ class AmfControllerTest < ActionController::TestCase
def test_findrelations_by_tags
visible_relation = current_relations(:visible_relation)
create(:relation_tag, :relation => visible_relation, :k => "test", :v => "yes")
used_relation = current_relations(:used_relation)
create(:relation_tag, :relation => used_relation, :k => "test", :v => "yes")
create(:relation_tag, :relation => used_relation, :k => "name", :v => "Test Relation")
amf_content "findrelations", "/1", ["yes"]
post :amf_read

2
test/controllers/relation_controller_test.rb
View file

@ -337,6 +337,7 @@ class RelationControllerTest < ActionController::TestCase
def test_update_relation_tags
basic_authorization "test@example.com", "test"
rel_id = current_relations(:multi_tag_relation).id
create_list(:relation_tag, 4, :relation => current_relations(:multi_tag_relation))
cs_id = changesets(:public_user_first_change).id
with_relation(rel_id) do |rel|
@ -366,6 +367,7 @@ class RelationControllerTest < ActionController::TestCase
def test_update_relation_tags_via_upload
basic_authorization users(:public_user).email, "test"
rel_id = current_relations(:multi_tag_relation).id
create_list(:relation_tag, 4, :relation => current_relations(:multi_tag_relation))
cs_id = changesets(:public_user_first_change).id
with_relation(rel_id) do |rel|

5
test/controllers/search_controller_test.rb
View file

@ -64,6 +64,11 @@ 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")
end
create(:relation_tag, :relation => current_relations(:used_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"]