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

Refactor a few tests to use changeset factories.

Browse source
This commit is contained in:
Andy Allan 2017-05-25 09:47:18 +01:00
parent de33aff226
commit 0facb801f8
3 changed files with 16 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

6
test/controllers/browse_controller_test.rb
View file

@ -70,8 +70,10 @@ class BrowseControllerTest < ActionController::TestCase
end end
def test_read_changeset def test_read_changeset
browse_check "changeset", changesets(:normal_user_first_change).id, "browse/changeset" private_changeset = create(:changeset, :user => create(:user, :data_public => false))
browse_check "changeset", changesets(:public_user_first_change).id, "browse/changeset" changeset = create(:changeset)
browse_check "changeset", private_changeset.id, "browse/changeset"
browse_check "changeset", changeset.id, "browse/changeset"
end end
def test_read_changeset_hidden_comments def test_read_changeset_hidden_comments

18
test/controllers/relation_controller_test.rb
View file

@ -373,16 +373,18 @@ class RelationControllerTest < ActionController::TestCase
# josm-dev. # josm-dev.
## FIXME Move this to an integration test ## FIXME Move this to an integration test
def test_update_relation_tags def test_update_relation_tags
basic_authorization "test@example.com", "test" user = create(:user)
rel_id = current_relations(:multi_tag_relation).id changeset = create(:changeset, :user => user)
create_list(:relation_tag, 4, :relation => current_relations(:multi_tag_relation)) relation = create(:relation)
cs_id = changesets(:public_user_first_change).id create_list(:relation_tag, 4, :relation => relation)
with_relation(rel_id) do |rel| basic_authorization user.email, "test"
with_relation(relation.id) do |rel|
# alter one of the tags # alter one of the tags
tag = rel.find("//osm/relation/tag").first tag = rel.find("//osm/relation/tag").first
tag["v"] = "some changed value" tag["v"] = "some changed value"
update_changeset(rel, cs_id) update_changeset(rel, changeset.id)
# check that the downloaded tags are the same as the uploaded tags... # check that the downloaded tags are the same as the uploaded tags...
new_version = with_update(rel) do |new_rel| new_version = with_update(rel) do |new_rel|
@ -390,10 +392,10 @@ class RelationControllerTest < ActionController::TestCase
end end
# check the original one in the current_* table again # check the original one in the current_* table again
with_relation(rel_id) { |r| assert_tags_equal rel, r } with_relation(relation.id) { |r| assert_tags_equal rel, r }
# now check the version in the history # now check the version in the history
with_relation(rel_id, new_version) { |r| assert_tags_equal rel, r } with_relation(relation.id, new_version) { |r| assert_tags_equal rel, r }
end end
end end

4
test/controllers/way_controller_test.rb
View file

@ -406,7 +406,7 @@ class WayControllerTest < ActionController::TestCase
# try and update in a closed changeset # try and update in a closed changeset
content update_changeset(private_way.to_xml, content update_changeset(private_way.to_xml,
create(:changeset, :closed, :user => private_user)) create(:changeset, :closed, :user => private_user).id)
put :update, :id => private_way.id put :update, :id => private_way.id
assert_require_public_data "update with closed changeset should be forbidden, when data isn't public" assert_require_public_data "update with closed changeset should be forbidden, when data isn't public"
@ -444,7 +444,7 @@ class WayControllerTest < ActionController::TestCase
# try and update in a closed changeset # try and update in a closed changeset
content update_changeset(way.to_xml, content update_changeset(way.to_xml,
changesets(:normal_user_closed_change).id) create(:changeset, :closed, :user => user).id)
put :update, :id => way.id put :update, :id => way.id
assert_response :conflict, "update with closed changeset should be rejected" assert_response :conflict, "update with closed changeset should be rejected"